projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
properly rewind oidentd config file
[quassel.git]
/
src
/
common
/
types.h
diff --git
a/src/common/types.h
b/src/common/types.h
index
0708818
..
9424ec8
100644
(file)
--- a/
src/common/types.h
+++ b/
src/common/types.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
9
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-25,6
+25,7
@@
#include <QString>
#include <QVariant>
#include <QTextStream>
#include <QString>
#include <QVariant>
#include <QTextStream>
+#include <QHostAddress>
class SignedId {
protected:
class SignedId {
protected:
@@
-60,32
+61,32
@@
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 uint qHash(const SignedId &id) { return qHash(id.toInt()); }
struct UserId : public SignedId {
- inline UserId(int _id = 0) : SignedId(_id) {}
;
+ inline UserId(int _id = 0) : SignedId(_id) {}
//inline operator QVariant() const { return QVariant::fromValue<UserId>(*this); } // no automatic conversion!
};
struct MsgId : public SignedId {
//inline operator QVariant() const { return QVariant::fromValue<UserId>(*this); } // no automatic conversion!
};
struct MsgId : public SignedId {
- inline MsgId(int _id = 0) : SignedId(_id) {}
;
+ inline MsgId(int _id = 0) : SignedId(_id) {}
//inline operator QVariant() const { return QVariant::fromValue<MsgId>(*this); }
};
struct BufferId : public SignedId {
//inline operator QVariant() const { return QVariant::fromValue<MsgId>(*this); }
};
struct BufferId : public SignedId {
- inline BufferId(int _id = 0) : SignedId(_id) {}
;
+ inline BufferId(int _id = 0) : SignedId(_id) {}
//inline operator QVariant() const { return QVariant::fromValue<BufferId>(*this); }
};
struct NetworkId : public SignedId {
//inline operator QVariant() const { return QVariant::fromValue<BufferId>(*this); }
};
struct NetworkId : public SignedId {
- inline NetworkId(int _id = 0) : SignedId(_id) {}
;
+ inline NetworkId(int _id = 0) : SignedId(_id) {}
//inline operator QVariant() const { return QVariant::fromValue<NetworkId>(*this); }
};
struct IdentityId : public SignedId {
//inline operator QVariant() const { return QVariant::fromValue<NetworkId>(*this); }
};
struct IdentityId : public SignedId {
- inline IdentityId(int _id = 0) : SignedId(_id) {}
;
+ inline IdentityId(int _id = 0) : SignedId(_id) {}
//inline operator QVariant() const { return QVariant::fromValue<IdentityId>(*this); }
};
struct AccountId : public SignedId {
//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(UserId)
@@
-95,15
+96,20
@@
Q_DECLARE_METATYPE(NetworkId)
Q_DECLARE_METATYPE(IdentityId)
Q_DECLARE_METATYPE(AccountId)
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 {
//! Base class for exceptions.
struct Exception {
- Exception(QString msg = "Unknown Exception") : _msg(msg) {}
;
- virtual ~Exception() {}
;
// make gcc happy
+ Exception(QString msg = "Unknown Exception") : _msg(msg) {}
+ virtual ~Exception() {} // make gcc happy
virtual inline QString msg() { return _msg; }
protected:
QString _msg;
virtual inline QString msg() { return _msg; }
protected:
QString _msg;
-
};
#endif
};
#endif