projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Happy New Year!
[quassel.git]
/
src
/
common
/
quassel.cpp
diff --git
a/src/common/quassel.cpp
b/src/common/quassel.cpp
index
66aae90
..
23202a7
100644
(file)
--- a/
src/common/quassel.cpp
+++ b/
src/common/quassel.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
3
by the Quassel Project *
+ * Copyright (C) 2005-201
4
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 *
@@
-23,6
+23,8
@@
#include <iostream>
#include <signal.h>
#if !defined Q_OS_WIN32 && !defined Q_OS_MAC
#include <iostream>
#include <signal.h>
#if !defined Q_OS_WIN32 && !defined Q_OS_MAC
+# include <sys/types.h>
+# include <sys/time.h>
# include <sys/resource.h>
#endif
# include <sys/resource.h>
#endif
@@
-33,6
+35,7
@@
#include <QLibraryInfo>
#include <QSettings>
#include <QTranslator>
#include <QLibraryInfo>
#include <QSettings>
#include <QTranslator>
+#include <QUuid>
#include "bufferinfo.h"
#include "identity.h"
#include "bufferinfo.h"
#include "identity.h"
@@
-187,6
+190,7
@@
void Quassel::registerMetaTypes()
qRegisterMetaType<MsgId>("MsgId");
qRegisterMetaType<QHostAddress>("QHostAddress");
qRegisterMetaType<MsgId>("MsgId");
qRegisterMetaType<QHostAddress>("QHostAddress");
+ qRegisterMetaType<QUuid>("QUuid");
qRegisterMetaTypeStreamOperators<IdentityId>("IdentityId");
qRegisterMetaTypeStreamOperators<BufferId>("BufferId");
qRegisterMetaTypeStreamOperators<IdentityId>("IdentityId");
qRegisterMetaTypeStreamOperators<BufferId>("BufferId");