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

---
 konq-plugins/sidebar/delicious/bookmarkListItem.cpp | 4 ++--
 konq-plugins/sidebar/delicious/mainWidget.cpp       | 6 +++---
 konq-plugins/sidebar/delicious/plugin.cpp           | 4 ++--
 konq-plugins/sidebar/mediaplayer/engine.cpp         | 4 ++--
 konq-plugins/sidebar/mediaplayer/mediaplayer.cpp    | 6 +++---
 konq-plugins/sidebar/mediaplayer/mediawidget.cpp    | 2 +-
 konq-plugins/sidebar/mediaplayer/player.cpp         | 2 +-
 konq-plugins/sidebar/metabar/src/configdialog.cpp   | 2 +-
 konq-plugins/sidebar/metabar/src/defaultplugin.cpp  | 2 +-
 konq-plugins/sidebar/metabar/src/httpplugin.cpp     | 2 +-
 konq-plugins/sidebar/metabar/src/metabar.cpp        | 2 +-
 konq-plugins/sidebar/metabar/src/metabarwidget.cpp  | 4 ++--
 konq-plugins/sidebar/metabar/src/protocolplugin.cpp | 2 +-
 konq-plugins/sidebar/metabar/src/remoteplugin.cpp   | 2 +-
 konq-plugins/sidebar/metabar/src/serviceloader.cpp  | 2 +-
 konq-plugins/sidebar/metabar/src/settingsplugin.cpp | 2 +-
 konq-plugins/sidebar/newsticker/norsswidget.cpp     | 2 +-
 konq-plugins/sidebar/newsticker/sidebar_news.cpp    | 4 ++--
 18 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'konq-plugins/sidebar')

diff --git a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
index 0229031..b5c7d31 100644
--- a/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
+++ b/konq-plugins/sidebar/delicious/bookmarkListItem.cpp
@@ -21,8 +21,8 @@
 
 #include "bookmarkListItem.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 BookmarkListItem::BookmarkListItem( TQListView *parent, const TQString & url, const TQString & desc, time_t time )
     : TDEListViewItem( parent ), m_desc( desc )
diff --git a/konq-plugins/sidebar/delicious/mainWidget.cpp b/konq-plugins/sidebar/delicious/mainWidget.cpp
index 02bfe8a..c979429 100644
--- a/konq-plugins/sidebar/delicious/mainWidget.cpp
+++ b/konq-plugins/sidebar/delicious/mainWidget.cpp
@@ -35,10 +35,10 @@
 #include <tdeio/job.h>
 #include <krfcdate.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kinputdialog.h>
 
diff --git a/konq-plugins/sidebar/delicious/plugin.cpp b/konq-plugins/sidebar/delicious/plugin.cpp
index 12bb9f2..f0783f2 100644
--- a/konq-plugins/sidebar/delicious/plugin.cpp
+++ b/konq-plugins/sidebar/delicious/plugin.cpp
@@ -24,8 +24,8 @@
 #include <tqstring.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 KonqSidebarDelicious::KonqSidebarDelicious( TDEInstance *instance, TQObject *parent,
                                             TQWidget *widgetParent, TQString &desktopName_,
diff --git a/konq-plugins/sidebar/mediaplayer/engine.cpp b/konq-plugins/sidebar/mediaplayer/engine.cpp
index 92343cc..d8d1fdd 100644
--- a/konq-plugins/sidebar/mediaplayer/engine.cpp
+++ b/konq-plugins/sidebar/mediaplayer/engine.cpp
@@ -28,8 +28,8 @@ extern "C"
 
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
index b615e88..00e499c 100644
--- a/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediaplayer.cpp
@@ -16,14 +16,14 @@
  ***************************************************************************/
 
 #include "mediaplayer.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "mediaplayer.moc"
 #include <kdebug.h>
 #include <ksimpleconfig.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdeglobal.h>
 #include <kdemacros.h>
 #include "mediawidget.h"
 
