Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent c2ed9454c6
commit 6961dec4dd

@ -52,7 +52,7 @@ extern "C"
#define CompNumLockMask (1 << 21) #define CompNumLockMask (1 << 21)
#define CompScrollLockMask (1 << 22) #define CompScrollLockMask (1 << 22)
static KInstance *instance = NULL; static TDEInstance *instance = NULL;
typedef struct _ConfigFiles typedef struct _ConfigFiles
{ {
@ -610,7 +610,7 @@ static CCSStringList
getExistingProfiles (CCSContext *) getExistingProfiles (CCSContext *)
{ {
if (!instance) if (!instance)
instance = new KInstance ("ccs-backend-kconfig"); instance = new TDEInstance ("ccs-backend-kconfig");
TQDir dir (KGlobal::dirs()->saveLocation ("config", TQString(), false), TQDir dir (KGlobal::dirs()->saveLocation ("config", TQString(), false),
"compizrc.*"); "compizrc.*");
@ -1760,7 +1760,7 @@ static Bool
readInit (CCSContext *c) readInit (CCSContext *c)
{ {
if (!instance) if (!instance)
instance = new KInstance ("ccs-backend-kconfig"); instance = new TDEInstance ("ccs-backend-kconfig");
if (cFiles->profile != ccsGetProfile (c) ) if (cFiles->profile != ccsGetProfile (c) )
{ {
@ -1796,7 +1796,7 @@ static Bool
writeInit (CCSContext *c) writeInit (CCSContext *c)
{ {
if (!instance) if (!instance)
instance = new KInstance ("ccs-backend-kconfig"); instance = new TDEInstance ("ccs-backend-kconfig");
if (cFiles->profile != ccsGetProfile (c) ) if (cFiles->profile != ccsGetProfile (c) )
{ {
@ -1853,7 +1853,7 @@ static Bool
init (CCSContext *c) init (CCSContext *c)
{ {
if (!instance) if (!instance)
instance = new KInstance ("ccs-backend-kconfig"); instance = new TDEInstance ("ccs-backend-kconfig");
cFiles = new ConfigFiles; cFiles = new ConfigFiles;

Loading…
Cancel
Save