From ed99a30644c19b0a3cf0d2147243532df4daa16b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:57:54 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdeio/tdefile/CMakeLists.txt                  |  4 ++--
 tdeio/tdefile/ChangeLog                       | 14 +++++++-------
 tdeio/tdefile/Makefile.am                     |  4 ++--
 tdeio/tdefile/kacleditwidget.cpp              |  2 +-
 tdeio/tdefile/kcombiview.cpp                  |  2 +-
 tdeio/tdefile/kcombiview.h                    |  2 +-
 tdeio/tdefile/kcustommenueditor.cpp           |  4 ++--
 tdeio/tdefile/kdiroperator.cpp                |  8 ++++----
 tdeio/tdefile/kdirselectdialog.cpp            |  6 +++---
 tdeio/tdefile/kdirsize.cpp                    |  2 +-
 tdeio/tdefile/kencodingfiledialog.cpp         |  6 +++---
 tdeio/tdefile/kicondialog.cpp                 |  4 ++--
 tdeio/tdefile/kimagefilepreview.cpp           |  4 ++--
 tdeio/tdefile/kmetaprops.cpp                  |  6 +++---
 tdeio/tdefile/knotifydialog.cpp               |  4 ++--
 tdeio/tdefile/knotifydialog.h                 |  2 +-
 tdeio/tdefile/kopenwith.cpp                   |  4 ++--
 tdeio/tdefile/kpreviewprops.cpp               |  4 ++--
 tdeio/tdefile/kpropertiesdialog.cpp           |  8 ++++----
 tdeio/tdefile/kurlbar.cpp                     |  4 ++--
 tdeio/tdefile/kurlcombobox.cpp                |  4 ++--
 tdeio/tdefile/kurlrequester.cpp               |  4 ++--
 tdeio/tdefile/kurlrequesterdlg.cpp            |  4 ++--
 tdeio/tdefile/tdefiledetailview.cpp           |  6 +++---
 tdeio/tdefile/tdefiledialog.cpp               | 10 +++++-----
 tdeio/tdefile/tdefilefiltercombo.cpp          |  2 +-
 tdeio/tdefile/tdefileiconview.cpp             |  4 ++--
 tdeio/tdefile/tdefilemetainfowidget.cpp       |  2 +-
 tdeio/tdefile/tdefilepreview.cpp              |  2 +-
 tdeio/tdefile/tdefilesharedlg.cpp             |  6 +++---
 tdeio/tdefile/tdefilespeedbar.cpp             |  6 +++---
 tdeio/tdefile/tdefiletreeview.cpp             |  2 +-
 tdeio/tdefile/tdefileview.cpp                 |  4 ++--
 tdeio/tdefile/tderecentdirs.cpp               |  2 +-
 tdeio/tdefile/tests/kcustommenueditortest.cpp |  2 +-
 tdeio/tdefile/tests/kdirselectdialogtest.cpp  |  2 +-
 tdeio/tdefile/tests/kfdtest.cpp               |  2 +-
 tdeio/tdefile/tests/kfstest.cpp               |  4 ++--
 tdeio/tdefile/tests/tdefiletreeviewtest.cpp   |  2 +-
 39 files changed, 82 insertions(+), 82 deletions(-)

(limited to 'tdeio/tdefile')

