From b9468847a2a77ed5d7909a6c0cc9bf2e53a7252f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 28 Mar 2010 20:34:38 +0200
Subject: Fix windows compilation.


diff --git a/3rdParty/Boost/SConscript b/3rdParty/Boost/SConscript
index 010ca7e..bc7d7db 100644
--- a/3rdParty/Boost/SConscript
+++ b/3rdParty/Boost/SConscript
@@ -13,6 +13,12 @@ if env["SCONS_STAGE"] == "flags" :
 			"LIBPATH": [Dir(".")],
 			"LIBS": ["Boost"]
 		}
+	if env["PLATFORM"] != "win32" :
+		env["BOOST_FLAGS"]["LIBS"] += ["pthread"]
+	else :
+		env["BOOST_FLAGS"]["CPPDEFINES"] += [("_WIN32_WINNT", "0x0501")]
+		if env["PLATFORM"] == "cygwin" :
+			env["BOOST_FLAGS"]["CPPDEFINES"] += ["__USE_W32_SOCKETS"]
 
 ################################################################################
 # Build
@@ -62,7 +68,6 @@ if env["SCONS_STAGE"] == "build" :
 				"src/libs/thread/src/pthread/exceptions.cpp",
 				"src/libs/thread/src/pthread/once.cpp",
 				"src/libs/thread/src/pthread/thread.cpp"]
-		env["BOOST_FLAGS"]["LIBS"] += ["pthread"]
 	else :
 		sources += [
 				"win32_stubs.cpp",
@@ -70,9 +75,6 @@ if env["SCONS_STAGE"] == "build" :
 				"src/libs/thread/src/win32/thread.cpp",
 				"src/libs/thread/src/win32/tss_dll.cpp",
 				"src/libs/thread/src/win32/tss_pe.cpp"]
-		env["BOOST_FLAGS"]["CPPDEFINES"] += [("_WIN32_WINNT", "0x0501")]
-		if env["PLATFORM"] == "cygwin" :
-			env["BOOST_FLAGS"]["CPPDEFINES"] += ["__USE_W32_SOCKETS"]
 
 	myenv.StaticLibrary("Boost", sources, CPPFLAGS = "-I" + Dir("src").abspath, CPPDEFINES = cppdefines)
 
diff --git a/3rdParty/LibIDN/SConscript b/3rdParty/LibIDN/SConscript
index fad1eba..138db74 100644
--- a/3rdParty/LibIDN/SConscript
+++ b/3rdParty/LibIDN/SConscript
@@ -11,6 +11,8 @@ if env["SCONS_STAGE"] == "flags" :
 			"LIBPATH": [Dir(".")],
 			"LIBS": ["IDN"],
 		}
+	if env["PLATFORM"] == "win32" :
+		env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")]
 
 ################################################################################
 # Build
@@ -42,7 +44,6 @@ if env["SCONS_STAGE"] == "build" :
 	myenv.Append(CPPPATH = ["src", "stubs"])
 	if myenv["PLATFORM"] == "win32" :
 		myenv.Append(CPPPATH = "stubs/win32")
-		env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")]
 
 	myenv.StaticLibrary("IDN", [
 			"src/stringprep.c",
diff --git a/Swift/QtUI/ChatList/ChatListMUCItem.h b/Swift/QtUI/ChatList/ChatListMUCItem.h
index 53574b5..dd3f185 100644
--- a/Swift/QtUI/ChatList/ChatListMUCItem.h
+++ b/Swift/QtUI/ChatList/ChatListMUCItem.h
@@ -13,7 +13,7 @@ namespace Swift {
 		public:
 			ChatListMUCItem(boost::shared_ptr<MUCBookmark> bookmark, ChatListGroupItem* parent) : ChatListItem(parent), bookmark_(bookmark) {};
 			boost::shared_ptr<MUCBookmark> getBookmark() {return bookmark_;};
-			QVariant data(int role) {};
+			QVariant data(int role) { return QVariant(); };
 		private:
 			boost::shared_ptr<MUCBookmark> bookmark_;
 			QList<ChatListItem*> items_;
diff --git a/Swift/QtUI/ChatList/QtChatListWindow.h b/Swift/QtUI/ChatList/QtChatListWindow.h
index b7fe6d2..856d4c0 100644
--- a/Swift/QtUI/ChatList/QtChatListWindow.h
+++ b/Swift/QtUI/ChatList/QtChatListWindow.h
@@ -2,10 +2,10 @@
 
 #include <QTreeView>
 
-#import "Swift/Controllers/UIInterfaces/ChatListWindow.h"
-#import "Swift/Controllers/UIEvents/UIEventStream.h"
-#import "Swift/QtUI/ChatList/ChatListModel.h"
-#import "Swift/QtUI/ChatList/ChatListDelegate.h"
+#include "Swift/Controllers/UIInterfaces/ChatListWindow.h"
+#include "Swift/Controllers/UIEvents/UIEventStream.h"
+#include "Swift/QtUI/ChatList/ChatListModel.h"
+#include "Swift/QtUI/ChatList/ChatListDelegate.h"
 
 namespace Swift {
 
-- 
cgit v0.10.2-6-g49f6