From 38332b217c020960b6aedc1cdfc5f920ebcc49dc Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:20:06 -0600 Subject: [PATCH] Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- src/autostart.cpp | 4 ++-- src/autostart.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/autostart.cpp b/src/autostart.cpp index 508bc60..4895295 100644 --- a/src/autostart.cpp +++ b/src/autostart.cpp @@ -81,7 +81,7 @@ void setStartOn(int start) { iStartOn = start; setText(2, fStartOn() ); KStandardDirs *ksd = new KStandardDirs(); - KGlobalSettings * kgs = new KGlobalSettings(); + TDEGlobalSettings * kgs = new TDEGlobalSettings(); TQString path; switch (iStartOn) { case AutoStart: @@ -181,7 +181,7 @@ autostart::~autostart() void autostart::load() { - kgs = new KGlobalSettings(); + kgs = new TDEGlobalSettings(); kdDebug() << "According to TDE your Autostart location is: " << kgs->autostartPath() << endl; KStandardDirs *ksd = new KStandardDirs(); diff --git a/src/autostart.h b/src/autostart.h index 3b6389e..34aeec0 100644 --- a/src/autostart.h +++ b/src/autostart.h @@ -60,7 +60,7 @@ public slots: private: TDEAboutData *myAboutData; - KGlobalSettings *kgs; + TDEGlobalSettings *kgs; KPushButton* btnAdd; KListView* listCMD; KPushButton* btnRemove;