summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swiften/LinkLocal/LinkLocalService.cpp')
-rw-r--r--Swiften/LinkLocal/LinkLocalService.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/Swiften/LinkLocal/LinkLocalService.cpp b/Swiften/LinkLocal/LinkLocalService.cpp
index d67361c..c8d707d 100644
--- a/Swiften/LinkLocal/LinkLocalService.cpp
+++ b/Swiften/LinkLocal/LinkLocalService.cpp
@@ -8,19 +8,19 @@
namespace Swift {
-String LinkLocalService::getDescription() const {
+std::string LinkLocalService::getDescription() const {
LinkLocalServiceInfo info = getInfo();
- if (!info.getNick().isEmpty()) {
+ if (!info.getNick().empty()) {
return info.getNick();
}
- else if (!info.getFirstName().isEmpty()) {
- String result = info.getFirstName();
- if (!info.getLastName().isEmpty()) {
+ else if (!info.getFirstName().empty()) {
+ std::string result = info.getFirstName();
+ if (!info.getLastName().empty()) {
result += " " + info.getLastName();
}
return result;
}
- else if (!info.getLastName().isEmpty()) {
+ else if (!info.getLastName().empty()) {
return info.getLastName();
}
return getName();