summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-08-19 20:15:37 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-08-19 20:15:55 (GMT)
commitc1a2f7eb8f32e944aaccc7b9f03e2551459fe0d6 (patch)
tree24ee7eb51df478ec671c0f8da534ba05db38e098 /Swiften/Application
parent74be9738c8dbb3bc037d0bcba0d7fc1539343630 (diff)
downloadswift-c1a2f7eb8f32e944aaccc7b9f03e2551459fe0d6.zip
swift-c1a2f7eb8f32e944aaccc7b9f03e2551459fe0d6.tar.bz2
Compilation fix for Unices
Diffstat (limited to 'Swiften/Application')
-rw-r--r--Swiften/Application/UnixApplication.h19
-rw-r--r--Swiften/Application/UnixApplicationPathProvider.h3
2 files changed, 2 insertions, 20 deletions
diff --git a/Swiften/Application/UnixApplication.h b/Swiften/Application/UnixApplication.h
index 9ec9300..c607b7d 100644
--- a/Swiften/Application/UnixApplication.h
+++ b/Swiften/Application/UnixApplication.h
@@ -4,8 +4,7 @@
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#ifndef SWIFTEN_UnixApplication_H
-#define SWIFTEN_UnixApplication_H
+#pragma once
#include "Swiften/Application/Application.h"
#include "Swiften/Application/NullApplicationMessageDisplay.h"
@@ -22,24 +21,8 @@ namespace Swift {
return &messageDisplay_;
}
- virtual boost::filesystem::path getHomeDir() const {
- return boost::filesystem::path(getenv("HOME"));
- }
-
- boost::filesystem::path getSettingsDir() const {
- boost::filesystem::path result(getHomeDir() / ("." + getApplicationName().getLowerCase().getUTF8String()));
- try {
- boost::filesystem::create_directory(result);
- }
- catch (const boost::filesystem::filesystem_error& e) {
- std::cerr << "ERROR: " << e.what() << std::endl;
- }
- return result;
- }
-
private:
NullApplicationMessageDisplay messageDisplay_;
};
}
-#endif
diff --git a/Swiften/Application/UnixApplicationPathProvider.h b/Swiften/Application/UnixApplicationPathProvider.h
index c361267..3773fef 100644
--- a/Swiften/Application/UnixApplicationPathProvider.h
+++ b/Swiften/Application/UnixApplicationPathProvider.h
@@ -24,7 +24,7 @@ namespace Swift {
}
boost::filesystem::path getSettingsDir() const {
- boost::filesystem::path result(getHomeDir() / ("." + getName().getLowerCase().getUTF8String()));
+ boost::filesystem::path result(getHomeDir() / ("." + getApplicationName().getLowerCase().getUTF8String()));
try {
boost::filesystem::create_directory(result);
}
@@ -49,4 +49,3 @@ namespace Swift {
};
}
-#endif