diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:05:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:05:35 -0600 |
| commit | 699807d7eb969f1340d3ecd659ea93ebf4400feb (patch) | |
| tree | 973d926d037c23c6dfb05ed5db3b5d35dd8bda43 /settings-backend | |
| parent | 07551885ca97d55cb9b68008dad6cf0a5163a451 (diff) | |
| download | compizconfig-backend-tdeconfig-699807d7eb969f1340d3ecd659ea93ebf4400feb.tar.gz compizconfig-backend-tdeconfig-699807d7eb969f1340d3ecd659ea93ebf4400feb.zip | |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'settings-backend')
| -rw-r--r-- | settings-backend/kconfig_backend.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/settings-backend/kconfig_backend.cpp b/settings-backend/kconfig_backend.cpp index cda24ca..d6b1c8c 100644 --- a/settings-backend/kconfig_backend.cpp +++ b/settings-backend/kconfig_backend.cpp @@ -58,8 +58,8 @@ typedef struct _ConfigFiles { KSimpleConfig *main; TQString profile; - KConfig *twin; - KConfig *global; + TDEConfig *twin; + TDEConfig *global; Bool modified; unsigned int watch; unsigned int twinWatch; @@ -245,7 +245,7 @@ static void KdeIntToCCS (CCSSetting *setting, int num) { - KConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; + TDEConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; int val = cfg->readNumEntry (specialOptions[num].kdeName); @@ -256,7 +256,7 @@ static void KdeBoolToCCS (CCSSetting *setting, int num) { - KConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; + TDEConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; Bool val = (cfg->readBoolEntry (specialOptions[num].kdeName))? TRUE : FALSE; @@ -267,7 +267,7 @@ static void KdeKeyToCCS (CCSSetting *setting, int num) { - KConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; + TDEConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; KKey key (cfg->readEntry (specialOptions[num].kdeName) ); @@ -1041,7 +1041,7 @@ static void CCSIntToKde (CCSSetting *setting, int num) { - KConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; + TDEConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; int val; @@ -1059,7 +1059,7 @@ static void CCSBoolToKde (CCSSetting *setting, int num) { - KConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; + TDEConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; Bool val; @@ -1077,7 +1077,7 @@ static void CCSKeyToKde (CCSSetting *setting, int num) { - KConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; + TDEConfig *cfg = (specialOptions[num].global) ? cFiles->global : cFiles->twin; CCSSettingKeyValue keyVal; @@ -1872,8 +1872,8 @@ init (CCSContext *c) createFile (wFile); cFiles->main = new KSimpleConfig (configName); - cFiles->twin = new KConfig ("twinrc"); - cFiles->global = new KConfig ("kdeglobals"); + cFiles->twin = new TDEConfig ("twinrc"); + cFiles->global = new TDEConfig ("kdeglobals"); cFiles->twin->setGroup ("Windows"); cFiles->global->setGroup ("Global Shortcuts"); |