From 75ccb1b463c549d337c3e3c9f1dca764e4cc0303 Mon Sep 17 00:00:00 2001 From: Albert Astals Cid Date: Thu, 19 Jul 2012 21:16:59 +0200 Subject: [PATCH] More K_GLOBAL_STATIC -> Q_GLOBAL_STATIC porting Acked by dfaure REVIEW: 105611 --- dataenginemanager.cpp | 4 ++-- private/associatedapplicationmanager.cpp | 4 ++-- private/componentinstaller.cpp | 6 ++---- private/storagethread.cpp | 4 ++-- private/windowshadows.cpp | 6 ++---- remote/accessmanager.cpp | 4 ++-- remote/authorizationmanager.cpp | 4 ++-- theme.cpp | 4 ++-- tooltipmanager.cpp | 4 ++-- 9 files changed, 18 insertions(+), 22 deletions(-) diff --git a/dataenginemanager.cpp b/dataenginemanager.cpp index 4a37375cc..cfb1b304c 100644 --- a/dataenginemanager.cpp +++ b/dataenginemanager.cpp @@ -87,11 +87,11 @@ class DataEngineManagerSingleton DataEngineManager self; }; -K_GLOBAL_STATIC(DataEngineManagerSingleton, privateDataEngineManagerSelf) +Q_GLOBAL_STATIC(DataEngineManagerSingleton, privateDataEngineManagerSelf) DataEngineManager *DataEngineManager::self() { - return &privateDataEngineManagerSelf->self; + return &privateDataEngineManagerSelf()->self; } DataEngineManager::DataEngineManager() diff --git a/private/associatedapplicationmanager.cpp b/private/associatedapplicationmanager.cpp index 8074a17f0..cae30da79 100644 --- a/private/associatedapplicationmanager.cpp +++ b/private/associatedapplicationmanager.cpp @@ -67,7 +67,7 @@ class AssociatedApplicationManagerSingleton AssociatedApplicationManager self; }; -K_GLOBAL_STATIC(AssociatedApplicationManagerSingleton, privateAssociatedApplicationManagerSelf) +Q_GLOBAL_STATIC(AssociatedApplicationManagerSingleton, privateAssociatedApplicationManagerSelf) AssociatedApplicationManager::AssociatedApplicationManager(QObject *parent) @@ -83,7 +83,7 @@ AssociatedApplicationManager::~AssociatedApplicationManager() AssociatedApplicationManager *AssociatedApplicationManager::self() { - return &privateAssociatedApplicationManagerSelf->self; + return &privateAssociatedApplicationManagerSelf()->self; } void AssociatedApplicationManager::setApplication(Plasma::Applet *applet, const QString &application) diff --git a/private/componentinstaller.cpp b/private/componentinstaller.cpp index 870667f1f..4f70baa9c 100644 --- a/private/componentinstaller.cpp +++ b/private/componentinstaller.cpp @@ -19,8 +19,6 @@ #include "private/componentinstaller_p.h" -#include - #ifdef PLASMA_ENABLE_PACKAGEKIT_SUPPORT #include #include @@ -47,11 +45,11 @@ class ComponentInstallerSingleton ComponentInstaller self; }; -K_GLOBAL_STATIC(ComponentInstallerSingleton, privateComponentInstallerSelf) +Q_GLOBAL_STATIC(ComponentInstallerSingleton, privateComponentInstallerSelf) ComponentInstaller *ComponentInstaller::self() { - return &privateComponentInstallerSelf->self; + return &privateComponentInstallerSelf()->self; } ComponentInstaller::ComponentInstaller() diff --git a/private/storagethread.cpp b/private/storagethread.cpp index cfb35514b..85d433e80 100644 --- a/private/storagethread.cpp +++ b/private/storagethread.cpp @@ -43,7 +43,7 @@ public: StorageThread self; }; -K_GLOBAL_STATIC(StorageThreadSingleton, privateStorageThreadSelf) +Q_GLOBAL_STATIC(StorageThreadSingleton, privateStorageThreadSelf) StorageThread::StorageThread(QObject *parent) @@ -61,7 +61,7 @@ StorageThread::~StorageThread() Plasma::StorageThread *StorageThread::self() { - return &privateStorageThreadSelf->self; + return &privateStorageThreadSelf()->self; } void StorageThread::initializeDb(StorageJob *caller) diff --git a/private/windowshadows.cpp b/private/windowshadows.cpp index 0bb0bd405..99d8e8cbe 100644 --- a/private/windowshadows.cpp +++ b/private/windowshadows.cpp @@ -28,8 +28,6 @@ #include #endif -#include - namespace Plasma { @@ -67,11 +65,11 @@ class WindowShadowsSingleton WindowShadows self; }; -K_GLOBAL_STATIC(WindowShadowsSingleton, privateWindowShadowsSelf) +Q_GLOBAL_STATIC(WindowShadowsSingleton, privateWindowShadowsSelf) WindowShadows *WindowShadows::self() { - return &privateWindowShadowsSelf->self; + return &privateWindowShadowsSelf()->self; } WindowShadows::WindowShadows(QObject *parent) diff --git a/remote/accessmanager.cpp b/remote/accessmanager.cpp index 06e3a37d1..b650e8700 100644 --- a/remote/accessmanager.cpp +++ b/remote/accessmanager.cpp @@ -117,11 +117,11 @@ class AccessManagerSingleton AccessManager self; }; -K_GLOBAL_STATIC(AccessManagerSingleton, privateAccessManagerSelf) +Q_GLOBAL_STATIC(AccessManagerSingleton, privateAccessManagerSelf) AccessManager *AccessManager::self() { - return &privateAccessManagerSelf->self; + return &privateAccessManagerSelf()->self; } AccessManager::AccessManager() diff --git a/remote/authorizationmanager.cpp b/remote/authorizationmanager.cpp index 4f71666fd..775884a13 100644 --- a/remote/authorizationmanager.cpp +++ b/remote/authorizationmanager.cpp @@ -60,11 +60,11 @@ class AuthorizationManagerSingleton AuthorizationManager self; }; -K_GLOBAL_STATIC(AuthorizationManagerSingleton, privateAuthorizationManagerSelf) +Q_GLOBAL_STATIC(AuthorizationManagerSingleton, privateAuthorizationManagerSelf) AuthorizationManager *AuthorizationManager::self() { - return &privateAuthorizationManagerSelf->self; + return &privateAuthorizationManagerSelf()->self; } AuthorizationManager::AuthorizationManager() diff --git a/theme.cpp b/theme.cpp index 25a01701d..92eec2910 100644 --- a/theme.cpp +++ b/theme.cpp @@ -460,11 +460,11 @@ public: Theme self; }; -K_GLOBAL_STATIC(ThemeSingleton, privateThemeSelf) +Q_GLOBAL_STATIC(ThemeSingleton, privateThemeSelf) Theme *Theme::defaultTheme() { - return &privateThemeSelf->self; + return &privateThemeSelf()->self; } Theme::Theme(QObject *parent) diff --git a/tooltipmanager.cpp b/tooltipmanager.cpp index f7725e9b1..f6acf5c56 100644 --- a/tooltipmanager.cpp +++ b/tooltipmanager.cpp @@ -110,11 +110,11 @@ class ToolTipManagerSingleton } ToolTipManager self; }; -K_GLOBAL_STATIC(ToolTipManagerSingleton, privateInstance) +Q_GLOBAL_STATIC(ToolTipManagerSingleton, privateInstance) ToolTipManager *ToolTipManager::self() { - return &privateInstance->self; + return &privateInstance()->self; } ToolTipManager::ToolTipManager(QObject *parent)