3 files changed, 25 insertions, 16 deletions
diff --git a/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp b/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
index 5eb0e16..e7a47a7 100644
--- a/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
+++ b/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -9,6 +9,7 @@
 #include <string>
 #include <boost/algorithm/string.hpp>
 
+#include <Swiften/Base/Path.h>
 #include <SwifTools/Application/PlatformApplicationPathProvider.h>
 
 using namespace Swift;
@@ -40,7 +41,7 @@ class ApplicationPathProviderTest : public CppUnit::TestFixture {
 		void testGetExecutableDir() {
 			boost::filesystem::path dir = testling_->getExecutableDir();
 			CPPUNIT_ASSERT(boost::filesystem::is_directory(dir));
-			CPPUNIT_ASSERT(boost::ends_with(dir.string(), "UnitTest"));
+			CPPUNIT_ASSERT(boost::ends_with(pathToString(dir), "UnitTest"));
 		}
 	
 	private:
diff --git a/SwifTools/Application/WindowsApplicationPathProvider.cpp b/SwifTools/Application/WindowsApplicationPathProvider.cpp
index 8514fa7..2c61208 100644
--- a/SwifTools/Application/WindowsApplicationPathProvider.cpp
+++ b/SwifTools/Application/WindowsApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
+ * Copyright (c) 2010-2013 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
@@ -7,6 +7,8 @@
 #include <SwifTools/Application/WindowsApplicationPathProvider.h>
 
 #include <windows.h>
+#include <cassert>
+#include <Swiften/Base/String.h>
 
 namespace Swift {
 
@@ -15,4 +17,21 @@ WindowsApplicationPathProvider::WindowsApplicationPathProvider(const std::string
 	resourceDirs.push_back(getExecutableDir() / "../resources"); // Development
 }
 
+boost::filesystem::path WindowsApplicationPathProvider::getDataDir() const {
+	wchar_t* appDirRaw = _wgetenv(L"APPDATA");
+	assert(appDirRaw);
+	boost::filesystem::path result(
+			boost::filesystem::path(appDirRaw) / getApplicationName());
+	boost::filesystem::create_directory(result);
+	return result;
+}
+
+boost::filesystem::path WindowsApplicationPathProvider::getHomeDir() const {
+	//FIXME: This should be My Documents 
+	wchar_t* homeDirRaw = _wgetenv(L"USERPROFILE");
+	assert(homeDirRaw);
+	return boost::filesystem::path(homeDirRaw);
+}
+
+
 }
diff --git a/SwifTools/Application/WindowsApplicationPathProvider.h b/SwifTools/Application/WindowsApplicationPathProvider.h
index f288326..a4e8668 100644
--- a/SwifTools/Application/WindowsApplicationPathProvider.h
+++ b/SwifTools/Application/WindowsApplicationPathProvider.h
@@ -13,19 +13,8 @@ namespace Swift {
 		public:
 			WindowsApplicationPathProvider(const std::string& name);
 
-			boost::filesystem::path getDataDir() const {
-				char* appDirRaw = getenv("APPDATA");
-				boost::filesystem::path result(boost::filesystem::path(appDirRaw) / getApplicationName());
-				boost::filesystem::create_directory(result);
-				return result;
-			}
-
-			boost::filesystem::path getHomeDir() const {
-				//FIXME: This should be My Documents 
-				
-				char* homeDirRaw = getenv("USERPROFILE");
-				return boost::filesystem::path(homeDirRaw);
-			}
+			boost::filesystem::path getDataDir() const;
+			boost::filesystem::path getHomeDir() const;
 
 			virtual std::vector<boost::filesystem::path> getResourceDirs() const {
 				return resourceDirs;