summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:20:06 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:20:06 -0600
commit38332b217c020960b6aedc1cdfc5f920ebcc49dc (patch)
tree06e6daa0ca4bb6808054da828394c1369ef20597
parent2af202f0ce33ebf688f5d86674e3f4c57e0fe90d (diff)
downloadkcmautostart-38332b217c020960b6aedc1cdfc5f920ebcc49dc.tar.gz
kcmautostart-38332b217c020960b6aedc1cdfc5f920ebcc49dc.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
-rw-r--r--src/autostart.cpp4
-rw-r--r--src/autostart.h2
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;