1 files changed, 4 insertions, 4 deletions
diff --git a/Swift/QtUI/QtSubscriptionRequestWindow.cpp b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
index 7c1577b..460366b 100644
--- a/Swift/QtUI/QtSubscriptionRequestWindow.cpp
+++ b/Swift/QtUI/QtSubscriptionRequestWindow.cpp
@@ -1,27 +1,27 @@
 /*
- * Copyright (c) 2010 Kevin Smith
+ * Copyright (c) 2010-2014 Kevin Smith
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "Swift/QtUI/QtSubscriptionRequestWindow.h"
 
 #include <QPushButton>
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QLabel>
 
-#include "Swift/QtUI/QtSwiftUtil.h"
+#include <Swift/QtUI/QtSwiftUtil.h>
 
 namespace Swift {
 QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(boost::shared_ptr<SubscriptionRequestEvent> event, QWidget* parent) : QDialog(parent), event_(event) {
-	QString text = QString(tr("%1 would like to add you to their contact list.")).arg(event->getJID().toString().c_str());
+	QString text = QString(tr("%1 would like to add you to their contact list.")).arg(P2QSTRING(event->getJID().toString()));
 	QVBoxLayout* layout = new QVBoxLayout();
 	QLabel* label = new QLabel(text, this);
 	layout->addWidget(label);
 	label = new QLabel(tr("Would you like to add them to your contact list and share your status when you're online?"));
 	//layout->addWidget(new QLabel);
 	layout->addWidget(label);
 
 	if (event_->getConcluded()) {
 		QLabel* doneLabel = new QLabel(tr("You have already replied to this request"));
@@ -40,19 +40,19 @@ QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(boost::shared_ptr<Subsc
 		connect(deferButton, SIGNAL(clicked()), this, SLOT(handleDefer()));
 
 		QHBoxLayout* buttonLayout = new QHBoxLayout();
 		buttonLayout->addWidget(yesButton);
 		buttonLayout->addWidget(noButton);
 		buttonLayout->addWidget(deferButton);
 		layout->addWidget(new QLabel);
 		layout->addLayout(buttonLayout);
 		layout->addWidget(new QLabel);
-		QLabel *footer = new QLabel(tr("(If you choose to defer this choice, you will be asked again when you next login.)"));
+		QLabel* footer = new QLabel(tr("(If you choose to defer this choice, you will be asked again when you next login.)"));
 		layout->addWidget(footer);
 	}
 
 	setLayout(layout);
 }
 
 void QtSubscriptionRequestWindow::handleYes() {
 	event_->accept();
 	delete this;