summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-14 18:57:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-14 21:36:32 (GMT)
commitcb05f5a908e20006c954ce38755c2e422ecc2388 (patch)
treea793551a5fe279a57d4330119560e8542f745484 /Swiften/LinkLocal/LinkLocalServiceInfo.h
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swiften/LinkLocal/LinkLocalServiceInfo.h')
-rw-r--r--Swiften/LinkLocal/LinkLocalServiceInfo.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/Swiften/LinkLocal/LinkLocalServiceInfo.h b/Swiften/LinkLocal/LinkLocalServiceInfo.h
index efe9245..a166c64 100644
--- a/Swiften/LinkLocal/LinkLocalServiceInfo.h
+++ b/Swiften/LinkLocal/LinkLocalServiceInfo.h
@@ -9,7 +9,7 @@
#include <boost/optional.hpp>
#include "Swiften/Base/ByteArray.h"
-#include "Swiften/Base/String.h"
+#include <string>
#include "Swiften/JID/JID.h"
namespace Swift {
@@ -20,23 +20,23 @@ namespace Swift {
LinkLocalServiceInfo() : status(Available) {}
- const String& getFirstName() const { return firstName; }
- void setFirstName(const String& f) { firstName = f; }
+ const std::string& getFirstName() const { return firstName; }
+ void setFirstName(const std::string& f) { firstName = f; }
- const String& getLastName() const { return lastName; }
- void setLastName(const String& l) { lastName = l; }
+ const std::string& getLastName() const { return lastName; }
+ void setLastName(const std::string& l) { lastName = l; }
- const String& getEMail() const { return email; }
- void setEMail(const String& e) { email = e; }
+ const std::string& getEMail() const { return email; }
+ void setEMail(const std::string& e) { email = e; }
const JID& getJID() const { return jid; }
void setJID(const JID& j) { jid = j; }
- const String& getMessage() const { return message; }
- void setMessage(const String& m) { message = m; }
+ const std::string& getMessage() const { return message; }
+ void setMessage(const std::string& m) { message = m; }
- const String& getNick() const { return nick; }
- void setNick(const String& n) { nick = n; }
+ const std::string& getNick() const { return nick; }
+ void setNick(const std::string& n) { nick = n; }
Status getStatus() const { return status; }
void setStatus(Status s) { status = s; }
@@ -49,16 +49,16 @@ namespace Swift {
static LinkLocalServiceInfo createFromTXTRecord(const ByteArray& record);
private:
- static ByteArray getEncoded(const String&);
- static std::pair<String,String> readEntry(const ByteArray&, size_t*);
+ static ByteArray getEncoded(const std::string&);
+ static std::pair<std::string,std::string> readEntry(const ByteArray&, size_t*);
private:
- String firstName;
- String lastName;
- String email;
+ std::string firstName;
+ std::string lastName;
+ std::string email;
JID jid;
- String message;
- String nick;
+ std::string message;
+ std::string nick;
Status status;
boost::optional<int> port;
};