[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-framework] src/plasmaquick: don't rely on char* to QString implicit conversion
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2015-12-18 23:29:51
Message-ID: E1aA4T9-0000Zp-So () scm ! kde ! org
[Download RAW message or body]

Git commit 54736e262f80b62686c11d542d5d239233243d1f by Patrick Spendrin.
Committed on 18/12/2015 at 23:29.
Pushed by sengels into branch 'master'.

don't rely on char* to QString implicit conversion

my Qt won't cast char* to QString, so explicitly use QStringLiteral here.

REVIEW: 126417

M  +1    -1    src/plasmaquick/appletquickitem.cpp

http://commits.kde.org/plasma-framework/54736e262f80b62686c11d542d5d239233243d1f

diff --git a/src/plasmaquick/appletquickitem.cpp \
b/src/plasmaquick/appletquickitem.cpp index 614b793..5f6b857 100644
--- a/src/plasmaquick/appletquickitem.cpp
+++ b/src/plasmaquick/appletquickitem.cpp
@@ -43,7 +43,7 @@ namespace PlasmaQuick
 QHash<QObject *, AppletQuickItem *> AppletQuickItemPrivate::s_rootObjects = \
QHash<QObject *, AppletQuickItem *>();  
 //TODO: temporary
-QSet<QString> AppletQuickItemPrivate::s_legacyApplets = \
QSet<QString>({"org.kde.plasma.bluetooth", "org.kde.plasma.pager", \
"org.kde.desktopcontainment", "org.kde.plasma.folder", "org.kde.panel", \
"org.kde.plasma.analogclock", "org.kde.plasma.battery", \
"org.kde.plasma.notifications", "org.kde.plasma.systemtray"}); +QSet<QString> \
AppletQuickItemPrivate::s_legacyApplets = \
QSet<QString>({QStringLiteral("org.kde.plasma.bluetooth"), \
QStringLiteral("org.kde.plasma.pager"), QStringLiteral("org.kde.desktopcontainment"), \
QStringLiteral("org.kde.plasma.folder"), QStringLiteral("org.kde.panel"), \
QStringLiteral("org.kde.plasma.analogclock"), \
QStringLiteral("org.kde.plasma.battery"), \
QStringLiteral("org.kde.plasma.notifications"), \
QStringLiteral("org.kde.plasma.systemtray")});  
 
 AppletQuickItemPrivate::AppletQuickItemPrivate(Plasma::Applet *a, AppletQuickItem \
*item)


[prev in list] [next in list] [prev in thread] [next in thread]