From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 22 Dec 2017 02:47:09 +0000 (+0100)
Subject: Fix compile error with Qt4
X-Git-Tag: travis-deploy-test~151
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=93605206bc40e06446efabc71e155a3216dbb0b9;hp=928af86f954aaa925b35505957faced2ea5ac964

Fix compile error with Qt4

In Qt4, signals are protected, therefore we can’t emit a signal on
Client from the ClientUserInputHandler.

Therefore we wrap the signal emitter with a function on the Client.

Closes GH-320.
---

diff --git a/src/client/client.h b/src/client/client.h
index a7e6c2c2..c3172a7f 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -161,6 +161,10 @@ public:
 #endif
     static inline const QString &debugLog() { return instance()->_debugLogBuffer; }
 
+    void displayChannelList(NetworkId networkId) {
+        emit showChannelList(networkId);
+    }
+
 signals:
     void requestNetworkStates();
 
diff --git a/src/client/clientuserinputhandler.cpp b/src/client/clientuserinputhandler.cpp
index 561eb3d8..9d84ab81 100644
--- a/src/client/clientuserinputhandler.cpp
+++ b/src/client/clientuserinputhandler.cpp
@@ -142,7 +142,7 @@ void ClientUserInputHandler::handleIgnore(const BufferInfo &bufferInfo, const QS
 
 void ClientUserInputHandler::handleList(const BufferInfo &bufferInfo, const QString &text)
 {
-    emit Client::instance()->showChannelList(bufferInfo.networkId());
+    Client::instance()->displayChannelList(bufferInfo.networkId());
 }