Rename additional header files to avoid conflicts with KDE4

src/app/bookmarkdialog.cpp

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdefile.h>
 #include <kicondialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 // Local

src/app/bookmarkviewcontroller.cpp

@@ -38,8 +38,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeversion.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdetoolbar.h>
 #include <kurl.h>

src/app/configdialog.cpp

@@ -37,9 +37,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdirsize.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurllabel.h>
 #include <kurlrequester.h>
 

src/app/dirviewcontroller.cpp

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpropsdlg.h>
 
 // Local

src/app/history.cpp

@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>
 #include <tdestdaccel.h>

src/app/kipiinterface.cpp

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kdebug.h>
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 // KIPI

src/app/main.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "gvcore/cache.h"
 #include "gvcore/fileviewcontroller.h"

src/app/mainwindow.cpp

@@ -41,16 +41,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdockwidget.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <khelpmenu.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <kkeydialog.h>
 #include <klargefile.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kpropsdlg.h>
 #include <kprotocolinfo.h>

src/app/metaedit.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "gvcore/document.h"

src/gvcore/bcgdialog.cpp

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqvbox.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "imageview.h"

src/gvcore/captionformatter.cpp

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include "captionformatter.h"
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Gwenview {

src/gvcore/deletedialog.cpp

@@ -17,10 +17,10 @@
 #include <tdeconfig.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdguiitem.h>
 #include <kurl.h>
 

src/gvcore/document.cpp

@@ -32,11 +32,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefilemetainfo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kimageio.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <kstringhandler.h>
 

src/gvcore/documentanimatedloadedimpl.cpp

@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // KDE
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 namespace Gwenview {
 
 // Local

src/gvcore/documentimpl.cpp

@@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  
 */
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "document.h"

src/gvcore/documentjpegloadedimpl.cpp

@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "miscconfig.h"

src/gvcore/documentloadedimpl.cpp

@@ -35,8 +35,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdebug.h>
 #include <tdeio/netaccess.h>
 #include <klargefile.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 // Local
 #include "imageutils/imageutils.h"

src/gvcore/dragpixmapgenerator.h

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqvaluevector.h>
 
 // KDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Gwenview {
 

src/gvcore/externaltoolcontext.cpp

@@ -24,7 +24,7 @@ Copyright 2000-2004 Aur
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <kservice.h>

src/gvcore/externaltooldialog.cpp

@@ -31,8 +31,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kimageio.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <krun.h>
 #include <kurllabel.h>
 #include <kurlrequester.h>

src/gvcore/externaltoolmanager.cpp

@@ -27,7 +27,7 @@ Copyright 2000-2004 Aur
 // KDE
 #include <kdebug.h>
 #include <kdesktopfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

src/gvcore/filedetailview.cpp

@@ -34,9 +34,9 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdefileitem.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurldrag.h>
 #include <kwordwrap.h>
 

src/gvcore/filedetailviewitem.cpp

@@ -23,8 +23,8 @@
 */
 
 // KDE includes
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 // Our includes
 #include "filedetailviewitem.h"

src/gvcore/fileoperation.cpp

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // Local
 #include "fileopobject.h"

src/gvcore/fileopobject.cpp

@@ -28,10 +28,10 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeversion.h>
 #include <tdefiledialog.h>
 #include <tdefilefiltercombo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kurlcombobox.h>
 

src/gvcore/filethumbnailview.cpp

@@ -33,9 +33,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>

src/gvcore/fileviewcontroller.cpp

@@ -40,7 +40,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kiconloader.h>
 #include <kimageio.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpropertiesdialog.h>
 #include <kprotocolinfo.h>
 #include <kstdaction.h>

src/gvcore/imagesavedialog.cpp

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeversion.h>
 #include <tdefilefiltercombo.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlcombobox.h>
 
 // Our includes

src/gvcore/imageview.cpp

@@ -43,7 +43,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
 #include <kurldrag.h>

src/gvcore/imageviewcontroller.cpp

@@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemediaplayer/player.h>
 #include <kmimetype.h>
 #include <tdetoolbar.h>

src/gvcore/imageviewtools.cpp

@@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE 
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 // Local

src/gvcore/jpegformattype.cpp

@@ -40,7 +40,7 @@ extern "C" {
 
 // KDE
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // Local
 #include "jpegformattype.h"

src/gvcore/printdialog.cpp

@@ -29,7 +29,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kcombobox.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kprinter.h>
 

src/gvcore/thumbnailloadjob.cpp

@@ -45,7 +45,7 @@
 #include <klargefile.h>
 #include <kmdcodec.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // libjpeg 
 #include <setjmp.h>

src/gvcore/timeutils.cpp

@@ -24,8 +24,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdebug.h>
 #include <tdefileitem.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 	
 namespace Gwenview {
 namespace TimeUtils {

src/gvdirpart/gvdirpart.cpp

@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tdeaction.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <tdeparts/browserextension.h>

src/gvimagepart/gvimagepart.cpp

@@ -30,8 +30,8 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <kdirlister.h>
 #include <tdefiledialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdeparts/genericfactory.h>
 

src/gvimagepart/gvimagepart.h

@@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Steet, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <tdeparts/part.h>
 #include <tdeparts/browserextension.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 // Forward declarations
 class TQFile;

src/imageutils/imageutils.cpp

@@ -27,7 +27,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 // KDE
 #include <kdebug.h>
 #include <tdeversion.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // Local
 #include "imageutils/orientation.h"