X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreirclisthelper.h;h=e0a0c82b8492ed5070aafb91cd1174ce296d2dee;hp=2660c281d80f84aeb7da0c77835bc233690b5d32;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/core/coreirclisthelper.h b/src/core/coreirclisthelper.h
index 2660c281..e0a0c82b 100644
--- a/src/core/coreirclisthelper.h
+++ b/src/core/coreirclisthelper.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,51 +15,49 @@
  *   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
-#define COREIRCLISTHELPER_H
+#pragma once
 
-#include "irclisthelper.h"
+#include <memory>
 
 #include "coresession.h"
+#include "irclisthelper.h"
 
+class QBasicTimer;
 class QTimerEvent;
 
 class CoreIrcListHelper : public IrcListHelper
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
-    inline CoreIrcListHelper(CoreSession *coreSession) : IrcListHelper(coreSession), _coreSession(coreSession) {};
-
-    inline virtual const QMetaObject *syncMetaObject() const { return &IrcListHelper::staticMetaObject; }
+    inline CoreIrcListHelper(CoreSession* coreSession)
+        : IrcListHelper(coreSession)
+        , _coreSession(coreSession){};
 
-    inline CoreSession *coreSession() const { return _coreSession; }
+    inline CoreSession* coreSession() const { return _coreSession; }
 
-    inline bool requestInProgress(const NetworkId &netId) const { return _channelLists.contains(netId); }
+    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);
+    QVariantList requestChannelList(const NetworkId& netId, const QStringList& channelFilters) override;
+    bool addChannel(const NetworkId& netId, const QString& channelName, quint32 userCount, const QString& topic);
+    bool endOfChannelList(const NetworkId& netId);
 
 protected:
-    void timerEvent(QTimerEvent *event);
+    void timerEvent(QTimerEvent* event) override;
 
 private:
-    bool dispatchQuery(const NetworkId &netId, const QString &query);
+    bool dispatchQuery(const NetworkId& netId, const QString& query);
 
 private:
-    CoreSession *_coreSession;
+    CoreSession* _coreSession;
 
     QHash<NetworkId, QString> _queuedQuery;
-    QHash<NetworkId, QList<ChannelDescription> > _channelLists;
+    QHash<NetworkId, QList<ChannelDescription>> _channelLists;
     QHash<NetworkId, QVariantList> _finishedChannelLists;
-    QHash<int, NetworkId> _queryTimeout;
+    QHash<int, NetworkId> _queryTimeoutByTimerId;
+    QHash<NetworkId, std::shared_ptr<QBasicTimer>> _queryTimeoutByNetId;
 };
-
-
-#endif //COREIRCLISTHELPER_H