summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2014-02-22 14:01:44 (GMT)
committerKevin Smith <git@kismith.co.uk>2014-02-22 16:25:27 (GMT)
commit0bd2db205035d4da9a93eb41dee126bf502eb44d (patch)
tree4f6a3a498e41a0fc7447b586d6020c1534a51e21
parent989b3711186d7fe9766dffa9334d70de78666db3 (diff)
downloadswift-0bd2db205035d4da9a93eb41dee126bf502eb44d.zip
swift-0bd2db205035d4da9a93eb41dee126bf502eb44d.tar.bz2
Clean up format slightly
Change-Id: I7133dbb4b8e24405fe585d8e2011666b9731971d
-rw-r--r--Swift/QtUI/QtSubscriptionRequestWindow.cpp8
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,5 +1,5 @@
/*
- * 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.
*/
@@ -11,11 +11,11 @@
#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);
@@ -46,7 +46,7 @@ QtSubscriptionRequestWindow::QtSubscriptionRequestWindow(boost::shared_ptr<Subsc
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);
}