From: Hannah von Reth <vonreth@kde.org>
Date: Thu, 5 Nov 2015 18:07:31 +0000 (+0100)
Subject: Fix build with Qt4
X-Git-Tag: travis-deploy-test~542^2
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=fa8ddc36d262e7de28f56793cebc0e2eb965c421

Fix build with Qt4
---

diff --git a/src/qtui/mainpage.cpp b/src/qtui/mainpage.cpp
index 15f83a89..4838e251 100644
--- a/src/qtui/mainpage.cpp
+++ b/src/qtui/mainpage.cpp
@@ -37,24 +37,30 @@ MainPage::MainPage(QWidget *parent) : QWidget(parent)
     layout->addWidget(label);
 
     if (Quassel::runMode() != Quassel::Monolithic) {
-        QPushButton *connectButton = new QPushButton(QIcon::fromTheme("network-connect"), tr("Connect to Core..."));
-        connectButton->setEnabled(Client::coreConnection()->state() == CoreConnection::Disconnected);
+        _connectButton = new QPushButton(QIcon::fromTheme("network-connect"), tr("Connect to Core..."));
+        _connectButton->setEnabled(Client::coreConnection()->state() == CoreConnection::Disconnected);
 
-        connect(Client::coreConnection(), &CoreConnection::stateChanged, [connectButton](CoreConnection::ConnectionState state){
-             if (state == CoreConnection::Disconnected) {
-                 connectButton->setEnabled(true);
-             } else {
-                 connectButton->setDisabled(true);
-             }
-        });
-        connect(connectButton, &QPushButton::clicked, [this](){
-            CoreConnectDlg dlg(this);
-            if (dlg.exec() == QDialog::Accepted) {
-                AccountId accId = dlg.selectedAccount();
-                if (accId.isValid())
-                    Client::coreConnection()->connectToCore(accId);
-            }
-        });
-        layout->addWidget(connectButton);
+        connect(Client::coreConnection(), SIGNAL(stateChanged(CoreConnection::ConnectionState)), this, SLOT(coreConnectionStateChanged()));
+        connect(_connectButton, SIGNAL(clicked(bool)), this, SLOT(showCoreConnectionDlg()));
+        layout->addWidget(_connectButton);
+    }
+}
+
+void MainPage::showCoreConnectionDlg()
+{
+    CoreConnectDlg dlg(this);
+    if (dlg.exec() == QDialog::Accepted) {
+        AccountId accId = dlg.selectedAccount();
+        if (accId.isValid())
+            Client::coreConnection()->connectToCore(accId);
+    }
+}
+
+void MainPage::coreConnectionStateChanged()
+{
+    if (Client::coreConnection()->state() == CoreConnection::Disconnected) {
+        _connectButton->setEnabled(true);
+    } else {
+        _connectButton->setDisabled(true);
     }
 }
diff --git a/src/qtui/mainpage.h b/src/qtui/mainpage.h
index 0c48b9fa..6ac80394 100644
--- a/src/qtui/mainpage.h
+++ b/src/qtui/mainpage.h
@@ -23,6 +23,8 @@
 
 #include <QWidget>
 
+class QPushButton;
+
 class MainPage : public QWidget
 {
     Q_OBJECT
@@ -30,6 +32,12 @@ class MainPage : public QWidget
 public:
     MainPage(QWidget *parent = 0);
 
+private slots:
+    void showCoreConnectionDlg();
+    void coreConnectionStateChanged();
+
+private:
+    QPushButton *_connectButton;
 };