Move the PeerPtr declaration out of types.h

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

diff --git a/src/common/types.h b/src/common/types.h
index 381c5d6..a63e296 100644 (file)
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   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 TYPES_H_
@@ -24,12 +24,17 @@
 #include <QDebug>
 #include <QString>
 #include <QVariant>
-
-class SignedId {
-  protected:
+#include <QDataStream>
+#include <QTextStream>
+#include <QHostAddress>
+#include <QDataStream>
+
+class SignedId
+{
+protected:
     qint32 id;
 
-  public:
+public:
     inline SignedId(int _id = 0) { id = _id; }
     inline qint32 toInt() const { return id; }
     inline bool isValid() const { return id > 0; }
@@ -37,6 +42,7 @@ class SignedId {
     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; }
@@ -51,56 +57,63 @@ class SignedId {
     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!
+    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); }
+    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); }
+    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); }
+    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); }
+    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) {};
+    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);
+Q_DECLARE_METATYPE(UserId)
+Q_DECLARE_METATYPE(MsgId)
+Q_DECLARE_METATYPE(BufferId)
+Q_DECLARE_METATYPE(NetworkId)
+Q_DECLARE_METATYPE(IdentityId)
+Q_DECLARE_METATYPE(AccountId)
+
+Q_DECLARE_METATYPE(QHostAddress)
+
+// a few typedefs
+typedef QList<MsgId> MsgIdList;
+typedef QList<BufferId> BufferIdList;
 
 //! Base class for exceptions.
 struct Exception {
-  Exception(QString msg = "Unknown Exception") : _msg(msg) {};
-  virtual ~Exception() {}; // make gcc happy
-  virtual inline QString msg() { return _msg; }
+    Exception(QString msg = "Unknown Exception") : _msg(msg) {}
+    virtual ~Exception() {} // make gcc happy
+    virtual inline QString msg() { return _msg; }
 
-  protected:
+protected:
     QString _msg;
-
 };
 
 #endif