X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircchannel.h;h=4a71e0f2e4be1cd27e3c25c0d3d6c7fd48b025bb;hp=0c0f2ed1feb59eedbe55aef05bd92648f560cca5;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=2fde026f4e0509e164be0ccd50174cb6b1103d55 diff --git a/src/common/ircchannel.h b/src/common/ircchannel.h index 0c0f2ed1..4a71e0f2 100644 --- a/src/common/ircchannel.h +++ b/src/common/ircchannel.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005/06 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,11 +15,12 @@ * 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 IRCCHANNEL_H -#define IRCCHANNEL_H +#pragma once + +#include "common-export.h" #include #include @@ -29,133 +30,123 @@ #include "syncableobject.h" -#ifdef HAVE_QCA2 -#include "cipher.h" -#endif - class IrcUser; class Network; -class IrcChannel : public SyncableObject { - SYNCABLE_OBJECT - Q_OBJECT +class COMMON_EXPORT IrcChannel : public SyncableObject +{ + Q_OBJECT + SYNCABLE_OBJECT - Q_PROPERTY(QString name READ name STORED false) - Q_PROPERTY(QString topic READ topic WRITE setTopic STORED false) - Q_PROPERTY(QString password READ password WRITE setPassword STORED false) + Q_PROPERTY(QString name READ name) + Q_PROPERTY(QString topic READ topic WRITE setTopic) + Q_PROPERTY(QString password READ password WRITE setPassword) + Q_PROPERTY(bool encrypted READ encrypted WRITE setEncrypted) public: - IrcChannel(const QString &channelname, Network *network); - ~IrcChannel(); - - 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 QList ircUsers() const { return _userModes.keys(); } - - 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; - 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); - - QString decodeString(const QByteArray &text) const; - QByteArray encodeString(const QString &string) const; - - #ifdef HAVE_QCA2 - Cipher* cipher(); - #endif - - void setEncrypted(bool); + IrcChannel(const QString& channelname, Network* network); + + 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 QList ircUsers() const { return _userModes.keys(); } + + 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; + 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); + + 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& users, const QStringList& modes); + void joinIrcUsers(const QStringList& nicks, const QStringList& modes); + void joinIrcUser(IrcUser* ircuser); - void joinIrcUsers(const QList &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 geters + QVariantMap initUserModes() const; + QVariantMap initChanModes() const; + + // init seters + void initSetUserModes(const QVariantMap& usermodes); + void initSetChanModes(const QVariantMap& chanModes); - // init seters - void initSetUserModes(const QVariantMap &usermodes); - void initSetChanModes(const QVariantMap &chanModes); - signals: - 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 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 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(const QList& 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(); - void ircUserNickSet(QString nick); + void ircUserDestroyed(); + void ircUserNickSet(QString nick); private: - bool _initialized; - QString _name; - QString _topic; - QString _password; - - QHash _userModes; - - Network *network; - - QTextCodec *_codecForEncoding; - QTextCodec *_codecForDecoding; - - QHash _A_channelModes; - QHash _B_channelModes; - QHash _C_channelModes; - QSet _D_channelModes; - - #ifdef HAVE_QCA2 - Cipher *_cipher; - #endif -}; + bool _initialized; + QString _name; + QString _topic; + QString _password; + bool _encrypted; -#endif + QHash _userModes; + + Network* _network; + + QTextCodec* _codecForEncoding; + QTextCodec* _codecForDecoding; + + QHash _A_channelModes; + QHash _B_channelModes; + QHash _C_channelModes; + QSet _D_channelModes; +};