X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=c3172a7f9e446d7f90b32f4fc51026b27dd82a0a;hb=f5abb30ac6ec8089901d686d9c2ec3387f97aaef;hp=89ef829da0674e7e6ce677d644e99315d907b629;hpb=71d3d0d705a853fa8fea3729e13dbddf52363417;p=quassel.git diff --git a/src/client/client.h b/src/client/client.h index 89ef829d..c3172a7f 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -131,9 +131,7 @@ public: static inline CoreAccountModel *coreAccountModel() { return instance()->_coreAccountModel; } static inline CoreConnection *coreConnection() { return instance()->_coreConnection; } static inline CoreAccount currentCoreAccount() { return coreConnection()->currentAccount(); } - static inline Quassel::Features coreFeatures() { return _coreFeatures; } - - static void setCoreFeatures(Quassel::Features features); + static bool isCoreFeatureEnabled(Quassel::Feature feature); static bool isConnected(); static bool internalCore(); @@ -152,6 +150,10 @@ public: static void changePassword(const QString &oldPassword, const QString &newPassword); static void kickClient(int peerId); + void displayIgnoreList(QString ignoreRule) { + emit showIgnoreList(ignoreRule); + } + #if QT_VERSION < 0x050000 static void logMessage(QtMsgType type, const char *msg); #else @@ -159,10 +161,16 @@ public: #endif static inline const QString &debugLog() { return instance()->_debugLogBuffer; } + void displayChannelList(NetworkId networkId) { + emit showChannelList(networkId); + } + signals: void requestNetworkStates(); void showConfigWizard(const QVariantMap &coredata); + void showChannelList(NetworkId networkId); + void showIgnoreList(QString ignoreRule); void connected(); void disconnected(); @@ -277,7 +285,6 @@ private: QHash _identities; bool _connected; - static Quassel::Features _coreFeatures; QString _debugLogBuffer; QTextStream _debugLog;