Closing BR #126

[quassel.git] / src / common / ircuser.h

diff --git a/src/common/ircuser.h b/src/common/ircuser.h
index da96323..ea1eb3f 100644 (file)
--- a/src/common/ircuser.h
+++ b/src/common/ircuser.h
@@ -48,7 +48,7 @@ class IrcUser : public SyncableObject {
   Q_PROPERTY(int lastAwayMessage READ lastAwayMessage WRITE setLastAwayMessage STORED false)
 
   Q_PROPERTY(QStringList channels READ channels STORED false)
-  //  Q_PROPERTY(QStringList usermodes READ usermodes WRITE setUsermodes)
+  Q_PROPERTY(QString userModes READ userModes WRITE setUserModes)
 
 public:
   IrcUser(const QString &hostmask, Network *network);
@@ -80,7 +80,7 @@ public:
   void setCodecForDecoding(QTextCodec *codec);
 
   QString decodeString(const QByteArray &text) const;
-  QByteArray encodeString(const QString string) const;
+  QByteArray encodeString(const QString &string) const;
 
 public slots:
   void setUser(const QString &user);
@@ -102,11 +102,8 @@ public slots:
   void partChannel(IrcChannel *channel);
   void partChannel(const QString &channelname);
 
-  void addUserMode(const QString &mode);
-  void removeUserMode(const QString &mode);
-
-  // init seters
-  void initSetChannels(const QStringList channels);
+  void addUserModes(const QString &modes);
+  void removeUserModes(const QString &modes);
 
 signals:
   void userSet(QString user);
@@ -123,16 +120,11 @@ signals:
 
   void userModesSet(QString modes);
 
-  void channelJoined(QString channel);
+  // void channelJoined(QString channel);
   void channelParted(QString channel);
 
-  void userModeAdded(QString mode);
-  void userModeRemoved(QString mode);
-
-  void renameObject(QString oldname, QString newname);
-
-//   void setUsermodes(const QSet<QString> &usermodes);
-//   QSet<QString> usermodes() const;
+  void userModesAdded(QString modes);
+  void userModesRemoved(QString modes);
 
 private slots:
   void updateObjectName();