fix kde4 build

fix tray destruction on KF5

sources/.kdev4/sources.kdev4

@@ -8,7 +8,7 @@ ProjectRootRelative=./
 
 [CMake][CMake Build Directory 0]
 Build Directory Path=file:///home/arcanis/Documents/github/netctl-gui/build
-Build Type=Release
+Build Type=Debug
 CMake Binary=file:///usr/bin/cmake
 Environment Profile=
 Extra Arguments=

sources/gui/src/mainwidget.cpp

@@ -148,8 +148,7 @@ void MainWidget::updateMainTab()
     if (debug) qDebug() << PDEBUG;
     if (!checkExternalApps(QString("netctl"), configuration, debug)) {
         ErrorWindow::showWindow(1, QString(PDEBUG), debug);
-        emit(mainWindow->needToBeConfigured());
+        return mainWindow->emitNeedToBeConfigured();
-        return;
     }
 
     mainWindow->setDisabled(true);
@@ -299,8 +298,7 @@ void MainWidget::mainTabEnableProfile()
     if (debug) qDebug() << PDEBUG;
     if (!checkExternalApps(QString("netctl"), configuration, debug)) {
         ErrorWindow::showWindow(1, QString(PDEBUG), debug);
-        emit(mainWindow->needToBeConfigured());
+        return mainWindow->emitNeedToBeConfigured();
-        return;
     }
     if (ui->tableWidget_main->currentItem() == nullptr) return;
 
@@ -335,8 +333,7 @@ void MainWidget::mainTabRestartProfile()
     if (debug) qDebug() << PDEBUG;
     if (!checkExternalApps(QString("netctl"), configuration, debug)) {
         ErrorWindow::showWindow(1, QString(PDEBUG), debug);
-        emit(mainWindow->needToBeConfigured());
+        return mainWindow->emitNeedToBeConfigured();
-        return;
     }
     if (ui->tableWidget_main->currentItem() == nullptr) return;
 
@@ -355,8 +352,7 @@ void MainWidget::mainTabStartProfile()
     if (debug) qDebug() << PDEBUG;
     if (!checkExternalApps(QString("netctl"), configuration, debug)) {
         ErrorWindow::showWindow(1, QString(PDEBUG), debug);
-        emit(mainWindow->needToBeConfigured());
+        return mainWindow->emitNeedToBeConfigured();
-        return;
     }
     if (ui->tableWidget_main->currentItem() == nullptr) return;
 
@@ -375,8 +371,7 @@ void MainWidget::mainTabStopAllProfiles()
     if (debug) qDebug() << PDEBUG;
     if (!checkExternalApps(QString("netctl"), configuration, debug)) {
         ErrorWindow::showWindow(1, QString(PDEBUG), debug);
-        emit(mainWindow->needToBeConfigured());
+        return mainWindow->emitNeedToBeConfigured();
-        return;
     }
 
     mainWindow->setDisabled(true);
@@ -393,8 +388,7 @@ void MainWidget::mainTabSwitchToProfile()
     if (debug) qDebug() << PDEBUG;
     if (!checkExternalApps(QString("netctl"), configuration, debug)) {
         ErrorWindow::showWindow(1, QString(PDEBUG), debug);
-        emit(mainWindow->needToBeConfigured());
+        return mainWindow->emitNeedToBeConfigured();
-        return;
     }
     if (ui->tableWidget_main->currentItem() == nullptr) return;
 

sources/gui/src/mainwindow.cpp

@@ -121,6 +121,14 @@ Qt::ToolBarArea MainWindow::getToolBarArea()
 }
 
 
+void MainWindow::emitNeedToBeConfigured()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    emit(needToBeConfigured());
+}
+
+
 QStringList MainWindow::printSettings()
 {
     if (debug) qDebug() << PDEBUG;

sources/gui/src/mainwindow.h

@@ -48,6 +48,7 @@ public:
                         QTranslator *appTranslator = 0);
     ~MainWindow();
     Qt::ToolBarArea getToolBarArea();
+    void emitNeedToBeConfigured();
     QStringList printSettings();
     netctlCurrent printTrayInformation();
     bool isHelperActive();
@@ -86,9 +87,6 @@ public slots:
 
 signals:
     void needToBeConfigured();
-    void needShowAboutWindow();
-    void needShowNetctlAutoWindow();
-    void needShowSettingsWindow();
 
 private slots:
     void setTabByAction(QAction *action);

sources/gui/src/trayicon.cpp

@@ -41,11 +41,10 @@ TrayIcon::~TrayIcon()
 {
     if (debug) qDebug() << PDEBUG;
 
-    setContextMenu(0);
+    setContextMenu(nullptr);
     startProfileMenu->clear();
     switchToProfileMenu->clear();
     menuActions->clear();
-    delete menuActions;
 }
 
 
@@ -100,8 +99,6 @@ void TrayIcon::updateMenu()
         for (int i=0; i<info.profiles.count(); i++)
             startProfileMenu->addAction(info.profiles[i]);
     }
-
-//     setContextMenu(menuActions);
 }
 
 

sources/gui/src/wifimenuwidget.cpp

@@ -184,8 +184,7 @@ void WiFiMenuWidget::updateText(const netctlWifiInfo current)
     if (!wifiTabSetEnabled(checkExternalApps(QString("wpasup-only"), configuration, debug))) return;
     if (!checkExternalApps(QString("wpasup"), configuration, debug)) {
         ErrorWindow::showWindow(1, QString(PDEBUG), debug);
-        emit(mainWindow->needToBeConfigured());
+        return mainWindow->emitNeedToBeConfigured();
-        return;
     }
     ui->label_wifi->setText(QApplication::translate("WiFiMenuWidget", "Processing..."));
 
@@ -203,8 +202,7 @@ void WiFiMenuWidget::updateWifiTab()
     if (!wifiTabSetEnabled(checkExternalApps(QString("wpasup-only"), configuration, debug))) return;
     if (!checkExternalApps(QString("wpasup"), configuration, debug)) {
         ErrorWindow::showWindow(1, QString(PDEBUG), debug);
-        emit(mainWindow->needToBeConfigured());
+        return mainWindow->emitNeedToBeConfigured();
-        return;
     }
 
     mainWindow->setDisabled(true);
@@ -366,8 +364,7 @@ void WiFiMenuWidget::wifiTabStart()
     if (debug) qDebug() << PDEBUG;
     if (!checkExternalApps(QString("wpasup"), configuration, debug)) {
         ErrorWindow::showWindow(1, QString(PDEBUG), debug);
-        emit(mainWindow->needToBeConfigured());
+        return mainWindow->emitNeedToBeConfigured();
-        return;
     }
     if (ui->tableWidget_wifi->currentItem() == nullptr) return;