diff --git a/tdeio/tdefile/CMakeLists.txt b/tdeio/tdefile/CMakeLists.txt
index a69cad536..ed0350999 100644
--- a/tdeio/tdefile/CMakeLists.txt
+++ b/tdeio/tdefile/CMakeLists.txt
@@ -31,7 +31,7 @@ include_directories(
 
 install( FILES
     tdefiledialog.h kencodingfiledialog.h
-    kdiroperator.h tdefileview.h tdefilefiltercombo.h
+    tdediroperator.h tdefileview.h tdefilefiltercombo.h
     tdefiledetailview.h kcombiview.h kdiskfreesp.h
     tdefileiconview.h tderecentdocument.h
     kurlrequester.h tdefilepreview.h tdefile.h
@@ -56,7 +56,7 @@ set( target tdefile )
 
 set( ${target}_SRCS
   tdefilefiltercombo.cpp tdefileview.cpp tdefileiconview.cpp
-  tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp
+  tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp
   tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp
   tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp
   kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp
diff --git a/tdeio/tdefile/ChangeLog b/tdeio/tdefile/ChangeLog
index ccfb45ab5..229f9f2f8 100644
--- a/tdeio/tdefile/ChangeLog
+++ b/tdeio/tdefile/ChangeLog
@@ -1,6 +1,6 @@
 Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp:
+	* tdediroperator.cpp:
 	lottsa changes, e.g. action handling more clear now.
 	fixed completed item not clearning the previous selection
 
@@ -17,7 +17,7 @@ Sat Feb 26 00:26:55 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Sun Feb 20 01:50:44 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.*, tdefiledialog.* (saveConfig): 
+	* tdediroperator.*, tdefiledialog.* (saveConfig): 
 	implemented loading, saving and applying configuration
 
 	* tdefiledialog.cpp (setURL): 
@@ -37,7 +37,7 @@ Thu Feb 17 19:09:54 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	Added KDirComboBox and replaced the directory combobox with it. It
 	even does something now :) Items need to be indented tho.
 
-	* tdefilereader.cpp, kdiroperator.{cpp,h}: 
+	* tdefilereader.cpp, tdediroperator.{cpp,h}: 
 	fixed showHidden default
 
 Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
@@ -60,7 +60,7 @@ Tue Feb 15 14:21:41 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	added static methods for multiselection
 	added getOpenURL(), getOpenURLs and getSaveURL()
 	
-	* kdiroperator.cpp (setSorting): 
+	* tdediroperator.cpp (setSorting): 
 	added setSorting() and sorting() to keep sorting when switching views
 	a few cosmetic and TDEAction changes
 
@@ -86,7 +86,7 @@ Fri Feb 11 12:17:59 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp (connectView): 
+	* tdediroperator.cpp (connectView): 
 	- Now that TDEToggleAction is fixed, I can commit the new stuff:
 	  Offer Actions for all the common functionality, i.e. sorting, setting
 	  the view, home(), cdUp(), back, forward, etc.
@@ -107,7 +107,7 @@ Thu Feb 10 17:06:36 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 Thu Feb 10 12:59:29 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* kdiroperator.cpp (insertNewFiles): 
+	* tdediroperator.cpp (insertNewFiles): 
 	aahhh, finally fixed that infinite loop in KFileView::mergeLists
 	clear the view before calling view->addItemList( currentContents );
 
@@ -173,7 +173,7 @@ Sat Jan 29 15:33:37 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* tdefileviewitem.cpp:
 	- added time_t mTime() to enable sorting by modification time
 	
-	* kdiroperator.cpp:
+	* tdediroperator.cpp:
 	- offer sorting options in popupmenu
 	- use checkAccess before creating directories. I guess this will again
 	  change when the new kio will be used, tho. 
diff --git a/tdeio/tdefile/Makefile.am b/tdeio/tdefile/Makefile.am
index 4e6b76ce1..857e843c5 100644
--- a/tdeio/tdefile/Makefile.am
+++ b/tdeio/tdefile/Makefile.am
@@ -27,7 +27,7 @@ METASOURCES = AUTO
 #SUBDIRS = . acl_prop_page
 
 include_HEADERS = tdefiledialog.h kencodingfiledialog.h\
-	kdiroperator.h tdefileview.h tdefilefiltercombo.h \
+	tdediroperator.h tdefileview.h tdefilefiltercombo.h \
 	tdefiledetailview.h kcombiview.h kdiskfreesp.h \
 	tdefileiconview.h tderecentdocument.h \
 	kurlrequester.h tdefilepreview.h tdefile.h \
@@ -44,7 +44,7 @@ noinst_HEADERS = config-tdefile.h tderecentdirs.h kmetaprops.h \
 libtdefile_la_SOURCES = \
 	tdefilefiltercombo.cpp \
 	tdefileview.cpp tdefileiconview.cpp \
-	tderecentdocument.cpp tdefiledialog.cpp kdiroperator.cpp \
+	tderecentdocument.cpp tdefiledialog.cpp tdediroperator.cpp \
 	tdefiledetailview.cpp kcombiview.cpp kurlrequester.cpp \
 	tdefilepreview.cpp kurlcombobox.cpp kurlrequesterdlg.cpp \
 	kopenwith.cpp kpropertiesdialog.cpp kicondialog.cpp kdirsize.cpp \
diff --git a/tdeio/tdefile/kacleditwidget.cpp b/tdeio/tdefile/kacleditwidget.cpp
index 01eb8bcb8..7e8e3dae2 100644
--- a/tdeio/tdefile/kacleditwidget.cpp
+++ b/tdeio/tdefile/kacleditwidget.cpp
@@ -38,7 +38,7 @@
 #include <tqwidgetstack.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <kdebug.h>
 #include <kdialog.h>
diff --git a/tdeio/tdefile/kcombiview.cpp b/tdeio/tdefile/kcombiview.cpp
index 13830ab01..4c4f0cb06 100644
--- a/tdeio/tdefile/kcombiview.cpp
+++ b/tdeio/tdefile/kcombiview.cpp
@@ -35,7 +35,7 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqvaluelist.h>
 
diff --git a/tdeio/tdefile/kcombiview.h b/tdeio/tdefile/kcombiview.h
index 995b80ffc..af3680571 100644
--- a/tdeio/tdefile/kcombiview.h
+++ b/tdeio/tdefile/kcombiview.h
@@ -23,7 +23,7 @@
 #define _KCOMBIVIEW_H
 
 #include <tqsplitter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tdefile.h>
 #include <tdefileview.h>
diff --git a/tdeio/tdefile/kcustommenueditor.cpp b/tdeio/tdefile/kcustommenueditor.cpp
index 65455aef0..b59108071 100644
--- a/tdeio/tdefile/kcustommenueditor.cpp
+++ b/tdeio/tdefile/kcustommenueditor.cpp
@@ -24,8 +24,8 @@
 #include <tqdir.h>
 
 #include <kbuttonbox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
 #include <kservice.h>
diff --git a/tdeio/tdefile/kdiroperator.cpp b/tdeio/tdefile/kdiroperator.cpp
index 1ae03daec..dc44aa8ba 100644
--- a/tdeio/tdefile/kdiroperator.cpp
+++ b/tdeio/tdefile/kdiroperator.cpp
@@ -38,8 +38,8 @@
 #include <kdialogbase.h>
 #include <kdirlister.h>
 #include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprogress.h>
 #include <kstdaction.h>
@@ -55,7 +55,7 @@
 
 #include "config-tdefile.h"
 #include "kcombiview.h"
-#include "kdiroperator.h"
+#include "tdediroperator.h"
 #include "tdefiledetailview.h"
 #include "tdefileiconview.h"
 #include "tdefilepreview.h"
@@ -1737,4 +1737,4 @@ TQString KDirOperator::viewConfigGroup() const
 void KDirOperator::virtual_hook( int, void* )
 { /*BASE::virtual_hook( id, data );*/ }
 
-#include "kdiroperator.moc"
+#include "tdediroperator.moc"
diff --git a/tdeio/tdefile/kdirselectdialog.cpp b/tdeio/tdefile/kdirselectdialog.cpp
index 39959229d..5027f631c 100644
--- a/tdeio/tdefile/kdirselectdialog.cpp
+++ b/tdeio/tdefile/kdirselectdialog.cpp
@@ -29,9 +29,9 @@
 #include <tdeconfig.h>
 #include <tdefiledialog.h>
 #include <tdefilespeedbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <tderecentdirs.h>
 #include <kshell.h>
@@ -41,7 +41,7 @@
 #include <kinputdialog.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/renamedlg.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "tdefiletreeview.h"
 #include "kdirselectdialog.h"
diff --git a/tdeio/tdefile/kdirsize.cpp b/tdeio/tdefile/kdirsize.cpp
index c2ea4079a..b2d48b4bf 100644
--- a/tdeio/tdefile/kdirsize.cpp
+++ b/tdeio/tdefile/kdirsize.cpp
@@ -19,7 +19,7 @@
 
 #include "kdirsize.h"
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqapplication.h>
 #include <tqtimer.h>
 #include <config-tdefile.h>
diff --git a/tdeio/tdefile/kencodingfiledialog.cpp b/tdeio/tdefile/kencodingfiledialog.cpp
index a49210642..d2d588a4e 100644
--- a/tdeio/tdefile/kencodingfiledialog.cpp
+++ b/tdeio/tdefile/kencodingfiledialog.cpp
@@ -24,11 +24,11 @@
 #include "kencodingfiledialog.h"
 #include <kcombobox.h>
 #include <tdetoolbar.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <tqtextcodec.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tderecentdocument.h>
 
 struct KEncodingFileDialogPrivate
diff --git a/tdeio/tdefile/kicondialog.cpp b/tdeio/tdefile/kicondialog.cpp
index 9d7975e2b..154f9e89d 100644
--- a/tdeio/tdefile/kicondialog.cpp
+++ b/tdeio/tdefile/kicondialog.cpp
@@ -20,8 +20,8 @@
 #include <kiconviewsearchline.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <kprogress.h>
diff --git a/tdeio/tdefile/kimagefilepreview.cpp b/tdeio/tdefile/kimagefilepreview.cpp
index a1ce7d6b3..f96be72fc 100644
--- a/tdeio/tdefile/kimagefilepreview.cpp
+++ b/tdeio/tdefile/kimagefilepreview.cpp
@@ -16,12 +16,12 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <tdefileitem.h>
 #include <tdeio/previewjob.h>
diff --git a/tdeio/tdefile/kmetaprops.cpp b/tdeio/tdefile/kmetaprops.cpp
index ce6201177..21c75e0ce 100644
--- a/tdeio/tdefile/kmetaprops.cpp
+++ b/tdeio/tdefile/kmetaprops.cpp
@@ -23,9 +23,9 @@
 #include <kdebug.h>
 #include <tdefilemetainfowidget.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 
 #include <tqvalidator.h>
diff --git a/tdeio/tdefile/knotifydialog.cpp b/tdeio/tdefile/knotifydialog.cpp
index f23ac78e4..8397a5e74 100644
--- a/tdeio/tdefile/knotifydialog.cpp
+++ b/tdeio/tdefile/knotifydialog.cpp
@@ -29,8 +29,8 @@
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kstandarddirs.h>
diff --git a/tdeio/tdefile/knotifydialog.h b/tdeio/tdefile/knotifydialog.h
index f31815e34..c8b5b21ac 100644
--- a/tdeio/tdefile/knotifydialog.h
+++ b/tdeio/tdefile/knotifydialog.h
@@ -22,7 +22,7 @@
 #include <tdelistview.h>
 #include <kdialogbase.h>
 #include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "knotifywidgetbase.h"
 
diff --git a/tdeio/tdefile/kopenwith.cpp b/tdeio/tdefile/kopenwith.cpp
index 5a855de21..5db8b79d9 100644
--- a/tdeio/tdefile/kopenwith.cpp
+++ b/tdeio/tdefile/kopenwith.cpp
@@ -39,9 +39,9 @@
 #include <kcombobox.h>
 #include <kdesktopfile.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimemagic.h>
 #include <krun.h>
diff --git a/tdeio/tdefile/kpreviewprops.cpp b/tdeio/tdefile/kpreviewprops.cpp
index a053d5627..c45330893 100644
--- a/tdeio/tdefile/kpreviewprops.cpp
+++ b/tdeio/tdefile/kpreviewprops.cpp
@@ -22,8 +22,8 @@
 #include <tqlayout.h>
 
 #include <tdefilemetapreview.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 
 class KPreviewPropsPlugin::KPreviewPropsPluginPrivate
 {
diff --git a/tdeio/tdefile/kpropertiesdialog.cpp b/tdeio/tdefile/kpropertiesdialog.cpp
index 389115a3c..87d3926b3 100644
--- a/tdeio/tdefile/kpropertiesdialog.cpp
+++ b/tdeio/tdefile/kpropertiesdialog.cpp
@@ -96,9 +96,9 @@ extern "C" {
 #include <kicondialog.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <tdeio/job.h>
 #include <tdeio/chmodjob.h>
@@ -109,7 +109,7 @@ extern "C" {
 #include <kmimetype.h>
 #include <kmountpoint.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kcompletion.h>
 #include <klineedit.h>
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp
index 46b096c2b..2aa79353f 100644
--- a/tdeio/tdefile/kurlbar.cpp
+++ b/tdeio/tdefile/kurlbar.cpp
@@ -33,12 +33,12 @@
 #include <tdeaboutdata.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kicondialog.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kprotocolinfo.h>
 #include <kstringhandler.h>
diff --git a/tdeio/tdefile/kurlcombobox.cpp b/tdeio/tdefile/kurlcombobox.cpp
index 150e64b34..66fe8efb8 100644
--- a/tdeio/tdefile/kurlcombobox.cpp
+++ b/tdeio/tdefile/kurlcombobox.cpp
@@ -20,9 +20,9 @@
 #include <tqlistbox.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 
 #include <kurlcombobox.h>
diff --git a/tdeio/tdefile/kurlrequester.cpp b/tdeio/tdefile/kurlrequester.cpp
index 9a76a69a6..7ecfd543d 100644
--- a/tdeio/tdefile/kurlrequester.cpp
+++ b/tdeio/tdefile/kurlrequester.cpp
@@ -30,10 +30,10 @@
 #include <kdialog.h>
 #include <kdirselectdialog.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcompletion.h>
 #include <kurldrag.h>
 #include <kprotocolinfo.h>
diff --git a/tdeio/tdefile/kurlrequesterdlg.cpp b/tdeio/tdefile/kurlrequesterdlg.cpp
index d1e9ec109..1a040a656 100644
--- a/tdeio/tdefile/kurlrequesterdlg.cpp
+++ b/tdeio/tdefile/kurlrequesterdlg.cpp
@@ -28,10 +28,10 @@
 
 #include <tdeaccel.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tderecentdocument.h>
 #include <kurl.h>
 #include <kurlrequester.h>
diff --git a/tdeio/tdefile/tdefiledetailview.cpp b/tdeio/tdefile/tdefiledetailview.cpp
index b3c44250e..e267bdb60 100644
--- a/tdeio/tdefile/tdefiledetailview.cpp
+++ b/tdeio/tdefile/tdefiledetailview.cpp
@@ -27,11 +27,11 @@
 
 #include <tdeapplication.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 
diff --git a/tdeio/tdefile/tdefiledialog.cpp b/tdeio/tdefile/tdefiledialog.cpp
index 8db764724..03bc17757 100644
--- a/tdeio/tdefile/tdefiledialog.cpp
+++ b/tdeio/tdefile/tdefiledialog.cpp
@@ -50,16 +50,16 @@
 #include <tdecompletionbox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/scheduler.h>
 #include <tdeio/kservicetypefactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
@@ -83,7 +83,7 @@
 #include <tdefileview.h>
 #include <tderecentdocument.h>
 #include <tdefilefiltercombo.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <kimagefilepreview.h>
 
 #include <tdefilespeedbar.h>
diff --git a/tdeio/tdefile/tdefilefiltercombo.cpp b/tdeio/tdefile/tdefilefiltercombo.cpp
index cd7bd54d3..ed41f8f82 100644
--- a/tdeio/tdefile/tdefilefiltercombo.cpp
+++ b/tdeio/tdefile/tdefilefiltercombo.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <config-tdefile.h>
diff --git a/tdeio/tdefile/tdefileiconview.cpp b/tdeio/tdefile/tdefileiconview.cpp
index 131485273..92bbeba41 100644
--- a/tdeio/tdefile/tdefileiconview.cpp
+++ b/tdeio/tdefile/tdefileiconview.cpp
@@ -31,10 +31,10 @@
 
 #include <tdeaction.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefileitem.h>
 #include <kiconeffect.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 #include <tdeio/previewjob.h>
 
diff --git a/tdeio/tdefile/tdefilemetainfowidget.cpp b/tdeio/tdefile/tdefilemetainfowidget.cpp
index dea9ea353..50fef856b 100644
--- a/tdeio/tdefile/tdefilemetainfowidget.cpp
+++ b/tdeio/tdefile/tdefilemetainfowidget.cpp
@@ -21,7 +21,7 @@
 #include "tdefilemetainfowidget.h"
 
 #include <keditcl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <klineedit.h>
diff --git a/tdeio/tdefile/tdefilepreview.cpp b/tdeio/tdefile/tdefilepreview.cpp
index 57543ea8c..acec61475 100644
--- a/tdeio/tdefile/tdefilepreview.cpp
+++ b/tdeio/tdefile/tdefilepreview.cpp
@@ -22,7 +22,7 @@
 #include <tdeaction.h>
 #include <tdefilepreview.h>
 #include <tdefilepreview.moc>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 
diff --git a/tdeio/tdefile/tdefilesharedlg.cpp b/tdeio/tdefile/tdefilesharedlg.cpp
index 6204fa6bb..a2fb01c2c 100644
--- a/tdeio/tdefile/tdefilesharedlg.cpp
+++ b/tdeio/tdefile/tdefilesharedlg.cpp
@@ -27,8 +27,8 @@
 #include <tqlineedit.h>
 #include <kprocess.h>
 #include <kprocio.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <stdio.h>
@@ -39,7 +39,7 @@
 #include <tqpushbutton.h>
 #include <tdeapplication.h>
 #include <ksimpleconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 class KFileSharePropsPlugin::Private
 {
diff --git a/tdeio/tdefile/tdefilespeedbar.cpp b/tdeio/tdefile/tdefilespeedbar.cpp
index defcb2157..6f3365a5f 100644
--- a/tdeio/tdefile/tdefilespeedbar.cpp
+++ b/tdeio/tdefile/tdefilespeedbar.cpp
@@ -25,9 +25,9 @@
 #include <tqtextstream.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/tdeio/tdefile/tdefiletreeview.cpp b/tdeio/tdefile/tdefiletreeview.cpp
index 6138b3863..cb7432423 100644
--- a/tdeio/tdefile/tdefiletreeview.cpp
+++ b/tdeio/tdefile/tdefiletreeview.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 #include <kdebug.h>
 #include <kdirnotify_stub.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefileitem.h>
 #include <tdefileview.h>
 #include <kmimetype.h>
diff --git a/tdeio/tdefile/tdefileview.cpp b/tdeio/tdefile/tdefileview.cpp
index 63c973723..f171975d8 100644
--- a/tdeio/tdefile/tdefileview.cpp
+++ b/tdeio/tdefile/tdefileview.cpp
@@ -25,8 +25,8 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "config-tdefile.h"
diff --git a/tdeio/tdefile/tderecentdirs.cpp b/tdeio/tdefile/tderecentdirs.cpp
index 12c2b6477..0548261dd 100644
--- a/tdeio/tdefile/tderecentdirs.cpp
+++ b/tdeio/tdefile/tderecentdirs.cpp
@@ -28,7 +28,7 @@
 #include <tderecentdirs.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #define MAX_DIR_HISTORY 3
 
diff --git a/tdeio/tdefile/tests/kcustommenueditortest.cpp b/tdeio/tdefile/tests/kcustommenueditortest.cpp
index 3d95b6c9f..9e2189406 100644
--- a/tdeio/tdefile/tests/kcustommenueditortest.cpp
+++ b/tdeio/tdefile/tests/kcustommenueditortest.cpp
@@ -1,6 +1,6 @@
 #include "kcustommenueditor.h"
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 int main(int argc, char** argv)
diff --git a/tdeio/tdefile/tests/kdirselectdialogtest.cpp b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
index 0c2209d31..c1178c3bc 100644
--- a/tdeio/tdefile/tests/kdirselectdialogtest.cpp
+++ b/tdeio/tdefile/tests/kdirselectdialogtest.cpp
@@ -1,6 +1,6 @@
 #include <tdeapplication.h>
 #include <kdirselectdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 
 int main( int argc, char **argv )
diff --git a/tdeio/tdefile/tests/kfdtest.cpp b/tdeio/tdefile/tests/kfdtest.cpp
index baf82725f..ce7127d9e 100644
--- a/tdeio/tdefile/tests/kfdtest.cpp
+++ b/tdeio/tdefile/tests/kfdtest.cpp
@@ -3,7 +3,7 @@
 #include <tqstringlist.h>
 #include <tdefiledialog.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
 
 KFDTest::KFDTest( const TQString& startDir, TQObject *parent, const char *name )
diff --git a/tdeio/tdefile/tests/kfstest.cpp b/tdeio/tdefile/tests/kfstest.cpp
index c57e3678e..ada8d825e 100644
--- a/tdeio/tdefile/tests/kfstest.cpp
+++ b/tdeio/tdefile/tests/kfstest.cpp
@@ -30,12 +30,12 @@
 
 #include <tdefiledialog.h>
 #include <tdefileiconview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kurl.h>
 #include <kurlbar.h>
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 #include <tdefile.h>
 #include <kdebug.h>
 #include <kicondialog.h>
diff --git a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
index 529d12dda..9ff0199dc 100644
--- a/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
+++ b/tdeio/tdefile/tests/tdefiletreeviewtest.cpp
@@ -19,7 +19,7 @@
 
 #include <tqdir.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdemainwindow.h>
 #include <tdeapplication.h>
-- 
cgit v1.2.1