aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarja Hassinen <marja.hassinen@nokia.com>2010-09-13 14:05:00 +0300
committerMarja Hassinen <marja.hassinen@nokia.com>2010-09-13 14:05:00 +0300
commit37758afe5970fb28c5c71f25d02a9b593cd991de (patch)
treea199f87f0f226022fa72e01fa8f957a6a27d3826
parent8b94193eb6e85bd41d50c3d6ea276a9f22e38ada (diff)
file-static const char[]'s instead of class-static QStrings.unloadable
-rw-r--r--libcontextsubscriber/src/contextkitplugin.cpp9
-rw-r--r--libcontextsubscriber/src/contextkitplugin.h6
2 files changed, 5 insertions, 10 deletions
diff --git a/libcontextsubscriber/src/contextkitplugin.cpp b/libcontextsubscriber/src/contextkitplugin.cpp
index 5b14d893..902978c2 100644
--- a/libcontextsubscriber/src/contextkitplugin.cpp
+++ b/libcontextsubscriber/src/contextkitplugin.cpp
@@ -58,10 +58,11 @@ namespace ContextSubscriber {
\brief Implementation of the ContextKit D-Bus protocol.
*/
-const QString ContextKitPlugin::managerPath = "/org/freedesktop/ContextKit/Manager";
-const QString ContextKitPlugin::managerIName = "org.freedesktop.ContextKit.Manager";
-const QString ContextKitPlugin::propertyIName = "org.maemo.contextkit.Property";
-const QString ContextKitPlugin::corePrefix = "/org/maemo/contextkit/";
+static const char managerIName[] = "org.freedesktop.ContextKit.Manager";
+static const char subscriberIName[] = "org.freedesktop.ContextKit.Subscriber";
+static const char managerPath[] = "/org/freedesktop/ContextKit/Manager";
+static const char propertyIName[] = "org.maemo.contextkit.Property";
+static const char corePrefix[] = "/org/maemo/contextkit/";
/// Converts a key name to a protocol level object path. There is a
/// distinction, because core properties have the form
diff --git a/libcontextsubscriber/src/contextkitplugin.h b/libcontextsubscriber/src/contextkitplugin.h
index 077a027c..d1aab54b 100644
--- a/libcontextsubscriber/src/contextkitplugin.h
+++ b/libcontextsubscriber/src/contextkitplugin.h
@@ -114,12 +114,6 @@ private:
QHash<QString, QString> objectPathToKey;
- static const QString managerIName; ///< org.freedesktop.ContextKit.Manager
- static const QString subscriberIName; ///< org.freedesktop.ContextKit.Subscriber
- static const QString managerPath; ///< /org/freedesktop/ContextKit/Manager
- static const QString propertyIName; ///< org.maemo.contextkit.Property
- static const QString corePrefix; ///< /org/maemo/contextkit/
-
};
QVariant demarshallValue(const QVariant &v);