diff --git a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
index 5130cbb..ad20c07 100644
--- a/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
+++ b/konq-plugins/sidebar/mediaplayer/mediawidget.cpp
@@ -22,7 +22,7 @@
 #include <kdebug.h>
 #include <kurl.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqwidget.h>
diff --git a/konq-plugins/sidebar/mediaplayer/player.cpp b/konq-plugins/sidebar/mediaplayer/player.cpp
index 38ac506..26904cf 100644
--- a/konq-plugins/sidebar/mediaplayer/player.cpp
+++ b/konq-plugins/sidebar/mediaplayer/player.cpp
@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ******************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdemediaplayer/player.h>
 
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 66d6827..1508c30 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -31,7 +31,7 @@
 #include <tqdatastream.h> 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kicondialog.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
index 2b2147a..3677663 100644
--- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp
@@ -25,7 +25,7 @@
 #include <kstandarddirs.h>
 #include <kicontheme.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kdesktopfile.h>
 #include <ktrader.h>
diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
index 1595d4e..5930589 100644
--- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp
@@ -27,7 +27,7 @@
 #include <kicontheme.h>
 #include <tdehtmlview.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <dcopref.h>
 #include <dcopclient.h>
diff --git a/konq-plugins/sidebar/metabar/src/metabar.cpp b/konq-plugins/sidebar/metabar/src/metabar.cpp
index 08e38a0..d479417 100644
--- a/konq-plugins/sidebar/metabar/src/metabar.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabar.cpp
@@ -1,7 +1,7 @@
 #include <kinstance.h>
 #include <tqstring.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "metabarwidget.h"
 #include "metabar.h"
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 18417cf..89e6e52 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -40,11 +40,11 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <ktrader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kdesktopfile.h>
 #include <kpropertiesdialog.h>
diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
index a08a01c..877133b 100644
--- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp
@@ -25,7 +25,7 @@
 #include <kimageio.h>
 #include <kmdcodec.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <html_document.h>
 #include <html_image.h>
diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp
index 395c2cb..9256731 100644
--- a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp
@@ -21,7 +21,7 @@
 #include "remoteplugin.h"
 
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 RemotePlugin::RemotePlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : DefaultPlugin (html, functions, name)
diff --git a/konq-plugins/sidebar/metabar/src/serviceloader.cpp b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
index 7bf310c..167009e 100644
--- a/konq-plugins/sidebar/metabar/src/serviceloader.cpp
+++ b/konq-plugins/sidebar/metabar/src/serviceloader.cpp
@@ -33,7 +33,7 @@
 #include <tdeaction.h>
 #include <tdeshortcut.h>
 #include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 
diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
index 4a053dd..48b4afc 100644
--- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
+++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp
@@ -23,7 +23,7 @@
 
 #include <tdecmoduleinfo.h>
 #include <kservice.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <html_document.h>
 #include <html_element.h>
diff --git a/konq-plugins/sidebar/newsticker/norsswidget.cpp b/konq-plugins/sidebar/newsticker/norsswidget.cpp
index 602b189..599ef75 100644
--- a/konq-plugins/sidebar/newsticker/norsswidget.cpp
+++ b/konq-plugins/sidebar/newsticker/norsswidget.cpp
@@ -26,7 +26,7 @@
 #include <tqsizepolicy.h>
 #include <dcopref.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kdebug.h>
 #include <tdeconfigdialog.h>
diff --git a/konq-plugins/sidebar/newsticker/sidebar_news.cpp b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
index 335c642..5950200 100644
--- a/konq-plugins/sidebar/newsticker/sidebar_news.cpp
+++ b/konq-plugins/sidebar/newsticker/sidebar_news.cpp
@@ -33,8 +33,8 @@
 #include <tqwidgetstack.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdesktopfile.h>
 #include <kiconloader.h>
 #include <kdemacros.h>
-- 
cgit v1.2.1