summaryrefslogtreecommitdiffstats
path: root/tdeioslave/trash
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdeioslave/trash
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/trash')
-rw-r--r--tdeioslave/trash/ktrash.cpp2
-rw-r--r--tdeioslave/trash/tdeio_trash.cpp2
-rw-r--r--tdeioslave/trash/testtrash.cpp2
-rw-r--r--tdeioslave/trash/trashimpl.cpp6
4 files changed, 6 insertions, 6 deletions
diff --git a/tdeioslave/trash/ktrash.cpp b/tdeioslave/trash/ktrash.cpp
index c355a2fa8..162d27876 100644
--- a/tdeioslave/trash/ktrash.cpp
+++ b/tdeioslave/trash/ktrash.cpp
@@ -21,7 +21,7 @@
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdirnotify_stub.h>
#include <kdebug.h>
diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp
index 1b29aa5b5..02cda02dd 100644
--- a/tdeioslave/trash/tdeio_trash.cpp
+++ b/tdeioslave/trash/tdeio_trash.cpp
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klargefile.h>
#include <tdecmdlineargs.h>
#include <kmimetype.h>
diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp
index c2b6283bc..db2e73fb3 100644
--- a/tdeioslave/trash/testtrash.cpp
+++ b/tdeioslave/trash/testtrash.cpp
@@ -27,7 +27,7 @@
#include <config.h>
#include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index d49123572..cf37b8b94 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -18,7 +18,7 @@
*/
#include "trashimpl.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <klargefile.h>
#include <tdeio/global.h>
#include <tdeio/renamedlg.h>
@@ -26,9 +26,9 @@
#include <kdebug.h>
#include <kurl.h>
#include <kdirnotify_stub.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kmountpoint.h>
#include <tdefileitem.h>
#include <tdeio/chmodjob.h>