X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.h;h=564eda89c70664aa53dc0bfbe6f9518b3d4e99e3;hp=24347a8e670c1af02b586fff91791d15ca5b8ba4;hb=5e9a649d94d1832e0b4f3f296e8a2df2d8741d9b;hpb=70ed7f4b13ab21a9b3dcb61386b56ad324ed697d

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index 24347a8e..564eda89 100644
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _IRCCHANNEL_H_
-#define _IRCCHANNEL_H_
+#ifndef IRCCHANNEL_H
+#define IRCCHANNEL_H
 
 #include <QHash>
 #include <QSet>
@@ -33,6 +33,7 @@ class IrcUser;
 class Network;
 
 class IrcChannel : public SyncableObject {
+  SYNCABLE_OBJECT
   Q_OBJECT
 
   Q_PROPERTY(QString name READ name STORED false)
@@ -41,6 +42,7 @@ class IrcChannel : public SyncableObject {
 
 public:
   IrcChannel(const QString &channelname, Network *network);
+  ~IrcChannel();
 
   bool isKnownUser(IrcUser *ircuser) const;
   bool isValidChannelUserMode(const QString &mode) const;
@@ -48,6 +50,7 @@ public:
   inline QString name() const { return _name; }
   inline QString topic() const { return _topic; }
   inline QString password() const { return _password; }
+  inline Network *network() const { return _network; }
 
   inline QList<IrcUser *> ircUsers() const { return _userModes.keys(); }
 
@@ -58,7 +61,7 @@ public:
   QString modeValue(const QChar &mode) const;
   QStringList modeValueList(const QChar &mode) const;
   QString channelModeString() const;
-  
+
   inline QTextCodec *codecForEncoding() const { return _codecForEncoding; }
   inline QTextCodec *codecForDecoding() const { return _codecForDecoding; }
   void setCodecForEncoding(const QString &codecName);
@@ -75,8 +78,7 @@ public slots:
 
   void joinIrcUsers(const QList<IrcUser *> &users, const QStringList &modes);
   void joinIrcUsers(const QStringList &nicks, const QStringList &modes);
-  void joinIrcUsers(IrcUser *ircuser);
-  void joinIrcUsers(const QString &nick);
+  void joinIrcUser(IrcUser *ircuser);
 
   void part(IrcUser *ircuser);
   void part(const QString &nick);
@@ -102,22 +104,24 @@ public slots:
   void initSetChanModes(const QVariantMap &chanModes);
 
 signals:
-  void topicSet(const QString &topic);
-  void passwordSet(const QString &password);
-  void userModesSet(QString nick, QString modes);
-  void userModeAdded(QString nick, QString mode);
-  void userModeRemoved(QString nick, QString mode);
-  void channelModeAdded(const QChar &mode, const QString &value);
-  void channelModeRemoved(const QChar &mode, const QString &value);
-  
+  void topicSet(const QString &topic); // needed by NetworkModel
+//   void passwordSet(const QString &password);
+//   void userModesSet(QString nick, QString modes);
+//   void userModeAdded(QString nick, QString mode);
+//   void userModeRemoved(QString nick, QString mode);
+//   void channelModeAdded(const QChar &mode, const QString &value);
+//   void channelModeRemoved(const QChar &mode, const QString &value);
+
   void ircUsersJoined(QList<IrcUser *> ircusers);
-  void ircUsersJoined(QStringList nicks, QStringList modes);
+//   void ircUsersJoined(QStringList nicks, QStringList modes);
   void ircUserParted(IrcUser *ircuser);
   void ircUserNickSet(IrcUser *ircuser, QString nick);
   void ircUserModeAdded(IrcUser *ircuser, QString mode);
   void ircUserModeRemoved(IrcUser *ircuser, QString mode);
   void ircUserModesSet(IrcUser *ircuser, QString modes);
 
+  void parted(); // convenience signal emitted before channels destruction
+
 private slots:
    void ircUserDestroyed();
    void ircUserNickSet(QString nick);
@@ -130,7 +134,7 @@ private:
 
   QHash<IrcUser *, QString> _userModes;
 
-  Network *network;
+  Network *_network;
 
   QTextCodec *_codecForEncoding;
   QTextCodec *_codecForDecoding;
@@ -139,7 +143,6 @@ private:
   QHash<QChar, QString> _B_channelModes;
   QHash<QChar, QString> _C_channelModes;
   QSet<QChar> _D_channelModes;
-
 };
 
 #endif