summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/Controllers/XMPPEvents')
-rw-r--r--Swift/Controllers/XMPPEvents/ErrorEvent.h8
-rw-r--r--Swift/Controllers/XMPPEvents/MessageEvent.h2
-rw-r--r--Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h8
3 files changed, 9 insertions, 9 deletions
diff --git a/Swift/Controllers/XMPPEvents/ErrorEvent.h b/Swift/Controllers/XMPPEvents/ErrorEvent.h
index 3f78109..cbfc471 100644
--- a/Swift/Controllers/XMPPEvents/ErrorEvent.h
+++ b/Swift/Controllers/XMPPEvents/ErrorEvent.h
@@ -12,20 +12,20 @@
#include <boost/shared_ptr.hpp>
#include "Swift/Controllers/XMPPEvents/StanzaEvent.h"
-#include "Swiften/Base/String.h"
+#include <string>
#include "Swiften/JID/JID.h"
namespace Swift {
class ErrorEvent : public StanzaEvent {
public:
- ErrorEvent(const JID& jid, const String& text) : jid_(jid), text_(text){};
+ ErrorEvent(const JID& jid, const std::string& text) : jid_(jid), text_(text){};
virtual ~ErrorEvent(){};
const JID& getJID() const {return jid_;};
- const String& getText() const {return text_;};
+ const std::string& getText() const {return text_;};
private:
JID jid_;
- String text_;
+ std::string text_;
};
}
diff --git a/Swift/Controllers/XMPPEvents/MessageEvent.h b/Swift/Controllers/XMPPEvents/MessageEvent.h
index e02995d..d1021dc 100644
--- a/Swift/Controllers/XMPPEvents/MessageEvent.h
+++ b/Swift/Controllers/XMPPEvents/MessageEvent.h
@@ -25,7 +25,7 @@ namespace Swift {
boost::shared_ptr<Message> getStanza() {return stanza_;}
bool isReadable() {
- return getStanza()->isError() || !getStanza()->getBody().isEmpty();
+ return getStanza()->isError() || !getStanza()->getBody().empty();
}
void read() {
diff --git a/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h b/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h
index 704a86c..1f7812e 100644
--- a/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h
+++ b/Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h
@@ -12,16 +12,16 @@
#include <boost/shared_ptr.hpp>
#include "Swift/Controllers/XMPPEvents/StanzaEvent.h"
-#include "Swiften/Base/String.h"
+#include <string>
#include "Swiften/JID/JID.h"
namespace Swift {
class SubscriptionRequestEvent : public StanzaEvent {
public:
- SubscriptionRequestEvent(const JID& jid, const String& reason) : jid_(jid), reason_(reason){};
+ SubscriptionRequestEvent(const JID& jid, const std::string& reason) : jid_(jid), reason_(reason){};
virtual ~SubscriptionRequestEvent(){};
const JID& getJID() const {return jid_;};
- const String& getReason() const {return reason_;};
+ const std::string& getReason() const {return reason_;};
boost::signal<void()> onAccept;
boost::signal<void()> onDecline;
void accept() {
@@ -40,7 +40,7 @@ namespace Swift {
private:
JID jid_;
- String reason_;
+ std::string reason_;
};
}