From 6961dec4dd424ccda811909c0f366a9cce3199b4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 19:50:43 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- settings-backend/kconfig_backend.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/settings-backend/kconfig_backend.cpp b/settings-backend/kconfig_backend.cpp index a60ca15..5bb2486 100644 --- a/settings-backend/kconfig_backend.cpp +++ b/settings-backend/kconfig_backend.cpp @@ -52,7 +52,7 @@ extern "C" #define CompNumLockMask (1 << 21) #define CompScrollLockMask (1 << 22) -static KInstance *instance = NULL; +static TDEInstance *instance = NULL; typedef struct _ConfigFiles { @@ -610,7 +610,7 @@ static CCSStringList getExistingProfiles (CCSContext *) { if (!instance) - instance = new KInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-kconfig"); TQDir dir (KGlobal::dirs()->saveLocation ("config", TQString(), false), "compizrc.*"); @@ -1760,7 +1760,7 @@ static Bool readInit (CCSContext *c) { if (!instance) - instance = new KInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-kconfig"); if (cFiles->profile != ccsGetProfile (c) ) { @@ -1796,7 +1796,7 @@ static Bool writeInit (CCSContext *c) { if (!instance) - instance = new KInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-kconfig"); if (cFiles->profile != ccsGetProfile (c) ) { @@ -1853,7 +1853,7 @@ static Bool init (CCSContext *c) { if (!instance) - instance = new KInstance ("ccs-backend-kconfig"); + instance = new TDEInstance ("ccs-backend-kconfig"); cFiles = new ConfigFiles; -- cgit v1.2.1