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

diff --git a/src/core/coreirclisthelper.h b/src/core/coreirclisthelper.h
index d6b3a2d5..8cb7c628 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,48 +15,48 @@
  *   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 <memory>
 
 #include "irclisthelper.h"
 
 #include "coresession.h"
 
+class QBasicTimer;
 class QTimerEvent;
 
-class CoreIrcListHelper : public IrcListHelper {
-  Q_OBJECT
+class CoreIrcListHelper : public IrcListHelper
+{
+    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, QVariantList> _finishedChannelLists;
-  QHash<int, NetworkId> _queryTimeout;
+    QHash<NetworkId, QString> _queuedQuery;
+    QHash<NetworkId, QList<ChannelDescription> > _channelLists;
+    QHash<NetworkId, QVariantList> _finishedChannelLists;
+    QHash<int, NetworkId> _queryTimeoutByTimerId;
+    QHash<NetworkId, std::shared_ptr<QBasicTimer>> _queryTimeoutByNetId;
 };
-
-#endif //COREIRCLISTHELPER_H