X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftypes.h;h=9424ec8aaf1de1c2fb08a837f5128754927255fd;hb=9c15e81b15a20e861c707e240c2cfee56bdf4bc9;hp=fc46881e1ccf11c08234ca6851453c27c8f54cb8;hpb=54afee59c56e1a75352b32200b9503150601bd90;p=quassel.git diff --git a/src/common/types.h b/src/common/types.h index fc46881e..9424ec8a 100644 --- a/src/common/types.h +++ b/src/common/types.h @@ -25,6 +25,7 @@ #include #include #include +#include class SignedId { protected: @@ -60,32 +61,32 @@ inline QDebug operator<<(QDebug dbg, const SignedId &signedId) { dbg.space() << inline uint qHash(const SignedId &id) { return qHash(id.toInt()); } struct UserId : public SignedId { - inline UserId(int _id = 0) : SignedId(_id) {}; + inline UserId(int _id = 0) : SignedId(_id) {} //inline operator QVariant() const { return QVariant::fromValue(*this); } // no automatic conversion! }; struct MsgId : public SignedId { - inline MsgId(int _id = 0) : SignedId(_id) {}; + inline MsgId(int _id = 0) : SignedId(_id) {} //inline operator QVariant() const { return QVariant::fromValue(*this); } }; struct BufferId : public SignedId { - inline BufferId(int _id = 0) : SignedId(_id) {}; + inline BufferId(int _id = 0) : SignedId(_id) {} //inline operator QVariant() const { return QVariant::fromValue(*this); } }; struct NetworkId : public SignedId { - inline NetworkId(int _id = 0) : SignedId(_id) {}; + inline NetworkId(int _id = 0) : SignedId(_id) {} //inline operator QVariant() const { return QVariant::fromValue(*this); } }; struct IdentityId : public SignedId { - inline IdentityId(int _id = 0) : SignedId(_id) {}; + inline IdentityId(int _id = 0) : SignedId(_id) {} //inline operator QVariant() const { return QVariant::fromValue(*this); } }; struct AccountId : public SignedId { - inline AccountId(int _id = 0) : SignedId(_id) {}; + inline AccountId(int _id = 0) : SignedId(_id) {} }; Q_DECLARE_METATYPE(UserId) @@ -95,14 +96,16 @@ Q_DECLARE_METATYPE(NetworkId) Q_DECLARE_METATYPE(IdentityId) Q_DECLARE_METATYPE(AccountId) +Q_DECLARE_METATYPE(QHostAddress) + // a few typedefs typedef QList MsgIdList; typedef QList BufferIdList; //! Base class for exceptions. struct Exception { - Exception(QString msg = "Unknown Exception") : _msg(msg) {}; - virtual ~Exception() {}; // make gcc happy + Exception(QString msg = "Unknown Exception") : _msg(msg) {} + virtual ~Exception() {} // make gcc happy virtual inline QString msg() { return _msg; } protected: