Rename additional header files to avoid conflicts with KDE4

src/bookmarkssettingspage.cpp

@@ -31,7 +31,7 @@
 #include <kbookmarkmanager.h>
 #include <kdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include "dolphinsettings.h"

src/bookmarkssidebarpage.cpp

@@ -26,8 +26,8 @@
 #include <tqpopupmenu.h>
 
 #include <kbookmarkmanager.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 
 #include "dolphinsettings.h"

src/bookmartdeselector.cpp

@@ -25,7 +25,7 @@
 #include <tqpixmap.h>
 
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kbookmarkmanager.h>
 
 #include "bookmartdeselector.h"

src/detailsviewsettingspage.cpp

@@ -20,7 +20,7 @@
 
 #include "detailsviewsettingspage.h"
 #include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdefontcombo.h>
 #include <tqspinbox.h>

src/dolphin.cpp

@@ -24,9 +24,9 @@
 #include <assert.h>
 
 #include <kbookmarkmanager.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpropertiesdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kstatusbar.h>
@@ -47,7 +47,7 @@
 #include <kdesktopfile.h>
 #include <kstandarddirs.h>
 #include <kprotocolinfo.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <krun.h>

src/dolphincontextmenu.cpp

@@ -24,10 +24,10 @@
 #include <kbookmarkmanager.h>
 #include <kbookmark.h>
 #include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <tqdir.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
 #include <tdeaction.h>

src/dolphindetailsview.cpp

@@ -26,8 +26,8 @@
 #include <tqheader.h>
 #include <tqclipboard.h>
 #include <tqpainter.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tqscrollbar.h>
 #include <tqcursor.h>
 #include <tqstyle.h>

src/dolphindetailsviewsettings.cpp

@@ -20,7 +20,7 @@
 
 #include "dolphindetailsviewsettings.h"
 #include "dolphindetailsview.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 
 DolphinDetailsViewSettings::DolphinDetailsViewSettings() :

src/dolphiniconsview.cpp

@@ -23,7 +23,7 @@
 #include <kiconeffect.h>
 #include <tdeapplication.h>
 #include <tqobjectlist.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kurldrag.h>
 #include <tqclipboard.h>
 #include <assert.h>

src/dolphiniconsviewsettings.cpp

@@ -20,7 +20,7 @@
 
 #include "dolphiniconsviewsettings.h"
 #include <kicontheme.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 #include <assert.h>
 

src/dolphinsettings.cpp

@@ -25,7 +25,7 @@
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "dolphin.h"

src/dolphinsettingsdialog.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "dolphinsettingsdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include "generalsettingspage.h"
 #include "viewsettingspage.h"

src/dolphinview.cpp

@@ -22,7 +22,7 @@
 
 #include <tqlayout.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/renamedlg.h>
 #include <assert.h>

src/editbookmarkdialog.cpp

@@ -20,7 +20,7 @@
 
 #include "editbookmarkdialog.h"
 #include <tqgrid.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlineedit.h>
 #include <tqlabel.h>
 #include <tqlayout.h>

src/filterbar.cpp

@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <kiconloader.h>

src/generalsettingspage.cpp

@@ -27,7 +27,7 @@
 #include <tqvbox.h>
 #include <tqgrid.h>
 #include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>
 #include <tqpushbutton.h>

src/iconsviewsettingspage.cpp

@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 #include <tdefontcombo.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 #include "dolphiniconsviewsettings.h"

src/infosidebarpage.cpp

@@ -34,12 +34,12 @@
 #include <tqhgroupbox.h>
 
 #include <kbookmarkmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeio/previewjob.h>
 #include <tdefileitem.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdefilemetainfo.h>
 
 #include "dolphin.h"

src/itemeffectsmanager.cpp

@@ -22,10 +22,10 @@
 #include <kiconeffect.h>
 #include <tdeapplication.h>
 #include <tqobjectlist.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqclipboard.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dolphin.h"
 #include "dolphinstatusbar.h"

src/main.cpp

@@ -24,7 +24,7 @@
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 
 static TDECmdLineOptions options[] =

src/pixmapviewer.cpp

@@ -20,7 +20,7 @@
 
 #include "pixmapviewer.h"
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tqpainter.h>
 

src/renamedialog.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "renamedialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqvbox.h>

src/sidebars.cpp

@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqpixmap.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqcombobox.h>
 
 #include "dolphinsettings.h"

src/statusbarmessagelabel.cpp

@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 #include <tqfontmetrics.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 StatusBarMessageLabel::StatusBarMessageLabel(TQWidget* parent) :
     TQWidget(parent),

src/statusbarspaceinfo.cpp

@@ -22,9 +22,9 @@
 
 #include <tqpainter.h>
 #include <tqtimer.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdiskfreesp.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(TQWidget* parent) :

src/undomanager.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "undomanager.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <tqtimer.h>
 #include <assert.h>

src/urlbutton.cpp

@@ -26,7 +26,7 @@
 #include <kurldrag.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "urlnavigator.h"
 #include "dolphin.h"

src/urlnavigator.cpp

@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <tqobjectlist.h>
 #include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tqpopupmenu.h>
 #include <tqlineedit.h>

src/urlnavigatorbutton.cpp

@@ -25,10 +25,10 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdeio/jobclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kurl.h>
 #include <kurldrag.h>

src/viewproperties.cpp

@@ -24,7 +24,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 

src/viewpropertiesdialog.cpp

@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "viewpropertiesdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqvbox.h>
@@ -31,7 +31,7 @@
 #include <tqgroupbox.h>
 #include <tqcombobox.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <assert.h>
 
 #include "viewproperties.h"

src/viewsettingspage.cpp

@@ -23,7 +23,7 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "iconsviewsettingspage.h"
 #include "detailsviewsettingspage.h"