uint -> NetworkId, uint -> BufferId almost everywhere. Conversion will be made explic...

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

diff --git a/src/common/types.h b/src/common/types.h
index b0dd0d1..9793150 100644 (file)
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -23,12 +23,29 @@
 
 #include <QString>
 
 
 #include <QString>
 

+/*
+class UnsignedId {
+    quint32 id;
+
+  public:
+    inline UnsignedId(int _id = 0) { id = _id; }
+    inline quint32 toInt() const { return id; }
+    inline bool operator==(const UnsignedId &other) const { return id == other.id; }
+    inline bool operator!=(const UnsignedId &other) const { return id != other.id; }
+};
+
+struct BufferId : public UnsignedId {
+  inline BufferId(int _id = 0) : UnsignedId(_id) {};
+
+};
+*/
+

 // 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.
 // 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!
+// These must be signed!
+typedef qint32 NetworkId;  //!< Identifies an IRC Network.

 typedef qint32 IdentityId; //!< Identifies an identity.
 
 //! Base class for exceptions.
 typedef qint32 IdentityId; //!< Identifies an identity.
 
 //! Base class for exceptions.