Optimized memory usage, cleaned up api.

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

diff --git a/src/common/types.h b/src/common/types.h
index b0dd0d1..c6a4bb1 100644 (file)
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -18,18 +18,82 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _TYPES_H_
-#define _TYPES_H_
+#ifndef TYPES_H_
+#define TYPES_H_
 
+#include <QDebug>
 #include <QString>
+#include <QVariant>
+#include <QTextStream>
 
-// FIXME make all ID types quint32 as soon as they all have been replaced
-typedef uint UserId;     //!< Identifies a core user.
-typedef uint MsgId;      //!< Identifies a message.
-typedef uint BufferId;   //!< Identifies a buffer.
-typedef uint NetworkId;  //!< Identifies an IRC Network.
-// IdentityId must be signed!
-typedef qint32 IdentityId; //!< Identifies an identity.
+class SignedId {
+  protected:
+    qint32 id;
+
+  public:
+    inline SignedId(int _id = 0) { id = _id; }
+    inline qint32 toInt() const { return id; }
+    inline bool isValid() const { return id > 0; }
+
+    inline bool operator==(const SignedId &other) const { return id == other.id; }
+    inline bool operator!=(const SignedId &other) const { return id != other.id; }
+    inline bool operator<(const SignedId &other) const { return id < other.id; }
+    inline bool operator<=(const SignedId &other) const { return id <= other.id; }
+    inline bool operator>(const SignedId &other) const { return id > other.id; }
+    inline bool operator>=(const SignedId &other) const { return id >= other.id; }
+    inline bool operator==(int i) const { return id == i; }
+    inline bool operator!=(int i) const { return id != i; }
+    inline bool operator<(int i) const { return id < i; }
+    inline bool operator>(int i) const { return id > i; }
+    inline bool operator<=(int i) const { return id <= i; }
+
+    inline SignedId operator++(int) { id++; return *this; }
+    //inline operator int() const { return toInt(); } // no automatic conversion!
+
+    friend QDataStream &operator>>(QDataStream &in, SignedId &signedId);
+};
+
+inline QDataStream &operator<<(QDataStream &out, const SignedId &signedId) { out << signedId.toInt(); return out; }
+inline QDataStream &operator>>(QDataStream &in, SignedId &signedId) { in >> signedId.id; return in; }
+inline QTextStream &operator<<(QTextStream &out, const SignedId &signedId) { out << QString::number(signedId.toInt()); return out; }
+inline QDebug operator<<(QDebug dbg, const SignedId &signedId) { dbg.space() << signedId.toInt(); return dbg; }
+inline uint qHash(const SignedId &id) { return qHash(id.toInt()); }
+
+struct UserId : public SignedId {
+  inline UserId(int _id = 0) : SignedId(_id) {};
+  //inline operator QVariant() const { return QVariant::fromValue<UserId>(*this); }  // no automatic conversion!
+};
+
+struct MsgId : public SignedId {
+  inline MsgId(int _id = 0) : SignedId(_id) {};
+  //inline operator QVariant() const { return QVariant::fromValue<MsgId>(*this); }
+};
+
+struct BufferId : public SignedId {
+  inline BufferId(int _id = 0) : SignedId(_id) {};
+  //inline operator QVariant() const { return QVariant::fromValue<BufferId>(*this); }
+};
+
+struct NetworkId : public SignedId {
+  inline NetworkId(int _id = 0) : SignedId(_id) {};
+  //inline operator QVariant() const { return QVariant::fromValue<NetworkId>(*this); }
+};
+
+struct IdentityId : public SignedId {
+  inline IdentityId(int _id = 0) : SignedId(_id) {};
+  //inline operator QVariant() const { return QVariant::fromValue<IdentityId>(*this); }
+};
+
+struct AccountId : public SignedId {
+  inline AccountId(int _id = 0) : SignedId(_id) {};
+};
+
+Q_DECLARE_METATYPE(UserId);
+Q_DECLARE_METATYPE(MsgId);
+Q_DECLARE_METATYPE(BufferId);
+Q_DECLARE_METATYPE(NetworkId);
+Q_DECLARE_METATYPE(IdentityId);
+Q_DECLARE_METATYPE(AccountId);
 
 //! Base class for exceptions.
 struct Exception {