X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Firclisthelper.h;h=72c37126543e3b17b6b54e2406278858071c5903;hp=8bf7f94ebd6a4291e9729461cfd05769fad4b18a;hb=09515f0300f18490ee1788392a7518a6e1ab5acc;hpb=fe4b38e66592f11fdf4c4651863968983daecd2d

diff --git a/src/common/irclisthelper.h b/src/common/irclisthelper.h
index 8bf7f94e..72c37126 100644
--- a/src/common/irclisthelper.h
+++ b/src/common/irclisthelper.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -33,10 +33,11 @@
  *  3.) client pulls the data by calling requestChannelList again. receiving the data in receiveChannelList
  */
 class IrcListHelper : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
 public:
-  inline IrcListHelper(QObject *parent = 0) : SyncableObject(parent) {};
+  inline IrcListHelper(QObject *parent = 0) : SyncableObject(parent) { setInitialized(); };
 
   struct ChannelDescription {
     QString channelName;
@@ -46,13 +47,11 @@ public:
   };
 
 public slots:
-  inline virtual QVariantList requestChannelList(const NetworkId &netId, const QStringList &channelFilters) { emit channelListRequested(netId, channelFilters); return QVariantList(); }
+  inline virtual QVariantList requestChannelList(const NetworkId &netId, const QStringList &channelFilters) { REQUEST(ARG(netId), ARG(channelFilters)); return QVariantList(); }
   inline virtual void receiveChannelList(const NetworkId &, const QStringList &, const QVariantList &) {};
-  inline virtual void reportFinishedList(const NetworkId &netId) { emit finishedListReported(netId); }
-
-signals:
-  void channelListRequested(const NetworkId &netId, const QStringList &channelFilters);
-  void finishedListReported(const NetworkId &netId);
+  inline virtual void reportFinishedList(const NetworkId &netId) { SYNC(ARG(netId)) }
+  inline virtual void reportError(const QString &error) { SYNC(ARG(error)) }
 };
 
+
 #endif //IRCLISTHELPER_H