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

---
 lib/compatibility/knewstuff/downloaddialog.cpp             | 4 ++--
 lib/compatibility/knewstuff/engine.cpp                     | 4 ++--
 lib/compatibility/knewstuff/entry.cpp                      | 4 ++--
 lib/compatibility/knewstuff/knewstuff.cpp                  | 2 +-
 lib/compatibility/knewstuff/knewstuffgeneric.cpp           | 4 ++--
 lib/compatibility/knewstuff/knewstuffsecure.cpp            | 6 +++---
 lib/compatibility/knewstuff/provider.cpp                   | 6 +++---
 lib/compatibility/knewstuff/providerdialog.cpp             | 4 ++--
 lib/compatibility/knewstuff/security.cpp                   | 4 ++--
 lib/compatibility/knewstuff/uploaddialog.cpp               | 4 ++--
 lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp           | 6 +++---
 lib/compatibility/tdemdi/qextmdi/ktabbar.cpp               | 4 ++--
 lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp       | 4 ++--
 lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp        | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp       | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp   | 4 ++--
 lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp       | 2 +-
 lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp         | 4 ++--
 lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h           | 2 +-
 lib/ksavealldialog.cpp                                     | 2 +-
 lib/qextfileinfo.cpp                                       | 2 +-
 22 files changed, 39 insertions(+), 39 deletions(-)

(limited to 'lib')

diff --git a/lib/compatibility/knewstuff/downloaddialog.cpp b/lib/compatibility/knewstuff/downloaddialog.cpp
index 37a264cf..9932eb8c 100644
--- a/lib/compatibility/knewstuff/downloaddialog.cpp
+++ b/lib/compatibility/knewstuff/downloaddialog.cpp
@@ -21,13 +21,13 @@
 #include "downloaddialog.h"
 #include "downloaddialog.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktabctl.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/lib/compatibility/knewstuff/engine.cpp b/lib/compatibility/knewstuff/engine.cpp
index 3309569a..9827d4f4 100644
--- a/lib/compatibility/knewstuff/engine.cpp
+++ b/lib/compatibility/knewstuff/engine.cpp
@@ -25,8 +25,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "knewstuff.h"
diff --git a/lib/compatibility/knewstuff/entry.cpp b/lib/compatibility/knewstuff/entry.cpp
index e2390266..4b79e152 100644
--- a/lib/compatibility/knewstuff/entry.cpp
+++ b/lib/compatibility/knewstuff/entry.cpp
@@ -20,8 +20,8 @@
 
 #include "entry.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KNS;
 
diff --git a/lib/compatibility/knewstuff/knewstuff.cpp b/lib/compatibility/knewstuff/knewstuff.cpp
index 07034b45..b652ba4a 100644
--- a/lib/compatibility/knewstuff/knewstuff.cpp
+++ b/lib/compatibility/knewstuff/knewstuff.cpp
@@ -21,7 +21,7 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "engine.h"
diff --git a/lib/compatibility/knewstuff/knewstuffgeneric.cpp b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
index 64b918d8..4ce7fa4c 100644
--- a/lib/compatibility/knewstuff/knewstuffgeneric.cpp
+++ b/lib/compatibility/knewstuff/knewstuffgeneric.cpp
@@ -24,11 +24,11 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 
 #include "entry.h"
diff --git a/lib/compatibility/knewstuff/knewstuffsecure.cpp b/lib/compatibility/knewstuff/knewstuffsecure.cpp
index a6a905c0..7fb50a0f 100644
--- a/lib/compatibility/knewstuff/knewstuffsecure.cpp
+++ b/lib/compatibility/knewstuff/knewstuffsecure.cpp
@@ -18,10 +18,10 @@
 //kde includes
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <ktempdir.h>
diff --git a/lib/compatibility/knewstuff/provider.cpp b/lib/compatibility/knewstuff/provider.cpp
index 4c631847..f2088184 100644
--- a/lib/compatibility/knewstuff/provider.cpp
+++ b/lib/compatibility/knewstuff/provider.cpp
@@ -21,9 +21,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include "provider.h"
 #include "provider.moc"
