Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-02-14 18:57:18 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-02-14 21:36:32 (GMT) |
| commit | cb05f5a908e20006c954ce38755c2e422ecc2388 (patch) | |
| tree | a793551a5fe279a57d4330119560e8542f745484 /Swift/Controllers/UIEvents | |
| parent | cad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff) | |
| download | swift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2 | |
Removed Swift::String.
Diffstat (limited to 'Swift/Controllers/UIEvents')
| -rw-r--r-- | Swift/Controllers/UIEvents/AddContactUIEvent.h | 8 | ||||
| -rw-r--r-- | Swift/Controllers/UIEvents/JoinMUCUIEvent.h | 8 | ||||
| -rw-r--r-- | Swift/Controllers/UIEvents/RenameGroupUIEvent.h | 12 | ||||
| -rw-r--r-- | Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h | 6 | ||||
| -rw-r--r-- | Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h | 2 |
5 files changed, 18 insertions, 18 deletions
diff --git a/Swift/Controllers/UIEvents/AddContactUIEvent.h b/Swift/Controllers/UIEvents/AddContactUIEvent.h index 1c5e54b..b2bf5ce 100644 --- a/Swift/Controllers/UIEvents/AddContactUIEvent.h +++ b/Swift/Controllers/UIEvents/AddContactUIEvent.h @@ -6,18 +6,18 @@ #pragma once -#include "Swiften/Base/String.h" +#include <string> #include "Swift/Controllers/UIEvents/UIEvent.h" namespace Swift { class AddContactUIEvent : public UIEvent { public: - AddContactUIEvent(const JID& jid, const String& name) : jid_(jid), name_(name) {}; - String getName() {return name_;}; + AddContactUIEvent(const JID& jid, const std::string& name) : jid_(jid), name_(name) {}; + std::string getName() {return name_;}; JID getJID() {return jid_;}; private: JID jid_; - String name_; + std::string name_; }; } diff --git a/Swift/Controllers/UIEvents/JoinMUCUIEvent.h b/Swift/Controllers/UIEvents/JoinMUCUIEvent.h index 2a2cd96..c7f8be6 100644 --- a/Swift/Controllers/UIEvents/JoinMUCUIEvent.h +++ b/Swift/Controllers/UIEvents/JoinMUCUIEvent.h @@ -8,7 +8,7 @@ #include <boost/optional.hpp> #include <boost/shared_ptr.hpp> -#include "Swiften/Base/String.h" +#include <string> #include "Swift/Controllers/UIEvents/UIEvent.h" @@ -16,11 +16,11 @@ namespace Swift { class JoinMUCUIEvent : public UIEvent { public: typedef boost::shared_ptr<JoinMUCUIEvent> ref; - JoinMUCUIEvent(const JID& jid, const boost::optional<String>& nick = boost::optional<String>()) : jid_(jid), nick_(nick) {}; - boost::optional<String> getNick() {return nick_;}; + JoinMUCUIEvent(const JID& jid, const boost::optional<std::string>& nick = boost::optional<std::string>()) : jid_(jid), nick_(nick) {}; + boost::optional<std::string> getNick() {return nick_;}; JID getJID() {return jid_;}; private: JID jid_; - boost::optional<String> nick_; + boost::optional<std::string> nick_; }; } diff --git a/Swift/Controllers/UIEvents/RenameGroupUIEvent.h b/Swift/Controllers/UIEvents/RenameGroupUIEvent.h index 1825d77..9773b9e 100644 --- a/Swift/Controllers/UIEvents/RenameGroupUIEvent.h +++ b/Swift/Controllers/UIEvents/RenameGroupUIEvent.h @@ -7,24 +7,24 @@ #pragma once #include <Swift/Controllers/UIEvents/UIEvent.h> -#include <Swiften/Base/String.h> +#include <string> namespace Swift { class RenameGroupUIEvent : public UIEvent { public: - RenameGroupUIEvent(const String& group, const String& newName) : group(group), newName(newName) { + RenameGroupUIEvent(const std::string& group, const std::string& newName) : group(group), newName(newName) { } - const String& getGroup() const { + const std::string& getGroup() const { return group; } - const String& getNewName() const { + const std::string& getNewName() const { return newName; } private: - String group; - String newName; + std::string group; + std::string newName; }; } diff --git a/Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h b/Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h index 4b550e6..f3542fe 100644 --- a/Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h +++ b/Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h @@ -14,13 +14,13 @@ namespace Swift { class RenameRosterItemUIEvent : public UIEvent { public: - RenameRosterItemUIEvent(const JID& jid, const String& newName) : jid_(jid), newName_(newName) {} + RenameRosterItemUIEvent(const JID& jid, const std::string& newName) : jid_(jid), newName_(newName) {} const JID& getJID() const {return jid_;} - const String& getNewName() const {return newName_;} + const std::string& getNewName() const {return newName_;} private: JID jid_; - String newName_; + std::string newName_; }; } diff --git a/Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h b/Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h index 1415140..dd2ff6c 100644 --- a/Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h +++ b/Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h @@ -9,7 +9,7 @@ #include <boost/optional.hpp> #include <boost/shared_ptr.hpp> -#include <Swiften/Base/String.h> +#include <string> #include <Swift/Controllers/UIEvents/UIEvent.h> namespace Swift { |