no longer provide access to the package from the class, let Package do that
This commit is contained in:
parent
8c0d49b255
commit
6e721dcdf1
11
theme.cpp
11
theme.cpp
@ -166,7 +166,6 @@ public:
|
|||||||
static const char *defaultTheme;
|
static const char *defaultTheme;
|
||||||
static const char *systemColorsTheme;
|
static const char *systemColorsTheme;
|
||||||
static const char *themeRcFile;
|
static const char *themeRcFile;
|
||||||
static PackageStructure::Ptr packageStructure;
|
|
||||||
|
|
||||||
Theme *q;
|
Theme *q;
|
||||||
QString themeName;
|
QString themeName;
|
||||||
@ -205,7 +204,6 @@ public:
|
|||||||
bool useNativeWidgetStyle :1;
|
bool useNativeWidgetStyle :1;
|
||||||
};
|
};
|
||||||
|
|
||||||
PackageStructure::Ptr ThemePrivate::packageStructure(0);
|
|
||||||
const char *ThemePrivate::defaultTheme = "default";
|
const char *ThemePrivate::defaultTheme = "default";
|
||||||
const char *ThemePrivate::themeRcFile = "plasmarc";
|
const char *ThemePrivate::themeRcFile = "plasmarc";
|
||||||
// the system colors theme is used to cache unthemed svgs with colorization needs
|
// the system colors theme is used to cache unthemed svgs with colorization needs
|
||||||
@ -481,15 +479,6 @@ Theme::~Theme()
|
|||||||
delete d;
|
delete d;
|
||||||
}
|
}
|
||||||
|
|
||||||
PackageStructure::Ptr Theme::packageStructure()
|
|
||||||
{
|
|
||||||
if (!ThemePrivate::packageStructure) {
|
|
||||||
ThemePrivate::packageStructure = new ThemePackage();
|
|
||||||
}
|
|
||||||
|
|
||||||
return ThemePrivate::packageStructure;
|
|
||||||
}
|
|
||||||
|
|
||||||
KPluginInfo::List Theme::listThemeInfo()
|
KPluginInfo::List Theme::listThemeInfo()
|
||||||
{
|
{
|
||||||
const QStringList themes = KGlobal::dirs()->findAllResources("data", "desktoptheme/*/metadata.desktop",
|
const QStringList themes = KGlobal::dirs()->findAllResources("data", "desktoptheme/*/metadata.desktop",
|
||||||
|
6
theme.h
6
theme.h
@ -28,7 +28,6 @@
|
|||||||
#include <ksharedconfig.h>
|
#include <ksharedconfig.h>
|
||||||
|
|
||||||
#include <plasma/plasma_export.h>
|
#include <plasma/plasma_export.h>
|
||||||
#include <plasma/packagestructure.h>
|
|
||||||
|
|
||||||
namespace Plasma
|
namespace Plasma
|
||||||
{
|
{
|
||||||
@ -104,11 +103,6 @@ class PLASMA_EXPORT Theme : public QObject
|
|||||||
|
|
||||||
~Theme();
|
~Theme();
|
||||||
|
|
||||||
/**
|
|
||||||
* @return a package structure representing a Theme
|
|
||||||
*/
|
|
||||||
static PackageStructure::Ptr packageStructure();
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return a list of all known themes
|
* @return a list of all known themes
|
||||||
* @since 4.3
|
* @since 4.3
|
||||||
|
Loading…
Reference in New Issue
Block a user