diff --git a/lib/compatibility/knewstuff/providerdialog.cpp b/lib/compatibility/knewstuff/providerdialog.cpp
index ddc0b2ef..f71558ec 100644
--- a/lib/compatibility/knewstuff/providerdialog.cpp
+++ b/lib/compatibility/knewstuff/providerdialog.cpp
@@ -23,8 +23,8 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "engine.h"
 #include "provider.h"
diff --git a/lib/compatibility/knewstuff/security.cpp b/lib/compatibility/knewstuff/security.cpp
index 941081b7..e6124431 100644
--- a/lib/compatibility/knewstuff/security.cpp
+++ b/lib/compatibility/knewstuff/security.cpp
@@ -22,9 +22,9 @@
  //kde includes
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocio.h>
 
diff --git a/lib/compatibility/knewstuff/uploaddialog.cpp b/lib/compatibility/knewstuff/uploaddialog.cpp
index 9545bb80..c07ef565 100644
--- a/lib/compatibility/knewstuff/uploaddialog.cpp
+++ b/lib/compatibility/knewstuff/uploaddialog.cpp
@@ -27,10 +27,10 @@
 #include <ktextedit.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
diff --git a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
index f6bed90c..ee670afb 100644
--- a/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/kdockwidget.cpp
@@ -34,13 +34,13 @@
 
 #ifndef NO_KDE2
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <tdepopupmenu.h>
 #include <twin.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "config.h"
 #ifdef TQ_WS_X11
diff --git a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
index 6ef95971..625fab54 100644
--- a/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/ktabbar.cpp
@@ -26,9 +26,9 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "ktabbar.h"
 #include "ktabwidget.h"
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
index 916cee5b..e1cab53e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildarea.cpp
@@ -32,8 +32,8 @@
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 #include <math.h>
 #include <tqpopupmenu.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
index 4e6586f7..47c81c0a 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrm.cpp
@@ -45,7 +45,7 @@
 #include <tqnamespace.h>
 #include <tqimage.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
index ca8c3e28..96099c69 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildfrmcaption.cpp
@@ -38,7 +38,7 @@
 #include "tdemdichildfrm.h"
 #include "tdemdichildarea.h"
 #include "tdemdimainfrm.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <iostream>
 
 #ifdef TQ_WS_WIN 
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
index 69b4effd..e743fc1e 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdichildview.cpp
@@ -39,7 +39,7 @@
 #include "tdemdichildfrm.h"
 #include "tdemdidefines.h"
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqiconset.h>
 
 //============ KMdiChildView ============//
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
index 86612830..a8a4dc37 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdidockcontainer.cpp
@@ -28,13 +28,13 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 #include <tdemultitabbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 //TODO: Well, this is already defined in tdeui/kdockwidget.cpp
 static const char* const tdemdi_not_close_xpm[] =
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
index d3bea4c2..2e0076a1 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdiguiclient.cpp
@@ -25,7 +25,7 @@
 #include <tdeconfig.h>
 #include <tdetoolbar.h>
 #include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tqstring.h>
 #include <assert.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
index 96fdf21a..050c0256 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.cpp
@@ -43,12 +43,12 @@
 #include <tqpopupmenu.h>
 #include <tqmenubar.h>
 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kiconloader.h>
 #include <tdemdidockcontainer.h>
diff --git a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
index db464c9c..14996638 100644
--- a/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
+++ b/lib/compatibility/tdemdi/qextmdi/tdemdimainfrm.h
@@ -32,7 +32,7 @@
 #define _KMDIMAINFRM_H_
 
 #include <tdeparts/dockmainwindow.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdepopupmenu.h>
 
 #include <tqptrlist.h>
diff --git a/lib/ksavealldialog.cpp b/lib/ksavealldialog.cpp
index cac2c059..dd32a8af 100644
--- a/lib/ksavealldialog.cpp
+++ b/lib/ksavealldialog.cpp
@@ -21,7 +21,7 @@
 #include <tqlabel.h>
 #include <tqheader.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <tdelistbox.h>
 #include <tdelistview.h>
diff --git a/lib/qextfileinfo.cpp b/lib/qextfileinfo.cpp
index d13f9733..094e1f77 100644
--- a/lib/qextfileinfo.cpp
+++ b/lib/qextfileinfo.cpp
@@ -26,7 +26,7 @@
 #include <tdeio/scheduler.h>
 #include <kdirlister.h>
 #include <tdefileitem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 //app includes
-- 
cgit v1.2.1