2 files changed, 19 insertions, 19 deletions
diff --git a/Swift/Controllers/Settings/DummySettingsProvider.h b/Swift/Controllers/Settings/DummySettingsProvider.h
index 631b68d..90e1921 100644
--- a/Swift/Controllers/Settings/DummySettingsProvider.h
+++ b/Swift/Controllers/Settings/DummySettingsProvider.h
@@ -13,15 +13,15 @@ namespace Swift {
 class DummySettingsProvider : public SettingsProvider {
 	public:
 		virtual ~DummySettingsProvider() {}
-		virtual String getStringSetting(const String&) {return "";}
-		virtual void storeString(const String &, const String &) {}
-		virtual bool getBoolSetting(const String &, bool ) {return true;}
-		virtual void storeBool(const String &, bool ) {}
-		virtual int getIntSetting(const String &, int ) {return 0;}
-		virtual void storeInt(const String &, int ) {}
-		virtual std::vector<String> getAvailableProfiles() {return std::vector<String>();}
-		virtual void createProfile(const String& ) {}
-		virtual void removeProfile(const String& ) {}
+		virtual std::string getStringSetting(const std::string&) {return "";}
+		virtual void storeString(const std::string &, const std::string &) {}
+		virtual bool getBoolSetting(const std::string &, bool ) {return true;}
+		virtual void storeBool(const std::string &, bool ) {}
+		virtual int getIntSetting(const std::string &, int ) {return 0;}
+		virtual void storeInt(const std::string &, int ) {}
+		virtual std::vector<std::string> getAvailableProfiles() {return std::vector<std::string>();}
+		virtual void createProfile(const std::string& ) {}
+		virtual void removeProfile(const std::string& ) {}
 };
 
 }
diff --git a/Swift/Controllers/Settings/SettingsProvider.h b/Swift/Controllers/Settings/SettingsProvider.h
index a2cdad4..a5ff4eb 100644
--- a/Swift/Controllers/Settings/SettingsProvider.h
+++ b/Swift/Controllers/Settings/SettingsProvider.h
@@ -7,7 +7,7 @@
 #ifndef SWIFTEN_SettingsProvider_H
 #define SWIFTEN_SettingsProvider_H
 
-#include "Swiften/Base/String.h"
+#include <string>
 
 #include <vector>
 
@@ -16,15 +16,15 @@ namespace Swift {
 class SettingsProvider {
 	public:
 		virtual ~SettingsProvider() {}
-		virtual String getStringSetting(const String &settingPath) = 0;
-		virtual void storeString(const String &settingPath, const String &settingValue) = 0;
-		virtual bool getBoolSetting(const String &settingPath, bool defaultValue) = 0;
-		virtual void storeBool(const String &settingPath, bool settingValue) = 0;
-		virtual int getIntSetting(const String &settingPath, int defaultValue) = 0;
-		virtual void storeInt(const String &settingPath, int settingValue) = 0;
-		virtual std::vector<String> getAvailableProfiles() = 0;
-		virtual void createProfile(const String& profile) = 0;
-		virtual void removeProfile(const String& profile) = 0;
+		virtual std::string getStringSetting(const std::string &settingPath) = 0;
+		virtual void storeString(const std::string &settingPath, const std::string &settingValue) = 0;
+		virtual bool getBoolSetting(const std::string &settingPath, bool defaultValue) = 0;
+		virtual void storeBool(const std::string &settingPath, bool settingValue) = 0;
+		virtual int getIntSetting(const std::string &settingPath, int defaultValue) = 0;
+		virtual void storeInt(const std::string &settingPath, int settingValue) = 0;
+		virtual std::vector<std::string> getAvailableProfiles() = 0;
+		virtual void createProfile(const std::string& profile) = 0;
+		virtual void removeProfile(const std::string& profile) = 0;
 };
 
 }