From 48a317147b77fa7a7da571e5d47c66f4152269c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Mon, 14 Feb 2011 23:12:45 +0100
Subject: Removed use of P2QSTRING in FreeDesktopNotifier.


diff --git a/Swift/QtUI/FreeDesktopNotifier.cpp b/Swift/QtUI/FreeDesktopNotifier.cpp
index 037f67b..2393340 100644
--- a/Swift/QtUI/FreeDesktopNotifier.cpp
+++ b/Swift/QtUI/FreeDesktopNotifier.cpp
@@ -14,8 +14,6 @@
 #include <QtDBus/QtDBus>
 #include <algorithm>
 
-#include "QtSwiftUtil.h"
-
 namespace Swift {
 
 FreeDesktopNotifier::FreeDesktopNotifier(const std::string& name) : applicationName(name) {
@@ -31,7 +29,7 @@ void FreeDesktopNotifier::showMessage(Type type, const std::string& subject, con
 		return;
 	}
 
-	QString body = P2QSTRING(description);
+	QString body = description.c_str();
 	body = body.replace("&", "&amp;");
 	body = body.replace("<", "&lt;");
 	body = body.replace(">", "&gt;");
@@ -43,10 +41,10 @@ void FreeDesktopNotifier::showMessage(Type type, const std::string& subject, con
 	QStringList actions;
 	QMap<QString, QVariant> hints;
 	hints["x-canonical-append"] = QString("allowed");
-	msg << P2QSTRING(applicationName);
+	msg << applicationName.c_str();
 	msg << quint32(0); // ID of previous notification to replace
 	msg << imageScaler.getScaledImage(picture, 48).string().c_str(); // Icon to display
-	msg << P2QSTRING(subject); // Summary / Header of the message to display
+	msg << subject.c_str(); // Summary / Header of the message to display
 	msg << body; // Body of the message to display
 	msg << actions; // Actions from which the user may choose
 	msg << hints; // Hints to the server displaying the message
-- 
cgit v0.10.2-6-g49f6