Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 8c8931bcec
commit 07551885ca

@ -612,7 +612,7 @@ getExistingProfiles (CCSContext *)
if (!instance) if (!instance)
instance = new TDEInstance ("ccs-backend-kconfig"); instance = new TDEInstance ("ccs-backend-kconfig");
TQDir dir (KGlobal::dirs()->saveLocation ("config", TQString(), false), TQDir dir (TDEGlobal::dirs()->saveLocation ("config", TQString(), false),
"compizrc.*"); "compizrc.*");
TQStringList files = dir.entryList(); TQStringList files = dir.entryList();
@ -1775,7 +1775,7 @@ readInit (CCSContext *c)
delete cFiles->main; delete cFiles->main;
TQString wFile = KGlobal::dirs()->saveLocation ("config", TQString wFile = TDEGlobal::dirs()->saveLocation ("config",
TQString(), false) + configName; TQString(), false) + configName;
createFile (wFile); createFile (wFile);
@ -1811,7 +1811,7 @@ writeInit (CCSContext *c)
delete cFiles->main; delete cFiles->main;
TQString wFile = KGlobal::dirs()->saveLocation ("config", TQString wFile = TDEGlobal::dirs()->saveLocation ("config",
TQString(), false) + configName; TQString(), false) + configName;
createFile (wFile); createFile (wFile);
@ -1866,7 +1866,7 @@ init (CCSContext *c)
cFiles->profile = ccsGetProfile (c); cFiles->profile = ccsGetProfile (c);
} }
TQString wFile = KGlobal::dirs()->saveLocation ("config", TQString wFile = TDEGlobal::dirs()->saveLocation ("config",
TQString(), false) + configName; TQString(), false) + configName;
createFile (wFile); createFile (wFile);
@ -1880,11 +1880,11 @@ init (CCSContext *c)
cFiles->watch = ccsAddFileWatch (wFile.ascii(), TRUE, reload, (void *) c); cFiles->watch = ccsAddFileWatch (wFile.ascii(), TRUE, reload, (void *) c);
wFile = KGlobal::dirs()->saveLocation ("config", wFile = TDEGlobal::dirs()->saveLocation ("config",
TQString(), false) + "twinrc"; TQString(), false) + "twinrc";
cFiles->twinWatch = ccsAddFileWatch (wFile.ascii(), TRUE, reload, cFiles->twinWatch = ccsAddFileWatch (wFile.ascii(), TRUE, reload,
(void *) c); (void *) c);
wFile = KGlobal::dirs()->saveLocation ("config", wFile = TDEGlobal::dirs()->saveLocation ("config",
TQString(), false) + "kdeglobals"; TQString(), false) + "kdeglobals";
cFiles->globalWatch = ccsAddFileWatch (wFile.ascii(), TRUE, reload, cFiles->globalWatch = ccsAddFileWatch (wFile.ascii(), TRUE, reload,
(void *) c); (void *) c);
@ -1922,7 +1922,7 @@ static Bool
deleteProfile (CCSContext *, deleteProfile (CCSContext *,
char *profile) char *profile)
{ {
TQString file (KGlobal::dirs()->saveLocation ("config", TQString file (TDEGlobal::dirs()->saveLocation ("config",
TQString(), false) ); TQString(), false) );
file += "compizrc"; file += "compizrc";

Loading…
Cancel
Save