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

---
 kview/config/kviewconfmodules.cpp                       | 4 ++--
 kview/config/plugins/kviewpluginsconfig.cpp             | 4 ++--
 kview/kview.cpp                                         | 6 +++---
 kview/kviewcanvas/config/confmodules.cpp                | 2 +-
 kview/kviewcanvas/config/defaults.h                     | 2 +-
 kview/kviewcanvas/test/main.cpp                         | 2 +-
 kview/kviewcanvas/test/test.cpp                         | 2 +-
 kview/kviewviewer/config/kviewviewerpluginsconfig.cpp   | 4 ++--
 kview/kviewviewer/imagesettings.cpp                     | 2 +-
 kview/kviewviewer/kviewkonqextension.cpp                | 4 ++--
 kview/kviewviewer/kviewviewer.cpp                       | 4 ++--
 kview/kviewviewer/test/main.cpp                         | 2 +-
 kview/kviewviewer/test/test.cpp                         | 2 +-
 kview/main.cpp                                          | 2 +-
 kview/modules/browser/kviewbrowser.cpp                  | 2 +-
 kview/modules/effects/kvieweffects.cpp                  | 2 +-
 kview/modules/presenter/config/kviewpresenterconfig.cpp | 4 ++--
 kview/modules/presenter/imagelistdialog.ui              | 2 +-
 kview/modules/presenter/kviewpresenter.cpp              | 8 ++++----
 kview/modules/presenter/kviewpresenterconfmodule.cpp    | 4 ++--
 kview/modules/scale/kfloatspinbox.cpp                   | 4 ++--
 kview/modules/scale/kview_scale.cpp                     | 2 +-
 kview/modules/scale/scaledlg.cpp                        | 4 ++--
 kview/modules/scanner/kviewscanner.cpp                  | 4 ++--
 kview/modules/template/kviewtemplate.cpp                | 2 +-
 25 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'kview')

diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp
index 2316c920..23f800a9 100644
--- a/kview/config/kviewconfmodules.cpp
+++ b/kview/config/kviewconfmodules.cpp
@@ -22,9 +22,9 @@
 #include <tqvbuttongroup.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 #include <tqwhatsthis.h>
diff --git a/kview/config/plugins/kviewpluginsconfig.cpp b/kview/config/plugins/kviewpluginsconfig.cpp
index 79b6b76b..49c2775f 100644
--- a/kview/config/plugins/kviewpluginsconfig.cpp
+++ b/kview/config/plugins/kviewpluginsconfig.cpp
@@ -20,8 +20,8 @@
 
 #include <kpluginselector.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <ksimpleconfig.h>
 #include <kplugininfo.h>
 
diff --git a/kview/kview.cpp b/kview/kview.cpp
index 2ff3e52c..f91942d1 100644
--- a/kview/kview.cpp
+++ b/kview/kview.cpp
@@ -24,7 +24,7 @@
 #include <ksettings/dispatcher.h>
 #include <kurl.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/plugin.h>
 #include <tdeparts/part.h>
@@ -33,9 +33,9 @@
 #include <kstdaction.h>
 #include <kimageio.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twinmodule.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
 #include <kedittoolbar.h>
diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index 04b3cf3a..55efba65 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -24,7 +24,7 @@
 #include <tqcheckbox.h>
 #include <tqframe.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksimpleconfig.h>
 #include <kcolorbutton.h>
 #include <tdelistview.h>
diff --git a/kview/kviewcanvas/config/defaults.h b/kview/kviewcanvas/config/defaults.h
index 166b3b02..4d309585 100644
--- a/kview/kviewcanvas/config/defaults.h
+++ b/kview/kviewcanvas/config/defaults.h
@@ -19,7 +19,7 @@
 #ifndef DEFAULTS_H
 #define DEFAULTS_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqsize.h>
 #include <tqcolor.h>
 
diff --git a/kview/kviewcanvas/test/main.cpp b/kview/kviewcanvas/test/main.cpp
index 0f7af338..8fc0b532 100644
--- a/kview/kviewcanvas/test/main.cpp
+++ b/kview/kviewcanvas/test/main.cpp
@@ -2,7 +2,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("A TDE KPart Application");
diff --git a/kview/kviewcanvas/test/test.cpp b/kview/kviewcanvas/test/test.cpp
index 01ac6e43..de1694f8 100644
--- a/kview/kviewcanvas/test/test.cpp
+++ b/kview/kviewcanvas/test/test.cpp
@@ -8,7 +8,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 
 #include <tqimage.h>
diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
index 122190f9..af444cdd 100644
--- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
+++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp
@@ -20,8 +20,8 @@
 
 #include <kpluginselector.h>
 #include <kgenericfactory.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <ksimpleconfig.h>
 #include <kplugininfo.h>
 
diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp
index 0ee58b78..1cb82f58 100644
--- a/kview/kviewviewer/imagesettings.cpp
+++ b/kview/kviewviewer/imagesettings.cpp
@@ -21,7 +21,7 @@
 #include <tqcheckbox.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 ImageSettings::ImageSettings( TQWidget * parent, const char * name )
diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp
index 0fba3ab0..43f1fa5d 100644
--- a/kview/kviewviewer/kviewkonqextension.cpp
+++ b/kview/kviewviewer/kviewkonqextension.cpp
@@ -29,8 +29,8 @@
 
 #include <kprinter.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 KViewKonqExtension::KViewKonqExtension( KImageViewer::Canvas * canvas,
 		KViewViewer *parent, const char *name )
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 59ef17b7..8bfe4cd2 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -43,8 +43,8 @@
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/plugin.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <tdeapplication.h>
 #include <kimageio.h>
 #include <tdestdaccel.h>
diff --git a/kview/kviewviewer/test/main.cpp b/kview/kviewviewer/test/main.cpp
index 2dc70dcf..1fa9d7bf 100644
--- a/kview/kviewviewer/test/main.cpp
+++ b/kview/kviewviewer/test/main.cpp
@@ -2,7 +2,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
     I18N_NOOP("KView Viewer Part Test");
diff --git a/kview/kviewviewer/test/test.cpp b/kview/kviewviewer/test/test.cpp
index f4a286ec..87b0d1c8 100644
--- a/kview/kviewviewer/test/test.cpp
+++ b/kview/kviewviewer/test/test.cpp
@@ -7,7 +7,7 @@
 
 #include <kurl.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeapplication.h>
 
diff --git a/kview/main.cpp b/kview/main.cpp
index fa9c0578..3fc3b364 100644
--- a/kview/main.cpp
+++ b/kview/main.cpp
@@ -21,7 +21,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] = I18N_NOOP( "TDE Image Viewer" );
 
diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp
index 92472029..41fee38b 100644
--- a/kview/modules/browser/kviewbrowser.cpp
+++ b/kview/modules/browser/kviewbrowser.cpp
@@ -24,7 +24,7 @@
 
 #include <kdirlister.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kimageviewer/viewer.h>
diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp
index 82507454..803b81e7 100644
--- a/kview/modules/effects/kvieweffects.cpp
+++ b/kview/modules/effects/kvieweffects.cpp
@@ -7,7 +7,7 @@
 #include <tqobjectlist.h>
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kimageviewer/viewer.h>
diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp
index c3682d5f..5cda7ee0 100644
--- a/kview/modules/presenter/config/kviewpresenterconfig.cpp
+++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp
@@ -22,9 +22,9 @@
 #include <tqcheckbox.h>
 #include <tqframe.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kgenericfactory.h>
 
diff --git a/kview/modules/presenter/imagelistdialog.ui b/kview/modules/presenter/imagelistdialog.ui
index b3f8cf48..d00950f4 100644
--- a/kview/modules/presenter/imagelistdialog.ui
+++ b/kview/modules/presenter/imagelistdialog.ui
@@ -260,7 +260,7 @@
     <include location="global" impldecl="in implementation">kurl.h</include>
     <include location="global" impldecl="in implementation">tdefiledialog.h</include>
     <include location="global" impldecl="in implementation">tqstring.h</include>
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
     <include location="local" impldecl="in implementation">imagelistitem.h</include>
     <include location="local" impldecl="in implementation">imagelistdialog.ui.h</include>
 </includes>
diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp
index e2f2ef87..065bccaa 100644
--- a/kview/modules/presenter/kviewpresenter.cpp
+++ b/kview/modules/presenter/kviewpresenter.cpp
@@ -33,10 +33,10 @@
 #include <kpushbutton.h>
 #include <tdeapplication.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <knuminput.h>
 #include <tdefiledialog.h>
@@ -44,8 +44,8 @@
 #include <kimageviewer/viewer.h>
 #include <kimageviewer/canvas.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <kurldrag.h>
 
 typedef KGenericFactory<KViewPresenter> KViewPresenterFactory;
diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp
index df9622b8..3d6de8b4 100644
--- a/kview/modules/presenter/kviewpresenterconfmodule.cpp
+++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp
@@ -24,9 +24,9 @@
 #include <tqcheckbox.h>
 #include <tqframe.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent )
diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp
index c260119e..0dc7fb33 100644
--- a/kview/modules/scale/kfloatspinbox.cpp
+++ b/kview/modules/scale/kfloatspinbox.cpp
@@ -25,8 +25,8 @@
 #endif
 
 #include <knumvalidator.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 int pow( int a, int b )
diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp
index d2f6c9c5..2e6d03c4 100644
--- a/kview/modules/scale/kview_scale.cpp
+++ b/kview/modules/scale/kview_scale.cpp
@@ -25,7 +25,7 @@
 #include <tqvbox.h>
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kimageviewer/viewer.h>
diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp
index ad38815c..308546cd 100644
--- a/kview/modules/scale/scaledlg.cpp
+++ b/kview/modules/scale/scaledlg.cpp
@@ -30,10 +30,10 @@
 
 #include <kdebug.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include "kfloatspinbox.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #define ONEINCHINMM 2.54
 
diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp
index 1c35fa68..ee3ca0dd 100644
--- a/kview/modules/scanner/kviewscanner.cpp
+++ b/kview/modules/scanner/kviewscanner.cpp
@@ -25,10 +25,10 @@
 
 #include <tdeaction.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kgenericfactory.h>
 #include <kscan.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kimageviewer/viewer.h>
 
diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp
index f148f7ac..dc386560 100644
--- a/kview/modules/template/kviewtemplate.cpp
+++ b/kview/modules/template/kviewtemplate.cpp
@@ -7,7 +7,7 @@
 #include <tqobjectlist.h>
 
 #include <tdeaction.h>
-/*#include <klocale.h>*/
+/*#include <tdelocale.h>*/
 #include <kgenericfactory.h>
 #include <kdebug.h>
 #include <kimageviewer/viewer.h>
-- 
cgit v1.2.1