3 files changed, 9 insertions, 9 deletions
diff --git a/Swift/QtUI/Roster/QtTreeWidgetItem.cpp b/Swift/QtUI/Roster/QtTreeWidgetItem.cpp
index 97b2028..fcd8691 100644
--- a/Swift/QtUI/Roster/QtTreeWidgetItem.cpp
+++ b/Swift/QtUI/Roster/QtTreeWidgetItem.cpp
@@ -20,18 +20,18 @@ QtTreeWidgetItem::QtTreeWidgetItem(QtTreeWidgetItem* parentItem) : QObject(), te
 }
 
 
-void QtTreeWidgetItem::setText(const String& text) {
+void QtTreeWidgetItem::setText(const std::string& text) {
 	displayName_ = P2QSTRING(text);
 	displayNameLower_ = displayName_.toLower();
 	emit changed(this);
 }
 
-void QtTreeWidgetItem::setStatusText(const String& text) {
+void QtTreeWidgetItem::setStatusText(const std::string& text) {
 	statusText_ = P2QSTRING(text);
 	emit changed(this);
 }
 
-void QtTreeWidgetItem::setAvatarPath(const String& path) {
+void QtTreeWidgetItem::setAvatarPath(const std::string& path) {
 	avatar_ = QIcon(P2QSTRING(path));
 	emit changed(this);
 }
diff --git a/Swift/QtUI/Roster/QtTreeWidgetItem.h b/Swift/QtUI/Roster/QtTreeWidgetItem.h
index c042ae0..a2d0cdd 100644
--- a/Swift/QtUI/Roster/QtTreeWidgetItem.h
+++ b/Swift/QtUI/Roster/QtTreeWidgetItem.h
@@ -10,7 +10,7 @@
 #include <QColor>
 #include <QVariant>
 
-#include "Swiften/Base/String.h"
+#include <string>
 #include "Swiften/Roster/TreeWidgetFactory.h"
 #include "Swiften/Roster/TreeWidget.h"
 #include "Swiften/Roster/TreeWidgetItem.h"
@@ -43,9 +43,9 @@ class QtTreeWidgetItem : public QObject, public TreeWidgetItem {
 			QVariant data(int role);
 			QIcon getPresenceIcon(); 
 			QtTreeWidgetItem(QtTreeWidgetItem* parentItem);
-			void setText(const String& text);
-			void setAvatarPath(const String& path);
-			void setStatusText(const String& text);
+			void setText(const std::string& text);
+			void setAvatarPath(const std::string& path);
+			void setStatusText(const std::string& text);
 			void setStatusShow(StatusShow::Type show);
 			void setTextColor(unsigned long color);
 			void setBackgroundColor(unsigned long color);
diff --git a/Swift/QtUI/Roster/RosterModel.cpp b/Swift/QtUI/Roster/RosterModel.cpp
index 95452c8..306b76f 100644
--- a/Swift/QtUI/Roster/RosterModel.cpp
+++ b/Swift/QtUI/Roster/RosterModel.cpp
@@ -137,9 +137,9 @@ QString RosterModel::getToolTip(RosterItem* item) const {
 QIcon RosterModel::getAvatar(RosterItem* item) const {
 	ContactRosterItem* contact = dynamic_cast<ContactRosterItem*>(item);
 	if (!contact) return QIcon();
-	String path = contact->getAvatarPath();
+	std::string path = contact->getAvatarPath();
 	
-	return path.isEmpty() ? QIcon() : QIcon(P2QSTRING(path));
+	return path.empty() ? QIcon() : QIcon(P2QSTRING(path));
 }
 
 QString RosterModel::getStatusText(RosterItem* item) const {