X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fglobal.h;h=fd285ca092283cfad198cd747e01611647538412;hp=c672c402f5718dac6072920a2f18426002121299;hb=902c95728306e5ba115de84800fc8d5d239c9d62;hpb=372e281c83794188819e2a74f570e16684778456 diff --git a/src/common/global.h b/src/common/global.h index c672c402..fd285ca0 100644 --- a/src/common/global.h +++ b/src/common/global.h @@ -35,7 +35,6 @@ #include /* Some global stuff */ -typedef QMap VarMap; typedef uint UserId; typedef uint MsgId; @@ -56,36 +55,4 @@ struct Exception { }; -class BufferId { - public: - BufferId() { id = gid = 0; } // FIXME - BufferId(uint uid, QString net, QString buf, uint gid = 0); - - inline uint uid() const { return id; } - inline uint groupId() const { return gid; } - inline QString network() const { return net; } - QString buffer() const; // nickfrommask? - - void setGroupId(uint _gid) { gid = _gid; } - - inline bool operator==(const BufferId &other) const { return id == other.id; } - - private: - uint id; - uint gid; - QString net; - QString buf; - - friend uint qHash(const BufferId &); - friend QDataStream &operator<<(QDataStream &out, const BufferId &bufferId); - friend QDataStream &operator>>(QDataStream &in, BufferId &bufferId); -}; - -QDataStream &operator<<(QDataStream &out, const BufferId &bufferId); -QDataStream &operator>>(QDataStream &in, BufferId &bufferId); - -Q_DECLARE_METATYPE(BufferId); - -uint qHash(const BufferId &); - #endif