summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/UIInterfaces/MainWindow.h')
-rw-r--r--Swift/Controllers/UIInterfaces/MainWindow.h10
1 files changed, 5 insertions, 5 deletions
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: