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

---
 lib/kofficeui/KoCharSelectDia.cpp      | 2 +-
 lib/kofficeui/KoCommandHistory.cpp     | 2 +-
 lib/kofficeui/KoContextCelp.cpp        | 2 +-
 lib/kofficeui/KoEditPath.cpp           | 2 +-
 lib/kofficeui/KoGuideLineDia.cpp       | 2 +-
 lib/kofficeui/KoGuides.cpp             | 2 +-
 lib/kofficeui/KoInsertLink.cpp         | 2 +-
 lib/kofficeui/KoPageLayoutDia.cpp      | 4 ++--
 lib/kofficeui/KoPageLayoutSize.cpp     | 4 ++--
 lib/kofficeui/KoPartSelectDia.cpp      | 2 +-
 lib/kofficeui/KoPictureFilePreview.cpp | 2 +-
 lib/kofficeui/KoRuler.cpp              | 4 ++--
 lib/kofficeui/KoSelectAction.cpp       | 2 +-
 lib/kofficeui/KoTabChooser.cpp         | 2 +-
 lib/kofficeui/KoTemplateChooseDia.cpp  | 6 +++---
 lib/kofficeui/KoTemplateCreateDia.cpp  | 6 +++---
 lib/kofficeui/KoToolBox.cpp            | 2 +-
 lib/kofficeui/KoTooluButton.cpp        | 4 ++--
 lib/kofficeui/KoUnitWidgets.cpp        | 4 ++--
 lib/kofficeui/KoZoomAction.cpp         | 2 +-
 lib/kofficeui/KoZoomMode.cpp           | 2 +-
 lib/kofficeui/Kolinestyleaction.cpp    | 2 +-
 lib/kofficeui/Kolinewidthaction.cpp    | 2 +-
 lib/kofficeui/tkcoloractions.cpp       | 2 +-
 lib/kofficeui/ttdetoolbarbutton.cpp    | 2 +-
 lib/kofficeui/ttdetoolbarbutton.h      | 2 +-
 26 files changed, 35 insertions(+), 35 deletions(-)

(limited to 'lib/kofficeui')

diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp
index 4095ae09..5a4a288d 100644
--- a/lib/kofficeui/KoCharSelectDia.cpp
+++ b/lib/kofficeui/KoCharSelectDia.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharselect.h>
 #include <kdebug.h>
 /******************************************************************/
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index 0bcf454b..53eaba86 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -25,7 +25,7 @@
 #include <tdeaction.h>
 #include <kcommand.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeshortcutlist.h>
 #include <tdestdaccel.h>
diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index f85e1937..d9d22278 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -27,7 +27,7 @@
 #include <tqsimplerichtext.h>
 
 #include <kpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kcursor.h>
diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp
index 1a2b2668..bb937a7f 100644
--- a/lib/kofficeui/KoEditPath.cpp
+++ b/lib/kofficeui/KoEditPath.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp
index 00664410..bbc2e9cf 100644
--- a/lib/kofficeui/KoGuideLineDia.cpp
+++ b/lib/kofficeui/KoGuideLineDia.cpp
@@ -28,7 +28,7 @@
 #include <tqlayout.h>
 #include <tqradiobutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoUnitWidgets.h>
 
 
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index 84f31ee3..a4e4ad12 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -25,7 +25,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 
 #include <KoDocument.h>
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index eda24051..bb58686c 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqvbox.h>
diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp
index 3150ab51..69a6326e 100644
--- a/lib/kofficeui/KoPageLayoutDia.cpp
+++ b/lib/kofficeui/KoPageLayoutDia.cpp
@@ -29,9 +29,9 @@
 #include <KoUnit.h>
 #include <KoUnitWidgets.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index 73629862..c4e19fa8 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -22,9 +22,9 @@
 #include <KoUnit.h>
 #include <KoUnitWidgets.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include <tqlabel.h>
diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp
index 144b8a08..897aba8d 100644
--- a/lib/kofficeui/KoPartSelectDia.cpp
+++ b/lib/kofficeui/KoPartSelectDia.cpp
@@ -20,7 +20,7 @@
 #include <KoPartSelectDia.h>
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlistview.h>
 
 /****************************************************
diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp
index 7baed8f9..392309f3 100644
--- a/lib/kofficeui/KoPictureFilePreview.cpp
+++ b/lib/kofficeui/KoPictureFilePreview.cpp
@@ -21,7 +21,7 @@
 #include "KoPictureFilePreview.h"
 #include "KoPictureFilePreview.moc"
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tqbitmap.h>
 #include <tqlayout.h>
diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp
index 74c617c5..fade3f71 100644
--- a/lib/kofficeui/KoRuler.cpp
+++ b/lib/kofficeui/KoRuler.cpp
@@ -22,8 +22,8 @@
 /******************************************************************/
 
 #include "KoRuler.h"
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tqcursor.h>
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 5960c2e6..95238764 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -30,7 +30,7 @@
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KoSelectAction::KoSelectActionPrivate
 {
diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp
index c38d0e62..325b9c00 100644
--- a/lib/kofficeui/KoTabChooser.cpp
+++ b/lib/kofficeui/KoTabChooser.cpp
@@ -26,7 +26,7 @@
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class KoTabChooserPrivate {
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 047a701a..044df16a 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -26,7 +26,7 @@
 
 #include "KoTemplateChooseDia.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #include <tdefiledialog.h>
 #include <kinstance.h>
@@ -38,11 +38,11 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kjanuswidget.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <ktextedit.h>
 #include <tdefileiconview.h>
 #include <tdefileitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index e3d6f9f7..0033ca2d 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -32,14 +32,14 @@
 #include <tqcheckbox.h>
 #include <tqtooltip.h>
 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <KoTemplates.h>
 #include <kicondialog.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kimageio.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index 31c0dabf..222b206d 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -29,7 +29,7 @@
 
 #include <kdebug.h>
 #include <tdeparts/event.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <kiconloader.h>
 #include <kseparator.h>
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index f44adfb9..1cd5e1c6 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -25,11 +25,11 @@
 #include <tqstyle.h>
 #include <tqpopupmenu.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdetoolbar.h>
 #include <KoTooluButton.h>
 #include <kcolordrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcolordialog.h>
 #include <kdebug.h>
 
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 0b9f26e7..4c4a5c45 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -21,8 +21,8 @@
 #include "KoUnitWidgets.h"
 #include "KoUnitWidgets.moc"
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 
diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp
index 09f7d3e4..78a4fc20 100644
--- a/lib/kofficeui/KoZoomAction.cpp
+++ b/lib/kofficeui/KoZoomAction.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqvaluelist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KoZoomAction::KoZoomAction( const TQString& text, const TQIconSet& pix, 
   const TDEShortcut& cut, TQObject* parent, const char* name ):
diff --git a/lib/kofficeui/KoZoomMode.cpp b/lib/kofficeui/KoZoomMode.cpp
index ae49a303..8c54d34e 100644
--- a/lib/kofficeui/KoZoomMode.cpp
+++ b/lib/kofficeui/KoZoomMode.cpp
@@ -18,7 +18,7 @@
 */
 
 #include "KoZoomMode.h"
-#include <klocale.h>
+#include <tdelocale.h>
 
 const char* KoZoomMode::modes[] = 
 {
diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp
index 41fcf794..08176d1b 100644
--- a/lib/kofficeui/Kolinestyleaction.cpp
+++ b/lib/kofficeui/Kolinestyleaction.cpp
@@ -25,7 +25,7 @@
 
 #include <tdepopupmenu.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class KoLineStyleAction::KoLineStyleActionPrivate
 {
diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp
index 50566d5a..b9ff452a 100644
--- a/lib/kofficeui/Kolinewidthaction.cpp
+++ b/lib/kofficeui/Kolinewidthaction.cpp
@@ -33,7 +33,7 @@
 #include <tdetoolbar.h>
 #include <tdetoolbarbutton.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <KoUnitWidgets.h>
 #include <KoGlobal.h>
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index 89574bcf..d2476d62 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -28,7 +28,7 @@
 #include <tqpainter.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqapplication.h>
 
diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp
index 9befb976..6fed1f48 100644
--- a/lib/kofficeui/ttdetoolbarbutton.cpp
+++ b/lib/kofficeui/ttdetoolbarbutton.cpp
@@ -31,7 +31,7 @@
 #include <tdeapplication.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // Delay in ms before delayed popup pops up
 #define POPUP_DELAY 500
diff --git a/lib/kofficeui/ttdetoolbarbutton.h b/lib/kofficeui/ttdetoolbarbutton.h
index 9f5d9540..706a8c03 100644
--- a/lib/kofficeui/ttdetoolbarbutton.h
+++ b/lib/kofficeui/ttdetoolbarbutton.h
@@ -24,7 +24,7 @@
 
 #include <tqpixmap.h>
 #include <tqtoolbutton.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TDEToolBar;
 class TDEInstance;
-- 
cgit v1.2.1