X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreirclisthelper.h;h=3b214523857a9cad3067e8322d9f8b7b6e0cb28c;hp=84303ad61e36fd27e99c0233a2ad40bf4dab0a7a;hb=02666f58f85f8c8a127804716e7df2d52d1e273c;hpb=fe4b38e66592f11fdf4c4651863968983daecd2d diff --git a/src/core/coreirclisthelper.h b/src/core/coreirclisthelper.h index 84303ad6..3b214523 100644 --- a/src/core/coreirclisthelper.h +++ b/src/core/coreirclisthelper.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-08 by the Quassel Project * + * Copyright (C) 2005-2014 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #ifndef COREIRCLISTHELPER_H @@ -25,27 +25,41 @@ #include "coresession.h" -class CoreIrcListHelper : public IrcListHelper { - Q_OBJECT +class QTimerEvent; + +class CoreIrcListHelper : public IrcListHelper +{ + SYNCABLE_OBJECT + Q_OBJECT public: - inline CoreIrcListHelper(CoreSession *coreSession) : IrcListHelper(coreSession), _coreSession(coreSession) {}; + inline CoreIrcListHelper(CoreSession *coreSession) : IrcListHelper(coreSession), _coreSession(coreSession) {}; + + inline virtual const QMetaObject *syncMetaObject() const { return &IrcListHelper::staticMetaObject; } - inline virtual const QMetaObject *syncMetaObject() const { return &IrcListHelper::staticMetaObject; } + inline CoreSession *coreSession() const { return _coreSession; } - inline CoreSession *coreSession() const { return _coreSession; } + inline bool requestInProgress(const NetworkId &netId) const { return _channelLists.contains(netId); } public slots: - virtual QVariantList requestChannelList(const NetworkId &netId, const QStringList &channelFilters); - bool addChannel(const NetworkId &netId, const QString &channelName, quint32 userCount, const QString &topic); - bool endOfChannelList(const NetworkId &netId); + virtual QVariantList requestChannelList(const NetworkId &netId, const QStringList &channelFilters); + bool addChannel(const NetworkId &netId, const QString &channelName, quint32 userCount, const QString &topic); + bool endOfChannelList(const NetworkId &netId); + +protected: + void timerEvent(QTimerEvent *event); private: - CoreSession *_coreSession; + bool dispatchQuery(const NetworkId &netId, const QString &query); - QHash _queuedQuery; - QHash > _channelLists; - QHash _finishedChannelLists; +private: + CoreSession *_coreSession; + + QHash _queuedQuery; + QHash > _channelLists; + QHash _finishedChannelLists; + QHash _queryTimeout; }; + #endif //COREIRCLISTHELPER_H