10 files changed, 38 insertions, 38 deletions
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index a07f90b..b90ae46 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -13,7 +13,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <vector>
 
-#include "Swiften/Base/String.h"
+#include <string>
 #include "Swiften/Elements/SecurityLabel.h"
 #include "Swiften/Elements/ChatState.h"
 
@@ -32,17 +32,17 @@ namespace Swift {
 			/** Add message to window.
 			 * @return id of added message (for acks).
 			 */
-			virtual String addMessage(const String& message, const String& senderName, bool senderIsSelf, const boost::optional<SecurityLabel>& label, const String& avatarPath, const boost::posix_time::ptime& time) = 0;
+			virtual std::string addMessage(const std::string& message, const std::string& senderName, bool senderIsSelf, const boost::optional<SecurityLabel>& label, const std::string& avatarPath, const boost::posix_time::ptime& time) = 0;
 			/** Adds action to window.
 			 * @return id of added message (for acks);
 			 */
-			virtual String addAction(const String& message, const String& senderName, bool senderIsSelf, const boost::optional<SecurityLabel>& label, const String& avatarPath, const boost::posix_time::ptime& time) = 0;
-			virtual void addSystemMessage(const String& message) = 0;
-			virtual void addPresenceMessage(const String& message) = 0;
-			virtual void addErrorMessage(const String& message) = 0;
+			virtual std::string addAction(const std::string& message, const std::string& senderName, bool senderIsSelf, const boost::optional<SecurityLabel>& label, const std::string& avatarPath, const boost::posix_time::ptime& time) = 0;
+			virtual void addSystemMessage(const std::string& message) = 0;
+			virtual void addPresenceMessage(const std::string& message) = 0;
+			virtual void addErrorMessage(const std::string& message) = 0;
 
 			virtual void setContactChatState(ChatState::ChatStateType state) = 0;
-			virtual void setName(const String& name) = 0;
+			virtual void setName(const std::string& name) = 0;
 			virtual void show() = 0;
 			virtual void activate() = 0;
 			virtual void setAvailableSecurityLabels(const std::vector<SecurityLabel>& labels) = 0;
@@ -55,13 +55,13 @@ namespace Swift {
 			virtual void setInputEnabled(bool enabled) = 0;
 			virtual void setRosterModel(Roster* model) = 0;
 			virtual void setTabComplete(TabComplete* completer) = 0;
-			virtual void replaceLastMessage(const String& message) = 0;
-			virtual void setAckState(const String& id, AckState state) = 0;
+			virtual void replaceLastMessage(const std::string& message) = 0;
+			virtual void setAckState(const std::string& id, AckState state) = 0;
 			virtual void flash() = 0;
 
 			boost::signal<void ()> onClosed;
 			boost::signal<void ()> onAllMessagesRead;
-			boost::signal<void (const String&)> onSendMessageRequest;
+			boost::signal<void (const std::string&)> onSendMessageRequest;
 			boost::signal<void ()> onUserTyping;
 			boost::signal<void ()> onUserCancelsTyping;
 	};
diff --git a/Swift/Controllers/UIInterfaces/ContactEditWindow.h b/Swift/Controllers/UIInterfaces/ContactEditWindow.h
index fe552c2..2445456 100644
--- a/Swift/Controllers/UIInterfaces/ContactEditWindow.h
+++ b/Swift/Controllers/UIInterfaces/ContactEditWindow.h
@@ -11,7 +11,7 @@
 #include <set>
 #include <vector>
 
-#include <Swiften/Base/String.h>
+#include <string>
 
 namespace Swift {
 	class JID;
@@ -22,12 +22,12 @@ namespace Swift {
 
 			virtual void setEnabled(bool b) = 0;
 
-			virtual void setContact(const JID& jid, const String& name, const std::vector<String>& groups, const std::set<String>& allGroups) = 0;
+			virtual void setContact(const JID& jid, const std::string& name, const std::vector<std::string>& groups, const std::set<std::string>& allGroups) = 0;
 
 			virtual void show() = 0;
 			virtual void hide() = 0;
 
 			boost::signal<void ()> onRemoveContactRequest;
-			boost::signal<void (const String& /* name */, const std::set<String>& /* groups */)> onChangeContactRequest;
+			boost::signal<void (const std::string& /* name */, const std::set<std::string>& /* groups */)> onChangeContactRequest;
 	};
 }
diff --git a/Swift/Controllers/UIInterfaces/JoinMUCWindow.h b/Swift/Controllers/UIInterfaces/JoinMUCWindow.h
index 8cf712c..2e3d43c 100644
--- a/Swift/Controllers/UIInterfaces/JoinMUCWindow.h
+++ b/Swift/Controllers/UIInterfaces/JoinMUCWindow.h
@@ -8,7 +8,7 @@
 
 #include <vector>
 
-#include <Swiften/Base/String.h>
+#include <string>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/JID/JID.h>
 
@@ -17,11 +17,11 @@ namespace Swift {
 		public:
 			virtual ~JoinMUCWindow() {};
 
-			virtual void setNick(const String& nick) = 0;
-			virtual void setMUC(const String& nick) = 0;
+			virtual void setNick(const std::string& nick) = 0;
+			virtual void setMUC(const std::string& nick) = 0;
 			virtual void show() = 0;
 
-			boost::signal<void (const JID& /* muc */, const String& /* nick */, bool /* autoJoin */)> onJoinMUC;
+			boost::signal<void (const JID& /* muc */, const std::string& /* nick */, bool /* autoJoin */)> onJoinMUC;
 			boost::signal<void ()> onSearchMUC;
 	};
 }
