2 files changed, 4 insertions, 4 deletions
diff --git a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
index ad06654..c6fb004 100644
--- a/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
+++ b/Swift/QtUI/UserSearch/QtUserSearchWindow.cpp
@@ -209,7 +209,7 @@ void QtUserSearchWindow::show() {
 //
 //void QtUserSearchWindow::handleOkClicked() {
 //	JID contact = JID(Q2PSTRING(jid_->text()));
-//	String nick = Q2PSTRING(nickName_->text());
+//	std::string nick = Q2PSTRING(nickName_->text());
 //	if (addToRoster_->isChecked()) {
 //		boost::shared_ptr<UIEvent> event(new AddContactUIEvent(contact, nick));
 //		eventStream_->send(event);
diff --git a/Swift/QtUI/UserSearch/UserSearchModel.cpp b/Swift/QtUI/UserSearch/UserSearchModel.cpp
index 1187c29..aafd789 100644
--- a/Swift/QtUI/UserSearch/UserSearchModel.cpp
+++ b/Swift/QtUI/UserSearch/UserSearchModel.cpp
@@ -46,12 +46,12 @@ QVariant UserSearchModel::data(UserSearchResult* item, int role) {
 
 QString UserSearchModel::nameLine(UserSearchResult* item) {
 	QString result;
-	const std::map<String, String> fields = item->getFields();
-	std::map<String, String>::const_iterator first = fields.find("first");
+	const std::map<std::string, std::string> fields = item->getFields();
+	std::map<std::string, std::string>::const_iterator first = fields.find("first");
 	if (first != fields.end()) {
 		result += P2QSTRING((*first).second);
 	}
-	std::map<String, String>::const_iterator last = fields.find("last");
+	std::map<std::string, std::string>::const_iterator last = fields.find("last");
 	if (last != fields.end()) {
 		if (!result.isEmpty()) {
 			result += " ";