themeName, useGlobalSettings and wallpaperPath move into Plasma::Theme

src/declarativeimports/core/theme.cpp

@@ -72,11 +72,6 @@ void ThemeProxy::updateSpacing()
     m_largeSpacing = _s;
 }
 
-QString ThemeProxy::themeName() const
-{
-    return Plasma::Theme::themeName();
-}
-
 QFont ThemeProxy::defaultFont() const
 {
     return QApplication::font();
@@ -102,16 +97,6 @@ int ThemeProxy::largeSpacing() const
     return m_largeSpacing;
 }
 
-bool ThemeProxy::useGlobalSettings() const
-{
-    return Plasma::Theme::useGlobalSettings();
-}
-
-QString ThemeProxy::wallpaperPath() const
-{
-    return Plasma::Theme::wallpaperPath();
-}
-
 QString ThemeProxy::wallpaperPathForSize(int width, int height) const
 {
     return Plasma::Theme::wallpaperPath(QSize(width, height));
@@ -226,7 +211,6 @@ void ThemeProxy::iconLoaderSettingsChanged()
     m_iconSizes->insert("small", KIconLoader::global()->currentSize(KIconLoader::Small));
     m_iconSizes->insert("dialog", KIconLoader::global()->currentSize(KIconLoader::Dialog));
 
-
     emit defaultIconSizeChanged();
     emit iconSizesChanged();
 }
@@ -242,4 +226,3 @@ QQmlPropertyMap *ThemeProxy::iconSizes() const
 }
 
 #include "moc_theme.cpp"
-

src/declarativeimports/core/theme.h

@@ -40,10 +40,6 @@ class ThemeProxy : public Plasma::Theme
 {
     Q_OBJECT
 
-    Q_PROPERTY(QString themeName READ themeName NOTIFY themeChanged)
-    Q_PROPERTY(bool useGlobalSettings READ useGlobalSettings NOTIFY themeChanged)
-    Q_PROPERTY(QString wallpaperPath READ wallpaperPath NOTIFY themeChanged)
-
     //fonts
     Q_PROPERTY(QFont  defaultFont READ defaultFont NOTIFY defaultFontChanged)
     Q_PROPERTY(QFont  smallestFont READ smallestFont NOTIFY smallestFontChanged)

src/plasma/theme.h

@@ -52,6 +52,11 @@ class PLASMA_EXPORT Theme : public QObject
 {
     Q_OBJECT
 
+    Q_PROPERTY(QString themeName READ themeName NOTIFY themeChanged)
+    Q_PROPERTY(bool useGlobalSettings READ useGlobalSettings NOTIFY themeChanged)
+    Q_PROPERTY(QString wallpaperPath READ wallpaperPath NOTIFY themeChanged)
+
+
     public:
         enum ColorRole {
             TextColor = 0, /**<  the text color to be used by items resting on the background */