summaryrefslogtreecommitdiffstats
path: root/tdeinit
diff options
context:
space:
mode:
Diffstat (limited to 'tdeinit')
-rw-r--r--tdeinit/autostart.cpp2
-rw-r--r--tdeinit/setproctitle.h8
-rw-r--r--tdeinit/tdedostartupconfig.cpp2
-rw-r--r--tdeinit/tdeinit.cpp2
-rw-r--r--tdeinit/tdelauncher.cpp2
5 files changed, 4 insertions, 12 deletions
diff --git a/tdeinit/autostart.cpp b/tdeinit/autostart.cpp
index abc3c2ef3..860eff2ee 100644
--- a/tdeinit/autostart.cpp
+++ b/tdeinit/autostart.cpp
@@ -25,7 +25,7 @@
#include <tdeconfig.h>
#include <kdesktopfile.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <stdlib.h>
diff --git a/tdeinit/setproctitle.h b/tdeinit/setproctitle.h
index 7a134e73e..c50b2d97d 100644
--- a/tdeinit/setproctitle.h
+++ b/tdeinit/setproctitle.h
@@ -33,14 +33,6 @@
# define SPT_PADCHAR '\0' /* pad process title with nulls */
#endif
-#ifdef DGUX_5_4_2
-# define DGUX 1
-#endif
-
-#ifdef DGUX
-# define SPT_TYPE SPT_NONE /* don't use setproctitle */
-#endif
-
/*
** Apple Rhapsody
** Contributed by Wilfredo Sanchez <[email protected]>
diff --git a/tdeinit/tdedostartupconfig.cpp b/tdeinit/tdedostartupconfig.cpp
index 9125b6cbf..b9a0e55b6 100644
--- a/tdeinit/tdedostartupconfig.cpp
+++ b/tdeinit/tdedostartupconfig.cpp
@@ -29,7 +29,7 @@ DEALINGS IN THE SOFTWARE.
#include <tqfile.h>
#include <tqtextstream.h>
#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/tdeinit/tdeinit.cpp b/tdeinit/tdeinit.cpp
index e8c7dd2ae..debe0be12 100644
--- a/tdeinit/tdeinit.cpp
+++ b/tdeinit/tdeinit.cpp
@@ -53,7 +53,7 @@
#include <tqregexp.h>
#include <tqfont.h>
#include <kinstance.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <tdeconfig.h>
#include <klibloader.h>
diff --git a/tdeinit/tdelauncher.cpp b/tdeinit/tdelauncher.cpp
index a65493979..371f1ba7b 100644
--- a/tdeinit/tdelauncher.cpp
+++ b/tdeinit/tdelauncher.cpp
@@ -36,7 +36,7 @@
#include <tdeprotocolmanager.h>
#include <kprotocolinfo.h>
#include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdetempfile.h>
#include <kurl.h>