diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:18:35 -0600 |
| commit | 07551885ca97d55cb9b68008dad6cf0a5163a451 (patch) | |
| tree | e8cce939676c7937804c3e6dff3289c8767d89dc | |
| parent | 8c8931bcec234ae8848f26d5847bed669229b6cf (diff) | |
| download | compizconfig-backend-tdeconfig-07551885.tar.gz compizconfig-backend-tdeconfig-07551885.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
| -rw-r--r-- | settings-backend/kconfig_backend.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/settings-backend/kconfig_backend.cpp b/settings-backend/kconfig_backend.cpp index 5bb2486..cda24ca 100644 --- a/settings-backend/kconfig_backend.cpp +++ b/settings-backend/kconfig_backend.cpp @@ -612,7 +612,7 @@ getExistingProfiles (CCSContext *) if (!instance) instance = new TDEInstance ("ccs-backend-kconfig"); - TQDir dir (KGlobal::dirs()->saveLocation ("config", TQString(), false), + TQDir dir (TDEGlobal::dirs()->saveLocation ("config", TQString(), false), "compizrc.*"); TQStringList files = dir.entryList(); @@ -1775,7 +1775,7 @@ readInit (CCSContext *c) delete cFiles->main; - TQString wFile = KGlobal::dirs()->saveLocation ("config", + TQString wFile = TDEGlobal::dirs()->saveLocation ("config", TQString(), false) + configName; createFile (wFile); @@ -1811,7 +1811,7 @@ writeInit (CCSContext *c) delete cFiles->main; - TQString wFile = KGlobal::dirs()->saveLocation ("config", + TQString wFile = TDEGlobal::dirs()->saveLocation ("config", TQString(), false) + configName; createFile (wFile); @@ -1866,7 +1866,7 @@ init (CCSContext *c) cFiles->profile = ccsGetProfile (c); } - TQString wFile = KGlobal::dirs()->saveLocation ("config", + TQString wFile = TDEGlobal::dirs()->saveLocation ("config", TQString(), false) + configName; createFile (wFile); @@ -1880,11 +1880,11 @@ init (CCSContext *c) cFiles->watch = ccsAddFileWatch (wFile.ascii(), TRUE, reload, (void *) c); - wFile = KGlobal::dirs()->saveLocation ("config", + wFile = TDEGlobal::dirs()->saveLocation ("config", TQString(), false) + "twinrc"; cFiles->twinWatch = ccsAddFileWatch (wFile.ascii(), TRUE, reload, (void *) c); - wFile = KGlobal::dirs()->saveLocation ("config", + wFile = TDEGlobal::dirs()->saveLocation ("config", TQString(), false) + "kdeglobals"; cFiles->globalWatch = ccsAddFileWatch (wFile.ascii(), TRUE, reload, (void *) c); @@ -1922,7 +1922,7 @@ static Bool deleteProfile (CCSContext *, char *profile) { - TQString file (KGlobal::dirs()->saveLocation ("config", + TQString file (TDEGlobal::dirs()->saveLocation ("config", TQString(), false) ); file += "compizrc"; |