From 6e721dcdf1aafb4d0a08b6b12ec1f19d45cfd83f Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Fri, 15 Jul 2011 12:57:02 +0200 Subject: [PATCH] no longer provide access to the package from the class, let Package do that --- theme.cpp | 11 ----------- theme.h | 6 ------ 2 files changed, 17 deletions(-) diff --git a/theme.cpp b/theme.cpp index da82b5c34..8dd14dc80 100644 --- a/theme.cpp +++ b/theme.cpp @@ -166,7 +166,6 @@ public: static const char *defaultTheme; static const char *systemColorsTheme; static const char *themeRcFile; - static PackageStructure::Ptr packageStructure; Theme *q; QString themeName; @@ -205,7 +204,6 @@ public: bool useNativeWidgetStyle :1; }; -PackageStructure::Ptr ThemePrivate::packageStructure(0); const char *ThemePrivate::defaultTheme = "default"; const char *ThemePrivate::themeRcFile = "plasmarc"; // the system colors theme is used to cache unthemed svgs with colorization needs @@ -481,15 +479,6 @@ Theme::~Theme() delete d; } -PackageStructure::Ptr Theme::packageStructure() -{ - if (!ThemePrivate::packageStructure) { - ThemePrivate::packageStructure = new ThemePackage(); - } - - return ThemePrivate::packageStructure; -} - KPluginInfo::List Theme::listThemeInfo() { const QStringList themes = KGlobal::dirs()->findAllResources("data", "desktoptheme/*/metadata.desktop", diff --git a/theme.h b/theme.h index 65adbf1bc..2cb827126 100644 --- a/theme.h +++ b/theme.h @@ -28,7 +28,6 @@ #include #include -#include namespace Plasma { @@ -104,11 +103,6 @@ class PLASMA_EXPORT Theme : public QObject ~Theme(); - /** - * @return a package structure representing a Theme - */ - static PackageStructure::Ptr packageStructure(); - /** * @return a list of all known themes * @since 4.3