summaryrefslogtreecommitdiffstats
path: root/tdeioslave/man
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:55:37 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdeioslave/man
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/man')
-rw-r--r--tdeioslave/man/kmanpart.cpp4
-rw-r--r--tdeioslave/man/tdeio_man.cpp4
-rw-r--r--tdeioslave/man/tdeio_man_test.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/tdeioslave/man/kmanpart.cpp b/tdeioslave/man/kmanpart.cpp
index 09cc0251e..556b287e4 100644
--- a/tdeioslave/man/kmanpart.cpp
+++ b/tdeioslave/man/kmanpart.cpp
@@ -21,9 +21,9 @@
#include <tqstring.h>
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeaboutdata.h>
#include <tdeversion.h>
diff --git a/tdeioslave/man/tdeio_man.cpp b/tdeioslave/man/tdeio_man.cpp
index 032de3ecf..7412077c5 100644
--- a/tdeioslave/man/tdeio_man.cpp
+++ b/tdeioslave/man/tdeio_man.cpp
@@ -33,10 +33,10 @@
#include <kdebug.h>
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kprocess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmimetype.h>
#include "tdeio_man.h"
diff --git a/tdeioslave/man/tdeio_man_test.cpp b/tdeioslave/man/tdeio_man_test.cpp
index d409570b4..131e03541 100644
--- a/tdeioslave/man/tdeio_man_test.cpp
+++ b/tdeioslave/man/tdeio_man_test.cpp
@@ -6,7 +6,7 @@
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
class tdeio_man_test : public MANProtocol