1 files changed, 13 insertions, 3 deletions
diff --git a/Swift/QtUI/QtContactEditWidget.cpp b/Swift/QtUI/QtContactEditWidget.cpp
index 9d071b9..a347a00 100644
--- a/Swift/QtUI/QtContactEditWidget.cpp
+++ b/Swift/QtUI/QtContactEditWidget.cpp
@@ -46,20 +46,21 @@ QtContactEditWidget::QtContactEditWidget(const std::set<std::string>& allGroups,
 	groupsArea->setWidgetResizable(true);
 	groupsArea->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 	groupsArea->setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
 	QWidget* groups = new QWidget(groupsArea);
 	groupsArea->setWidget(groups);
 	QVBoxLayout* scrollLayout = new QVBoxLayout(groups);
 
 	foreach (std::string group, allGroups) {
+		QString groupName = doubleAmpersand(group);
 		QCheckBox* check = new QCheckBox(groups);
-		check->setText(P2QSTRING(group));
+		check->setText(groupName);
 		check->setCheckState(Qt::Unchecked);
 		checkBoxes_[group] = check;
 		scrollLayout->addWidget(check);
 	}
 
 	QHBoxLayout* newGroupLayout = new QHBoxLayout();
 	newGroup_ = new QCheckBox(groups);
 	newGroup_->setText(tr("New Group:"));
 	newGroup_->setCheckState(Qt::Unchecked);
@@ -77,19 +78,19 @@ void QtContactEditWidget::setName(const std::string& name) {
 
 std::string QtContactEditWidget::getName() const {
 	std::string name = Q2PSTRING(name_->text());
 	QList<QRadioButton*> buttons = findChildren<QRadioButton*>();
 	foreach(const QRadioButton* button, buttons) {
 		if (button->isChecked()) {
 			if (button == nameRadioButton_) {
 				name = Q2PSTRING(name_->text());
 			} else {
-				name = Q2PSTRING(button->text());
+				name = singleAmpersand(button->text());
 			}
 			break;
 		}
 	}
 	return name;
 }
 
 void QtContactEditWidget::setSelectedGroups(const std::vector<std::string>& groups) {
 	foreach (std::string group, groups) {
@@ -109,19 +110,19 @@ std::set<std::string> QtContactEditWidget::getSelectedGroups() const {
 	}
 	return groups;
 }
 
 void QtContactEditWidget::setNameSuggestions(const std::vector<std::string>& suggestions) {
 	throbberLabel_->movie()->stop();
 	throbberLabel_->hide();
 
 	foreach(const std::string& name, suggestions) {
-		suggestionsLayout_->insertWidget(nameLayout_->count() - 2, new QRadioButton(P2QSTRING(name), this));
+		suggestionsLayout_->insertWidget(nameLayout_->count() - 2, new QRadioButton(doubleAmpersand(name), this));
 	}
 
 	nameRadioButton_ = new QRadioButton(tr("Name:"), this);
 	suggestionsLayout_->insertWidget(nameLayout_->count(), nameRadioButton_);
 
 	QRadioButton* suggestedRadioButton = 0;
 	QList<QRadioButton*> radioButtons = findChildren<QRadioButton*>();
 	foreach (QRadioButton* candidate, radioButtons) {
 		if (candidate->text() == name_->text()) {
@@ -129,18 +130,27 @@ void QtContactEditWidget::setNameSuggestions(const std::vector<std::string>& sug
 			break;
 		}
 	}
 	if (suggestedRadioButton) {
 		suggestedRadioButton->setChecked(true);
 	} else {
 		nameRadioButton_->setChecked(true);
 	}
 }
+QString QtContactEditWidget::doubleAmpersand(const std::string& name) const {
+	return P2QSTRING(name).replace("&", "&&");
+
+}
+
+std::string QtContactEditWidget::singleAmpersand(const QString& name) const {
+	return Q2PSTRING(QString(name).replace("&&", "&"));
+}
+
 
 void QtContactEditWidget::clear() {
 	name_->clear();
 	setSelectedGroups(std::vector<std::string>());
 	newGroup_->setChecked(false);
 	newGroupName_->clear();
 	throbberLabel_->movie()->start();
 	throbberLabel_->show();