X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreirclisthelper.h;h=8cb7c628e9a5e435993c38fe9a9a575ced044723;hp=76767cdf7c90c5f0023d975357c230aab6c54dbd;hb=e8a39b4c3c92e193ab861a3fea84a261bb6fbd24;hpb=b65b9f7615165e8700a44d59b7275a55558dd45b

diff --git a/src/core/coreirclisthelper.h b/src/core/coreirclisthelper.h
index 76767cdf..8cb7c628 100644
--- a/src/core/coreirclisthelper.h
+++ b/src/core/coreirclisthelper.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 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  *
@@ -18,36 +18,35 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREIRCLISTHELPER_H
-#define COREIRCLISTHELPER_H
+#pragma once
+
+#include <memory>
 
 #include "irclisthelper.h"
 
 #include "coresession.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 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);
+    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);
@@ -58,8 +57,6 @@ private:
     QHash<NetworkId, QString> _queuedQuery;
     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