24 files changed, 48 insertions, 43 deletions
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index b939326..50aafc5 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -2,6 +2,7 @@ Import("env")
 
 myenv = env.Clone()
 myenv.MergeFlags(env["SLIMBER_FLAGS"])
+myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
 myenv.MergeFlags(env["SWIFTEN_FLAGS"])
 myenv.MergeFlags(env["LIBIDN_FLAGS"])
 myenv.MergeFlags(env["BOOST_FLAGS"])
diff --git a/Slimber/Cocoa/SConscript b/Slimber/Cocoa/SConscript
index 6594b9f..f11b276 100644
--- a/Slimber/Cocoa/SConscript
+++ b/Slimber/Cocoa/SConscript
@@ -2,6 +2,7 @@ Import("env")
 
 myenv = env.Clone()
 myenv.MergeFlags(env["SLIMBER_FLAGS"])
+myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
 myenv.MergeFlags(env["SWIFTEN_FLAGS"])
 myenv.MergeFlags(env["LIBIDN_FLAGS"])
 myenv.MergeFlags(env["BOOST_FLAGS"])
diff --git a/Slimber/MainController.cpp b/Slimber/MainController.cpp
index a557a07..38c1a7c 100644
--- a/Slimber/MainController.cpp
+++ b/Slimber/MainController.cpp
@@ -11,7 +11,7 @@
 #include <iostream>
 
 #include "Swiften/Base/foreach.h"
-#include "Swiften/Application/PlatformApplicationPathProvider.h"
+#include "SwifTools/Application/PlatformApplicationPathProvider.h"
 #include "Swiften/LinkLocal/LinkLocalService.h"
 #include "Swiften/LinkLocal/LinkLocalServiceBrowser.h"
 #include "Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h"
diff --git a/Slimber/Qt/SConscript b/Slimber/Qt/SConscript
index 2148f02..53d8138 100644
--- a/Slimber/Qt/SConscript
+++ b/Slimber/Qt/SConscript
@@ -5,6 +5,7 @@ Import("env")
 myenv = env.Clone()
 myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"])
 myenv.MergeFlags(env["SLIMBER_FLAGS"])
+myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
 myenv.MergeFlags(env["SWIFTEN_FLAGS"])
 myenv.MergeFlags(env["LIBIDN_FLAGS"])
 myenv.MergeFlags(env["BOOST_FLAGS"])
diff --git a/Swiften/Application/ApplicationPathProvider.cpp b/SwifTools/Application/ApplicationPathProvider.cpp
index 634f183..bf0a19e 100644
--- a/Swiften/Application/ApplicationPathProvider.cpp
+++ b/SwifTools/Application/ApplicationPathProvider.cpp
@@ -7,7 +7,7 @@
 #include <boost/filesystem.hpp>
 #include <iostream>
 
