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/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 +-
 11 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'kview/modules')

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