signal changeTheme name changed to not override parent slot

PIVX-Project · Aug 28, 2019 · 316977a · 316977a
1 parent c75ffb7
commit 316977a
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/src/qt/pivx.qrc b/src/qt/pivx.qrc
@@ -165,7 +165,6 @@
         <file alias="ic-arrow-white-right">pivx/res/img/ic-arrow-white-right.svg</file>
         <file alias="ic-check-active">pivx/res/img/ic-check-active.svg</file>
         <file alias="ic-check-box">pivx/res/img/ic-check-box.svg</file>
-        <file alias="ic-check-box-indeterminate">pivx/res/img/ic-check-box-indeterminate.svg</file>
         <file alias="ic-check-box-liliac-indeterminate">pivx/res/img/ic-check-box-liliac-indeterminate.svg</file>
         <file alias="ic-check-connect-off">pivx/res/img/ic-check-connect-off.svg</file>
         <file alias="ic-check-connect">pivx/res/img/ic-check-connect.svg</file>

diff --git a/src/qt/pivx/PIVXGUI.cpp b/src/qt/pivx/PIVXGUI.cpp
@@ -174,7 +174,7 @@ void PIVXGUI::connectActions() {
     });
 
     connect(topBar, &TopBar::showHide, this, &PIVXGUI::showHide);
-    connect(topBar, &TopBar::changeTheme, this, &PIVXGUI::changeTheme);
+    connect(topBar, &TopBar::themeChanged, this, &PIVXGUI::changeTheme);
     connect(settingsWidget, &SettingsWidget::showHide, this, &PIVXGUI::showHide);
     connect(sendWidget, &SendWidget::showHide, this, &PIVXGUI::showHide);
     connect(receiveWidget, &ReceiveWidget::showHide, this, &PIVXGUI::showHide);

diff --git a/src/qt/pivx/topbar.cpp b/src/qt/pivx/topbar.cpp
@@ -144,7 +144,7 @@ void TopBar::onThemeClicked(){
         updateStyle(ui->pushButtonTheme);
     }
 
-    emit changeTheme(lightTheme);
+    emit themeChanged(lightTheme);
 }
 
 

diff --git a/src/qt/pivx/topbar.h b/src/qt/pivx/topbar.h
@@ -44,7 +44,7 @@ public slots:
     void updateStakingStatus();
 
 signals:
-    void changeTheme(bool isLight);
+    void themeChanged(bool isLight);
     void walletSynced(bool isSync);
 private slots:
     void onBtnReceiveClicked();