-#include "Swiften/Application/ApplicationPathProvider.h"
+#include "SwifTools/Application/ApplicationPathProvider.h"
 #include "Swiften/Base/foreach.h"
 
 namespace Swift {
diff --git a/Swiften/Application/ApplicationPathProvider.h b/SwifTools/Application/ApplicationPathProvider.h
index 7bd2630..7bd2630 100644
--- a/Swiften/Application/ApplicationPathProvider.h
+++ b/SwifTools/Application/ApplicationPathProvider.h
diff --git a/Swiften/Application/CocoaApplication.h b/SwifTools/Application/CocoaApplication.h
index 3b19d28..3b19d28 100644
--- a/Swiften/Application/CocoaApplication.h
+++ b/SwifTools/Application/CocoaApplication.h
diff --git a/Swiften/Application/CocoaApplication.mm b/SwifTools/Application/CocoaApplication.mm
index c5b3335..edfdc25 100644
--- a/Swiften/Application/CocoaApplication.mm
+++ b/SwifTools/Application/CocoaApplication.mm
@@ -1,4 +1,4 @@
-#include "Swiften/Application/CocoaApplication.h"
+#include "SwifTools/Application/CocoaApplication.h"
 
 #include <AppKit/AppKit.h>
 #include <Cocoa/Cocoa.h>
diff --git a/Swiften/Application/MacOSXApplicationPathProvider.cpp b/SwifTools/Application/MacOSXApplicationPathProvider.cpp
index 8ff4cb3..eb6c63f 100644
--- a/Swiften/Application/MacOSXApplicationPathProvider.cpp
+++ b/SwifTools/Application/MacOSXApplicationPathProvider.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Application/MacOSXApplicationPathProvider.h"
+#include "SwifTools/Application/MacOSXApplicationPathProvider.h"
 
 #include <iostream>
 #include <mach-o/dyld.h>
diff --git a/Swiften/Application/MacOSXApplicationPathProvider.h b/SwifTools/Application/MacOSXApplicationPathProvider.h
index 85cca0a..a914ded 100644
--- a/Swiften/Application/MacOSXApplicationPathProvider.h
+++ b/SwifTools/Application/MacOSXApplicationPathProvider.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Swiften/Application/ApplicationPathProvider.h"
+#include "SwifTools/Application/ApplicationPathProvider.h"
 
 namespace Swift {
 	class MacOSXApplicationPathProvider : public ApplicationPathProvider {
diff --git a/Swiften/Application/PlatformApplicationPathProvider.h b/SwifTools/Application/PlatformApplicationPathProvider.h
index e59bb9a..bb9bfa9 100644
--- a/Swiften/Application/PlatformApplicationPathProvider.h
+++ b/SwifTools/Application/PlatformApplicationPathProvider.h
@@ -9,17 +9,17 @@
 #include "Swiften/Base/Platform.h"
 
 #if defined(SWIFTEN_PLATFORM_MACOSX)
-#include "Swiften/Application/MacOSXApplicationPathProvider.h"
+#include "SwifTools/Application/MacOSXApplicationPathProvider.h"
 namespace Swift {
 	typedef MacOSXApplicationPathProvider PlatformApplicationPathProvider;
 }
 #elif defined(SWIFTEN_PLATFORM_WIN32)
-#include "Swiften/Application/WindowsApplicationPathProvider.h"
+#include "SwifTools/Application/WindowsApplicationPathProvider.h"
 namespace Swift {
 	typedef WindowsApplicationPathProvider PlatformApplicationPathProvider;
 }
 #else
-#include "Swiften/Application/UnixApplicationPathProvider.h"
+#include "SwifTools/Application/UnixApplicationPathProvider.h"
 namespace Swift {
 	typedef UnixApplicationPathProvider PlatformApplicationPathProvider;
 }
diff --git a/SwifTools/Application/SConscript b/SwifTools/Application/SConscript
new file mode 100644
index 0000000..0097bca
--- /dev/null
+++ b/SwifTools/Application/SConscript
@@ -0,0 +1,26 @@
+Import("swiftools_env", "env")
+
+sources = [
+		"ApplicationPathProvider.cpp",
+	]
+
+if swiftools_env["PLATFORM"] == "darwin" and swiftools_env["target"] == "native" :
+	sources += [
+			"CocoaApplication.mm",
+			"MacOSXApplicationPathProvider.cpp",
+		]
+elif swiftools_env["PLATFORM"] == "win32" :
+	sources += [
+			"WindowsApplicationPathProvider.cpp"
+		]
+else :
+	sources += [
+			"UnixApplicationPathProvider.cpp"
+		]
+
+objects = swiftools_env.StaticObject(sources)
+swiftools_env.Append(SWIFTOOLS_OBJECTS = [objects])
+
+env.Append(UNITTEST_SOURCES = [
+		File("UnitTest/ApplicationPathProviderTest.cpp")
+	])
diff --git a/Swiften/Application/UnitTest/ApplicationPathProviderTest.cpp b/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
index 3b46e6e..cd171cb 100644
--- a/Swiften/Application/UnitTest/ApplicationPathProviderTest.cpp
+++ b/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
@@ -7,7 +7,7 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/extensions/TestFactoryRegistry.h>
 
-#include "Swiften/Application/PlatformApplicationPathProvider.h"
+#include "SwifTools/Application/PlatformApplicationPathProvider.h"
 #include "Swiften/Base/String.h"
 
 using namespace Swift;
diff --git a/Swiften/Application/UnixApplicationPathProvider.cpp b/SwifTools/Application/UnixApplicationPathProvider.cpp
index b474ecf..67252ec 100644
--- a/Swiften/Application/UnixApplicationPathProvider.cpp
+++ b/SwifTools/Application/UnixApplicationPathProvider.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Application/UnixApplicationPathProvider.h"
+#include "SwifTools/Application/UnixApplicationPathProvider.h"
 
 #include <boost/filesystem/convenience.hpp>
 
diff --git a/Swiften/Application/UnixApplicationPathProvider.h b/SwifTools/Application/UnixApplicationPathProvider.h
index c1bfd95..2ef04ea 100644
--- a/Swiften/Application/UnixApplicationPathProvider.h
+++ b/SwifTools/Application/UnixApplicationPathProvider.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Swiften/Application/ApplicationPathProvider.h"
+#include "SwifTools/Application/ApplicationPathProvider.h"
 
 #include <iostream>
 #include <unistd.h>
diff --git a/Swiften/Application/WindowsApplicationPathProvider.cpp b/SwifTools/Application/WindowsApplicationPathProvider.cpp
index e02da1e..ed692d7 100644
--- a/Swiften/Application/WindowsApplicationPathProvider.cpp
+++ b/SwifTools/Application/WindowsApplicationPathProvider.cpp
@@ -4,7 +4,7 @@
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
-#include "Swiften/Application/WindowsApplicationPathProvider.h"
+#include "SwifTools/Application/WindowsApplicationPathProvider.h"
 
 #include <windows.h>
 
diff --git a/Swiften/Application/WindowsApplicationPathProvider.h b/SwifTools/Application/WindowsApplicationPathProvider.h
index a026dba..b3341e3 100644
--- a/Swiften/Application/WindowsApplicationPathProvider.h
+++ b/SwifTools/Application/WindowsApplicationPathProvider.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Swiften/Application/ApplicationPathProvider.h"
+#include "SwifTools/Application/ApplicationPathProvider.h"
 
 namespace Swift {
 	class WindowsApplicationPathProvider : public ApplicationPathProvider {
diff --git a/SwifTools/SConscript b/SwifTools/SConscript
index 6b9b727..d4747db 100644
--- a/SwifTools/SConscript
+++ b/SwifTools/SConscript
@@ -47,6 +47,7 @@ if env["SCONS_STAGE"] == "build" :
 	Export("swiftools_env")
 	
 	SConscript(dirs = [
+			"Application",
 			"Dock",
 			"Notifier",
 			"Idle/IdleQuerierTest",
@@ -55,4 +56,3 @@ if env["SCONS_STAGE"] == "build" :
 		])
 
 	swiftools_env.StaticLibrary("SwifTools", sources + swiftools_env["SWIFTOOLS_OBJECTS"])
-		
-\ No newline at end of file
diff --git a/Swift/QtUI/ApplicationTest/main.cpp b/Swift/QtUI/ApplicationTest/main.cpp
index 5df7601..4e93452 100644
--- a/Swift/QtUI/ApplicationTest/main.cpp
+++ b/Swift/QtUI/ApplicationTest/main.cpp
@@ -10,7 +10,7 @@
 #include <QLineEdit>
 #include "../QtSwiftUtil.h"
 #include "Swiften/Base/String.h"
-#include "Swiften/Application/Platform/PlatformApplication.h"
+#include "SwifTools/Application/Platform/PlatformApplication.h"
 
 using namespace Swift;
 
diff --git a/Swift/QtUI/QtSoundPlayer.cpp b/Swift/QtUI/QtSoundPlayer.cpp
index 7fd6564..b967cef 100644
--- a/Swift/QtUI/QtSoundPlayer.cpp
+++ b/Swift/QtUI/QtSoundPlayer.cpp
@@ -9,7 +9,7 @@
 #include <QSound>
 #include <iostream>
 
-#include "Swiften/Application/ApplicationPathProvider.h"
+#include "SwifTools/Application/ApplicationPathProvider.h"
 
 namespace Swift {
 	
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 26d1664..d9879a2 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -23,7 +23,7 @@
 #include <boost/bind.hpp>
 #include <QSplitter>
 
-#include "Swiften/Application/PlatformApplicationPathProvider.h"
+#include "SwifTools/Application/PlatformApplicationPathProvider.h"
 #include "Swiften/Avatars/AvatarFileStorage.h"
 #include "Swiften/Disco/CapsFileStorage.h"
 #include "Swiften/VCards/VCardFileStorageFactory.h"
diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h
index 092c45e..d72faaa 100644
--- a/Swift/QtUI/QtSwift.h
+++ b/Swift/QtUI/QtSwift.h
@@ -18,7 +18,7 @@
 #include "QtChatWindowFactory.h"
 #include "QtSettingsProvider.h"
 #if defined(SWIFTEN_PLATFORM_MACOSX)
-#include "Swiften/Application/CocoaApplication.h"
+#include "SwifTools/Application/CocoaApplication.h"
 #endif
 #if defined(HAVE_SNARL)
 #include "SwifTools/Notifier/Win32NotifierWindow.h"
diff --git a/Swiften/Application/SConscript b/Swiften/Application/SConscript
deleted file mode 100644
index d3a2383..0000000
--- a/Swiften/Application/SConscript
+++ /dev/null
@@ -1,22 +0,0 @@
-Import("swiften_env")
-
-sources = [
-		"ApplicationPathProvider.cpp",
-	]
-
-if swiften_env["PLATFORM"] == "darwin" and swiften_env["target"] == "native" :
-	sources += [
-			"CocoaApplication.mm",
-			"MacOSXApplicationPathProvider.cpp",
-		]
-elif swiften_env["PLATFORM"] == "win32" :
-	sources += [
-			"WindowsApplicationPathProvider.cpp"
-		]
-else :
-	sources += [
-			"UnixApplicationPathProvider.cpp"
-		]
-
-objects = swiften_env.StaticObject(sources)
-swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/SConscript b/Swiften/SConscript
index 7665fb0..ace9ab7 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -120,7 +120,6 @@ if env["SCONS_STAGE"] == "build" :
 			"Base",
 			"StringPrep",
 			"SASL",
-			"Application",
 			"EventLoop",
 			"Parser",
 			"JID",
@@ -142,7 +141,6 @@ if env["SCONS_STAGE"] == "build" :
 	myenv.StaticLibrary("Swiften", sources + swiften_env["SWIFTEN_OBJECTS"])
 
 	env.Append(UNITTEST_SOURCES = [
-			File("Application/UnitTest/ApplicationPathProviderTest.cpp"),
 			File("Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp"),
 			File("Avatars/UnitTest/VCardAvatarManagerTest.cpp"),
 			File("Avatars/UnitTest/CombinedAvatarProviderTest.cpp"),
@@ -261,4 +259,4 @@ if env["SCONS_STAGE"] == "build" :
 				swiften_header += "#include \"" + os.path.relpath(os.path.join(root, file), top_path) + "\"\n"
 	for file in ["EventLoop/SimpleEventLoop.h"] :
 				swiften_header += "#include \"Swiften/" + file + "\"\n"		
-	swiften_env.WriteVal("Swiften.h", swiften_env.Value(swiften_header))
-\ No newline at end of file
+	swiften_env.WriteVal("Swiften.h", swiften_env.Value(swiften_header))