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 /Swift/QtUI/tmp/QtRosterContextMenu.cpp
parentcad974b45c0fb9355e68d9728e42c9ae3dbcebc7 (diff)
downloadswift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.zip
swift-contrib-cb05f5a908e20006c954ce38755c2e422ecc2388.tar.bz2
Removed Swift::String.
Diffstat (limited to 'Swift/QtUI/tmp/QtRosterContextMenu.cpp')
-rw-r--r--Swift/QtUI/tmp/QtRosterContextMenu.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/QtUI/tmp/QtRosterContextMenu.cpp b/Swift/QtUI/tmp/QtRosterContextMenu.cpp
index a59a2f7..c8375ba 100644
--- a/Swift/QtUI/tmp/QtRosterContextMenu.cpp
+++ b/Swift/QtUI/tmp/QtRosterContextMenu.cpp
@@ -18,7 +18,7 @@
#include "Swiften/Roster/ContactRosterItem.h"
#include "Swiften/Roster/GroupRosterItem.h"
-#include "Swiften/Base/String.h"
+#include <string>
#include "Swiften/Roster/Roster.h"
#include "Swift/Controllers/UIEvents/UIEvent.h"
#include "Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h"
@@ -92,8 +92,8 @@ void QtRosterContextMenu::handleRenameGroup() {
bool ok;
QString newName = QInputDialog::getText(NULL, "Rename group", "New name for " + P2QSTRING(item_->getDisplayName()), QLineEdit::Normal, P2QSTRING(item_->getDisplayName()), &ok);
if (ok) {
- std::vector<String> addedGroups;
- std::vector<String> removedGroups;
+ std::vector<std::string> addedGroups;
+ std::vector<std::string> removedGroups;
addedGroups.push_back(Q2PSTRING(newName));
removedGroups.push_back(group->getDisplayName());
foreach (RosterItem* child, group->getChildren()) {