diff --git a/Swift/Controllers/UIInterfaces/LoginWindow.h b/Swift/Controllers/UIInterfaces/LoginWindow.h
index fc28424..61fcaa1 100644
--- a/Swift/Controllers/UIInterfaces/LoginWindow.h
+++ b/Swift/Controllers/UIInterfaces/LoginWindow.h
@@ -9,7 +9,7 @@
 #include "Swiften/Base/boost_bsignals.h"
 #include <boost/shared_ptr.hpp>
 
-#include <Swiften/Base/String.h>
+#include <string>
 #include <Swiften/TLS/Certificate.h>
 
 namespace Swift {
@@ -17,21 +17,21 @@ namespace Swift {
 	class LoginWindow {
 		public:
 			virtual ~LoginWindow() {};
-			virtual void selectUser(const String&) = 0;
+			virtual void selectUser(const std::string&) = 0;
 			virtual void morphInto(MainWindow *mainWindow) = 0;
 			virtual void loggedOut() = 0;
-			virtual void setMessage(const String&) = 0;
+			virtual void setMessage(const std::string&) = 0;
 			virtual void setIsLoggingIn(bool loggingIn) = 0;
-			virtual void addAvailableAccount(const String& defaultJID, const String& defaultPassword, const String& defaultCertificate) = 0;
-			virtual void removeAvailableAccount(const String& jid) = 0;
-			boost::signal<void (const String&, const String&, const String& /* certificateFile */, bool /* remember password*/, bool /* login automatically */)> onLoginRequest;
+			virtual void addAvailableAccount(const std::string& defaultJID, const std::string& defaultPassword, const std::string& defaultCertificate) = 0;
+			virtual void removeAvailableAccount(const std::string& jid) = 0;
+			boost::signal<void (const std::string&, const std::string&, const std::string& /* certificateFile */, bool /* remember password*/, bool /* login automatically */)> onLoginRequest;
 			virtual void setLoginAutomatically(bool loginAutomatically) = 0;
 			virtual void quit() = 0;
 			/** Blocking request whether a cert should be permanently trusted.*/
-			virtual bool askUserToTrustCertificatePermanently(const String& message, Certificate::ref) = 0;
+			virtual bool askUserToTrustCertificatePermanently(const std::string& message, Certificate::ref) = 0;
 
 			boost::signal<void ()> onCancelLoginRequest;
 			boost::signal<void ()> onQuitRequest;
-			boost::signal<void (const String&)> onPurgeSavedLoginRequest;
+			boost::signal<void (const std::string&)> onPurgeSavedLoginRequest;
 	};
 }
diff --git a/Swift/Controllers/UIInterfaces/LoginWindowFactory.h b/Swift/Controllers/UIInterfaces/LoginWindowFactory.h
index 81fde93..1cead2a 100644
--- a/Swift/Controllers/UIInterfaces/LoginWindowFactory.h
+++ b/Swift/Controllers/UIInterfaces/LoginWindowFactory.h
@@ -11,7 +11,7 @@
 
 namespace Swift {
 	class LoginWindow;
-	class String;
+	
 	class UIEventStream;
 		
 	class LoginWindowFactory {
diff --git a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
index ded2a0a..5814b06 100644
--- a/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
+++ b/Swift/Controllers/UIInterfaces/MUCSearchWindow.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include <boost/optional.hpp>
-#include "Swiften/Base/String.h"
+#include <string>
 #include "Swiften/JID/JID.h"
 #include <Swift/Controllers/Chat/MUCSearchController.h>
 
diff --git a/Swift/Controllers/UIInterfaces/MainWindow.h b/Swift/Controllers/UIInterfaces/MainWindow.h
index 125aae5..2fd463b 100644
--- a/Swift/Controllers/UIInterfaces/MainWindow.h
+++ b/Swift/Controllers/UIInterfaces/MainWindow.h
@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "Swiften/Base/String.h"
+#include <string>
 #include "Swiften/JID/JID.h"
 #include "Swiften/Elements/StatusShow.h"
 
@@ -25,16 +25,16 @@ namespace Swift {
 				return canDelete_;
 			}
 
-			virtual void setMyNick(const String& name) = 0;
+			virtual void setMyNick(const std::string& name) = 0;
 			virtual void setMyJID(const JID& jid) = 0;
-			virtual void setMyAvatarPath(const String& path) = 0;
-			virtual void setMyStatusText(const String& status) = 0;
+			virtual void setMyAvatarPath(const std::string& path) = 0;
+			virtual void setMyStatusText(const std::string& status) = 0;
 			virtual void setMyStatusType(StatusShow::Type type) = 0;
 			/** Must be able to cope with NULL to clear the roster */
 			virtual void setRosterModel(Roster* roster) = 0;
 			virtual void setConnecting() = 0;
 			
-			boost::signal<void (StatusShow::Type, const String&)> onChangeStatusRequest;
+			boost::signal<void (StatusShow::Type, const std::string&)> onChangeStatusRequest;
 			boost::signal<void ()> onSignOutRequest;
 
 		private:
diff --git a/Swift/Controllers/UIInterfaces/ProfileWindow.h b/Swift/Controllers/UIInterfaces/ProfileWindow.h
index e9c9a63..5d5c754 100644
--- a/Swift/Controllers/UIInterfaces/ProfileWindow.h
+++ b/Swift/Controllers/UIInterfaces/ProfileWindow.h
@@ -20,7 +20,7 @@ namespace Swift {
 
 			virtual void setEnabled(bool b) = 0;
 			virtual void setProcessing(bool b) = 0;
-			virtual void setError(const String&) = 0;
+			virtual void setError(const std::string&) = 0;
 
 			virtual void show() = 0;
 			virtual void hide() = 0;
diff --git a/Swift/Controllers/UIInterfaces/UserSearchWindow.h b/Swift/Controllers/UIInterfaces/UserSearchWindow.h
index e4a665b..0bb7400 100644
--- a/Swift/Controllers/UIInterfaces/UserSearchWindow.h
+++ b/Swift/Controllers/UIInterfaces/UserSearchWindow.h
@@ -10,7 +10,7 @@
 
 #include <vector>
 
-#include "Swiften/Base/String.h"
+#include <string>
 #include "Swiften/JID/JID.h"
 #include "Swift/Controllers/Chat/UserSearchController.h"
 
diff --git a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
index 9061b07..3cd0947 100644
--- a/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
+++ b/Swift/Controllers/UIInterfaces/XMLConsoleWidget.h
@@ -6,15 +6,15 @@
 
 #pragma once
 
-namespace Swift {
-	class String;
+#include <string>
 
+namespace Swift {
 	class XMLConsoleWidget {
 		public:
 			virtual ~XMLConsoleWidget();
 
-			virtual void handleDataRead(const String& data) = 0;
-			virtual void handleDataWritten(const String& data) = 0;
+			virtual void handleDataRead(const std::string& data) = 0;
+			virtual void handleDataWritten(const std::string& data) = 0;
 
 			virtual void show() = 0;
 			virtual void activate() = 0;