X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Ftypes.h;h=eb0c0ca20b116c2d8b70e9fec1aed3875fe28be9;hp=c6a4bb1d23bd3e078fa2eb547c1725ebf0704d62;hb=b06a827aea68b050bf23c37e0162189a94595ee9;hpb=c9b7f5cfe4377cc242c24212fff48aad70192b48

diff --git a/src/common/types.h b/src/common/types.h
index c6a4bb1d..eb0c0ca2 100644
--- 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-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,22 +15,27 @@
  *   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_
-#define TYPES_H_
+#pragma once
+
+#include <type_traits>
 
 #include <QDebug>
 #include <QString>
 #include <QVariant>
+#include <QDataStream>
 #include <QTextStream>
+#include <QHostAddress>
+#include <QDataStream>
 
-class SignedId {
-  protected:
+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; }
@@ -53,6 +58,7 @@ 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; }
@@ -60,50 +66,73 @@ 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 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) {};
-};
-
-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 {
-  Exception(QString msg = "Unknown Exception") : _msg(msg) {};
-  virtual ~Exception() {}; // make gcc happy
-  virtual inline QString msg() { return _msg; }
-
-  protected:
-    QString _msg;
-
+    inline AccountId(int _id = 0) : SignedId(_id) {}
 };
 
-#endif
+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;
+
+/**
+ * Catch-all stream serialization operator for enum types.
+ *
+ * @param[in,out] out   Stream to serialize to
+ * @param[in]     value Value to serialize
+ * @returns A reference to the stream
+ */
+template<typename T,
+         typename = typename std::enable_if<std::is_enum<T>::value>::type>
+QDataStream &operator<<(QDataStream &out, T value) {
+    out << static_cast<typename std::underlying_type<T>::type>(value);
+    return out;
+}
+
+/**
+ * Catch-all stream serialization operator for enum types.
+ *
+ * @param[in,out] in    Stream to deserialize from
+ * @param[out]    value Value to deserialize into
+ * @returns A reference to the stream
+ */
+template<typename T,
+         typename = typename std::enable_if<std::is_enum<T>::value>::type>
+QDataStream &operator>>(QDataStream &in, T &value) {
+    typename std::underlying_type<T>::type v;
+    in >> v;
+    value = static_cast<T>(v);
+    return in;
+}