summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:45:36 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:45:36 -0600
commita57b88b39fa31cfdc7bda159ad36fcc02ae33586 (patch)
tree79fc78a2eeea9372c606e9b056d6c90000d16487 /src
parent952b00e86716aaa96c6b7d13d8c291d0d1c00880 (diff)
downloadkcmautostart-a57b88b39fa31cfdc7bda159ad36fcc02ae33586.tar.gz
kcmautostart-a57b88b39fa31cfdc7bda159ad36fcc02ae33586.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src')
-rw-r--r--src/autostart.cpp6
-rw-r--r--src/autostart.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/autostart.cpp b/src/autostart.cpp
index 5bd6eae..64473c8 100644
--- a/src/autostart.cpp
+++ b/src/autostart.cpp
@@ -22,11 +22,11 @@
#include <tqlayout.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeparts/genericfactory.h>
#include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
#include <tdelistview.h>
diff --git a/src/autostart.h b/src/autostart.h
index d163ae2..78122d5 100644
--- a/src/autostart.h
+++ b/src/autostart.h
@@ -29,7 +29,7 @@
#include <kpushbutton.h>
#include <tdelistview.h>
#include <tdefileitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>