X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=4b8c4bcf4e5d8def7e3bb4c3d2a96797ed36c6b5;hb=e04ec81f1b7a29542135286854040d353e1e1474;hp=225caab82841c855a8c27156ec5e3ddf2f3c3600;hpb=095d3006b60d64ef3a705ee204afe5e555ca8729;p=quassel.git diff --git a/src/client/client.h b/src/client/client.h index 225caab8..4b8c4bcf 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2016 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -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(); @@ -163,10 +161,15 @@ 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(); @@ -282,7 +285,6 @@ private: QHash _identities; bool _connected; - static Quassel::Features _coreFeatures; QString _debugLogBuffer; QTextStream _debugLog;