diff --git a/plugins/mobilehotspot/mobilehotspot.h b/plugins/mobilehotspot/mobilehotspot.h index 1ac3b3b1..7bb3cb63 100644 --- a/plugins/mobilehotspot/mobilehotspot.h +++ b/plugins/mobilehotspot/mobilehotspot.h @@ -33,7 +33,7 @@ #include #include "interface.h" -#include "../component/SwitchButton/switchbutton.h" +#include "switchbutton.h" #include "hoverbtn.h" #include "mobilehotspotwidget.h" diff --git a/plugins/mobilehotspot/mobilehotspot.pro b/plugins/mobilehotspot/mobilehotspot.pro index 474596e2..a9fde8d3 100644 --- a/plugins/mobilehotspot/mobilehotspot.pro +++ b/plugins/mobilehotspot/mobilehotspot.pro @@ -2,8 +2,6 @@ QT += widgets network dbus gui core TEMPLATE = lib CONFIG += plugin -include(../component/switchbutton.pri) - TARGET = $$qtLibraryTarget(mobilehotspot) DESTDIR = ../.. target.path = $$[QT_INSTALL_LIBS]/ukui-control-center diff --git a/plugins/mobilehotspot/mobilehotspotwidget.cpp b/plugins/mobilehotspot/mobilehotspotwidget.cpp index 641a1b94..f1225361 100644 --- a/plugins/mobilehotspot/mobilehotspotwidget.cpp +++ b/plugins/mobilehotspot/mobilehotspotwidget.cpp @@ -363,7 +363,7 @@ void MobileHotspotWidget::setSwitchFrame() m_switchLabel = new QLabel(tr("Open"), this); m_switchLabel->setMinimumWidth(LABLE_MIN_WIDTH); - m_switchBtn = new SwitchButton(this, false); + m_switchBtn = new SwitchButton(this); switchLayout->addSpacing(LAYOUT_LEFT_MARGINS); switchLayout->addWidget(m_switchLabel); switchLayout->addStretch(); diff --git a/plugins/mobilehotspot/mobilehotspotwidget.h b/plugins/mobilehotspot/mobilehotspotwidget.h index 5cf62e83..3a70ed2d 100644 --- a/plugins/mobilehotspot/mobilehotspotwidget.h +++ b/plugins/mobilehotspot/mobilehotspotwidget.h @@ -19,7 +19,7 @@ #include #include -#include "../component/SwitchButton/switchbutton.h" +#include "switchbutton.h" #include "titlelabel.h" class MobileHotspotWidget : public QWidget diff --git a/plugins/netconnect/deviceframe.h b/plugins/netconnect/deviceframe.h index 3ad4bf2c..5834b62c 100644 --- a/plugins/netconnect/deviceframe.h +++ b/plugins/netconnect/deviceframe.h @@ -7,7 +7,7 @@ #include #include #include -#include "../component/SwitchButton/switchbutton.h" +#include "switchbutton.h" #include "../component/DrownLabel/drownlabel.h" class DeviceFrame : public QFrame diff --git a/plugins/netconnect/netconnect.cpp b/plugins/netconnect/netconnect.cpp index 062720c6..304609f9 100644 --- a/plugins/netconnect/netconnect.cpp +++ b/plugins/netconnect/netconnect.cpp @@ -166,7 +166,7 @@ bool NetConnect::eventFilter(QObject *w, QEvent *e) { } void NetConnect::initComponent() { - wiredSwitch = new SwitchButton(pluginWidget, false); + wiredSwitch = new SwitchButton(pluginWidget); ui->openWIifLayout->addWidget(wiredSwitch); ui->detailLayOut->setContentsMargins(MAIN_LAYOUT_MARGINS); ui->verticalLayout_3->setContentsMargins(NO_MARGINS); diff --git a/plugins/netconnect/netconnect.h b/plugins/netconnect/netconnect.h index 5e722cfc..2126c399 100644 --- a/plugins/netconnect/netconnect.h +++ b/plugins/netconnect/netconnect.h @@ -48,7 +48,7 @@ #include "interface.h" #include "addbtn.h" #include "fixlabel.h" -#include "../component/SwitchButton/switchbutton.h" +#include "switchbutton.h" #include "hoverbtn.h" #include "lanitem.h" #include "deviceframe.h" diff --git a/plugins/netconnect/netconnect.pro b/plugins/netconnect/netconnect.pro index 77461449..874174fa 100644 --- a/plugins/netconnect/netconnect.pro +++ b/plugins/netconnect/netconnect.pro @@ -2,7 +2,6 @@ QT += widgets network dbus gui core TEMPLATE = lib CONFIG += plugin -include(../component/switchbutton.pri) include(../component/infobutton.pri) include(../component/drownlabel.pri) diff --git a/plugins/wlanconnect/wlanconnect.cpp b/plugins/wlanconnect/wlanconnect.cpp index 5d7e071d..7e022766 100644 --- a/plugins/wlanconnect/wlanconnect.cpp +++ b/plugins/wlanconnect/wlanconnect.cpp @@ -182,7 +182,7 @@ bool WlanConnect::eventFilter(QObject *w, QEvent *e) { } void WlanConnect::initComponent() { - m_wifiSwitch = new SwitchButton(pluginWidget, false); + m_wifiSwitch = new SwitchButton(pluginWidget); ui->openWIifLayout->addWidget(m_wifiSwitch); ui->detailLayOut_3->setContentsMargins(MAIN_LAYOUT_MARGINS); ui->verticalLayout_3->setContentsMargins(NO_MARGINS); diff --git a/plugins/wlanconnect/wlanconnect.h b/plugins/wlanconnect/wlanconnect.h index 9deb23ef..12550bbe 100644 --- a/plugins/wlanconnect/wlanconnect.h +++ b/plugins/wlanconnect/wlanconnect.h @@ -42,7 +42,7 @@ #include #include -#include "../component/SwitchButton/switchbutton.h" +#include "switchbutton.h" #include "hoverbtn.h" #include "itemframe.h" #include "wlanitem.h" diff --git a/plugins/wlanconnect/wlanconnect.pro b/plugins/wlanconnect/wlanconnect.pro index 5fff685c..c30cba96 100644 --- a/plugins/wlanconnect/wlanconnect.pro +++ b/plugins/wlanconnect/wlanconnect.pro @@ -2,7 +2,6 @@ QT += widgets network dbus gui core TEMPLATE = lib CONFIG += plugin -include(../component/switchbutton.pri) include(../component/infobutton.pri) include(../component/drownlabel.pri)