From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 27 Mar 2014 20:42:39 +0000 (+0100)
Subject: Merge pull request #66 from TheOneRing/snore
X-Git-Tag: 0.11.0~50
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=ea6cba5aeeb026b41d85f45a3f4707cf52f7740b;hp=9b8c497cdbb24f5df20870a06d3044332bd78ce4

Merge pull request #66 from TheOneRing/snore

Fixed detection of snore for Qt4/Qt5
---

diff --git a/src/common/logbacktrace_win.cpp b/src/common/logbacktrace_win.cpp
index fd365af7..26951cd9 100644
--- a/src/common/logbacktrace_win.cpp
+++ b/src/common/logbacktrace_win.cpp
@@ -38,6 +38,7 @@ void loadHelpStackFrame(IMAGEHLP_STACK_FRAME &ihsf, const STACKFRAME64 &stackFra
 
 BOOL CALLBACK EnumSymbolsCB(PSYMBOL_INFO symInfo, ULONG size, PVOID user)
 {
+    Q_UNUSED(size)
     QStringList *params = (QStringList *)user;
     if (symInfo->Flags & SYMFLAG_PARAMETER) {
         params->append(symInfo->Name);
@@ -54,6 +55,7 @@ struct EnumModulesContext {
 
 BOOL CALLBACK EnumModulesCB(LPCSTR ModuleName, DWORD64 BaseOfDll, PVOID UserContext)
 {
+    Q_UNUSED(ModuleName)
     IMAGEHLP_MODULE64 mod;
     EnumModulesContext *context = (EnumModulesContext *)UserContext;
     mod.SizeOfStruct = sizeof(IMAGEHLP_MODULE64);
@@ -124,7 +126,7 @@ Label:
     StackFrame.AddrFrame.Mode   = AddrModeFlat;
     StackFrame.AddrStack.Offset = Context.Esp;
     StackFrame.AddrStack.Mode   = AddrModeFlat;
-#elif _M_X64
+#elif defined(_M_X64)
     MachineType                 = IMAGE_FILE_MACHINE_AMD64;
     StackFrame.AddrPC.Offset    = Context.Rip;
     StackFrame.AddrPC.Mode      = AddrModeFlat;
@@ -132,7 +134,7 @@ Label:
     StackFrame.AddrFrame.Mode   = AddrModeFlat;
     StackFrame.AddrStack.Offset = Context.Rsp;
     StackFrame.AddrStack.Mode   = AddrModeFlat;
-#elif _M_IA64
+#elif defined(_M_IA64)
     MachineType                 = IMAGE_FILE_MACHINE_IA64;
     StackFrame.AddrPC.Offset    = Context.StIIP;
     StackFrame.AddrPC.Mode      = AddrModeFlat;
diff --git a/src/common/peer.h b/src/common/peer.h
index de9a4b64..2bdcc563 100644
--- a/src/common/peer.h
+++ b/src/common/peer.h
@@ -82,6 +82,10 @@ private:
     QPointer<AuthHandler> _authHandler;
 };
 
+// We need to special-case Peer* in attached signals/slots, so typedef it for the meta type system
+typedef Peer * PeerPtr;
+Q_DECLARE_METATYPE(PeerPtr)
+
 
 // Template method needed in the header
 template<typename T> inline
diff --git a/src/common/transfer.h b/src/common/transfer.h
index 31421cdf..cacfeaac 100644
--- a/src/common/transfer.h
+++ b/src/common/transfer.h
@@ -24,8 +24,8 @@
 #include <QHostAddress>
 #include <QUuid>
 
+#include "peer.h"
 #include "syncableobject.h"
-#include "types.h"
 
 class Transfer : public SyncableObject
 {
diff --git a/src/common/types.h b/src/common/types.h
index 290d53f6..a63e2967 100644
--- a/src/common/types.h
+++ b/src/common/types.h
@@ -29,12 +29,6 @@
 #include <QHostAddress>
 #include <QDataStream>
 
-#include "peer.h"
-
-// We need to special-case Peer* in attached signals/slots, so typedef it for the meta type system
-typedef Peer * PeerPtr;
-Q_DECLARE_METATYPE(PeerPtr)
-
 class SignedId
 {
 protected:
diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp
index 997578a3..203c377e 100644
--- a/src/core/sslserver.cpp
+++ b/src/core/sslserver.cpp
@@ -24,6 +24,7 @@
 #  include <QSslSocket>
 #endif
 
+#include <QDateTime>
 #include <QFile>
 
 #include "logger.h"