X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.h;h=4a71e0f2e4be1cd27e3c25c0d3d6c7fd48b025bb;hp=7275cd6700846062de70d71911b83cfbab488f34;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=92fc8c5b119111a35ab8423c3cbde5b2a022badf

diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h
index 7275cd67..4a71e0f2 100644
--- a/src/common/ircchannel.h
+++ b/src/common/ircchannel.h
@@ -43,90 +43,89 @@ class COMMON_EXPORT IrcChannel : public SyncableObject
     Q_PROPERTY(QString password READ password WRITE setPassword)
     Q_PROPERTY(bool encrypted READ encrypted WRITE setEncrypted)
 
-public :
-    IrcChannel(const QString &channelname, Network *network);
-    ~IrcChannel();
+public:
+    IrcChannel(const QString& channelname, Network* network);
 
-    bool isKnownUser(IrcUser *ircuser) const;
-    bool isValidChannelUserMode(const QString &mode) const;
+    bool isKnownUser(IrcUser* ircuser) const;
+    bool isValidChannelUserMode(const QString& mode) const;
 
     inline QString name() const { return _name; }
     inline QString topic() const { return _topic; }
     inline QString password() const { return _password; }
     inline bool encrypted() const { return _encrypted; }
-    inline Network *network() const { return _network; }
+    inline Network* network() const { return _network; }
 
-    inline QList<IrcUser *> ircUsers() const { return _userModes.keys(); }
+    inline QList<IrcUser*> ircUsers() const { return _userModes.keys(); }
 
-    QString userModes(IrcUser *ircuser) const;
-    QString userModes(const QString &nick) const;
+    QString userModes(IrcUser* ircuser) const;
+    QString userModes(const QString& nick) const;
 
-    bool hasMode(const QChar &mode) const;
-    QString modeValue(const QChar &mode) const;
-    QStringList modeValueList(const QChar &mode) const;
+    bool hasMode(const QChar& mode) const;
+    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);
-    void setCodecForEncoding(QTextCodec *codec);
-    void setCodecForDecoding(const QString &codecName);
-    void setCodecForDecoding(QTextCodec *codec);
+    inline QTextCodec* codecForEncoding() const { return _codecForEncoding; }
+    inline QTextCodec* codecForDecoding() const { return _codecForDecoding; }
+    void setCodecForEncoding(const QString& codecName);
+    void setCodecForEncoding(QTextCodec* codec);
+    void setCodecForDecoding(const QString& codecName);
+    void setCodecForDecoding(QTextCodec* codec);
 
-    QString decodeString(const QByteArray &text) const;
-    QByteArray encodeString(const QString &string) const;
+    QString decodeString(const QByteArray& text) const;
+    QByteArray encodeString(const QString& string) const;
 
 public slots:
-    void setTopic(const QString &topic);
-    void setPassword(const QString &password);
+    void setTopic(const QString& topic);
+    void setPassword(const QString& password);
     void setEncrypted(bool encrypted);
 
-    void joinIrcUsers(const QList<IrcUser *> &users, const QStringList &modes);
-    void joinIrcUsers(const QStringList &nicks, const QStringList &modes);
-    void joinIrcUser(IrcUser *ircuser);
+    void joinIrcUsers(const QList<IrcUser*>& users, const QStringList& modes);
+    void joinIrcUsers(const QStringList& nicks, const QStringList& modes);
+    void joinIrcUser(IrcUser* ircuser);
 
-    void part(IrcUser *ircuser);
-    void part(const QString &nick);
+    void part(IrcUser* ircuser);
+    void part(const QString& nick);
 
-    void setUserModes(IrcUser *ircuser, const QString &modes);
-    void setUserModes(const QString &nick, const QString &modes);
+    void setUserModes(IrcUser* ircuser, const QString& modes);
+    void setUserModes(const QString& nick, const QString& modes);
 
-    void addUserMode(IrcUser *ircuser, const QString &mode);
-    void addUserMode(const QString &nick, const QString &mode);
+    void addUserMode(IrcUser* ircuser, const QString& mode);
+    void addUserMode(const QString& nick, const QString& mode);
 
-    void removeUserMode(IrcUser *ircuser, const QString &mode);
-    void removeUserMode(const QString &nick, const QString &mode);
+    void removeUserMode(IrcUser* ircuser, const QString& mode);
+    void removeUserMode(const QString& nick, const QString& mode);
 
-    void addChannelMode(const QChar &mode, const QString &value);
-    void removeChannelMode(const QChar &mode, const QString &value);
+    void addChannelMode(const QChar& mode, const QString& value);
+    void removeChannelMode(const QChar& mode, const QString& value);
 
     // init geters
     QVariantMap initUserModes() const;
     QVariantMap initChanModes() const;
 
     // init seters
-    void initSetUserModes(const QVariantMap &usermodes);
-    void initSetChanModes(const QVariantMap &chanModes);
+    void initSetUserModes(const QVariantMap& usermodes);
+    void initSetChanModes(const QVariantMap& chanModes);
 
 signals:
-    void topicSet(const QString &topic); // needed by NetworkModel
+    void topicSet(const QString& topic);  // needed by NetworkModel
     void encryptedSet(bool encrypted);
-//   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 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
+    //   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(const QList<IrcUser*>& ircusers);
+    //   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();
@@ -139,12 +138,12 @@ private:
     QString _password;
     bool _encrypted;
 
-    QHash<IrcUser *, QString> _userModes;
+    QHash<IrcUser*, QString> _userModes;
 
-    Network *_network;
+    Network* _network;
 
-    QTextCodec *_codecForEncoding;
-    QTextCodec *_codecForDecoding;
+    QTextCodec* _codecForEncoding;
+    QTextCodec* _codecForDecoding;
 
     QHash<QChar, QStringList> _A_channelModes;
     QHash<QChar, QString> _B_channelModes;