Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-02-14 22:12:45 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-02-14 22:13:02 (GMT) |
| commit | 48a317147b77fa7a7da571e5d47c66f4152269c4 (patch) | |
| tree | acb1fe465af56ceaf65b718333ff2e3c680b3a71 | |
| parent | 81a5b370a221ba1c5b37983786b490b9ceceea85 (diff) | |
| download | swift-contrib-48a317147b77fa7a7da571e5d47c66f4152269c4.zip swift-contrib-48a317147b77fa7a7da571e5d47c66f4152269c4.tar.bz2 | |
Removed use of P2QSTRING in FreeDesktopNotifier.
| -rw-r--r-- | Swift/QtUI/FreeDesktopNotifier.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
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("&", "&"); body = body.replace("<", "<"); body = body.replace(">", ">"); @@ -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 |