diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:50:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 19:50:43 -0600 |
| commit | 6961dec4dd424ccda811909c0f366a9cce3199b4 (patch) | |
| tree | 4967517092a5f55890dbb2ed9b3e4772f65e9206 /settings-backend | |
| parent | c2ed9454c6e247970c71790ff6d7ec870f94b3be (diff) | |
| download | compizconfig-backend-tdeconfig-6961dec4dd424ccda811909c0f366a9cce3199b4.tar.gz compizconfig-backend-tdeconfig-6961dec4dd424ccda811909c0f366a9cce3199b4.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'settings-backend')
| -rw-r--r-- | settings-backend/kconfig_backend.cpp | 10 |
1 files 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; |