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

---
 akregator/src/actionmanagerimpl.cpp                | 2 +-
 akregator/src/addfeeddialog.cpp                    | 4 ++--
 akregator/src/akregator_options.h                  | 2 +-
 akregator/src/akregator_part.cpp                   | 6 +++---
 akregator/src/akregator_view.cpp                   | 4 ++--
 akregator/src/articlelistview.cpp                  | 4 ++--
 akregator/src/articleviewer.cpp                    | 6 +++---
 akregator/src/articleviewer.h                      | 2 +-
 akregator/src/configdialog.cpp                     | 2 +-
 akregator/src/feed.cpp                             | 2 +-
 akregator/src/feedlist.cpp                         | 2 +-
 akregator/src/feedlistview.cpp                     | 2 +-
 akregator/src/frame.cpp                            | 2 +-
 akregator/src/main.cpp                             | 2 +-
 akregator/src/mainwindow.cpp                       | 6 +++---
 akregator/src/mk4storage/feedstoragemk4impl.cpp    | 2 +-
 akregator/src/mk4storage/mk4confwidget.cpp         | 4 ++--
 akregator/src/mk4storage/mk4plugin.cpp             | 2 +-
 akregator/src/mk4storage/storagefactorymk4impl.cpp | 2 +-
 akregator/src/notificationmanager.cpp              | 2 +-
 akregator/src/pageviewer.cpp                       | 4 ++--
 akregator/src/pluginmanager.cpp                    | 4 ++--
 akregator/src/progressmanager.cpp                  | 2 +-
 akregator/src/propertiesdialog.cpp                 | 2 +-
 akregator/src/searchbar.cpp                        | 2 +-
 akregator/src/simplenodeselector.cpp               | 2 +-
 akregator/src/speechclient.cpp                     | 2 +-
 akregator/src/storagefactorydummyimpl.cpp          | 2 +-
 akregator/src/tabwidget.cpp                        | 2 +-
 akregator/src/tagnodelist.cpp                      | 2 +-
 akregator/src/tagpropertiesdialog.cpp              | 2 +-
 akregator/src/trayicon.cpp                         | 4 ++--
 akregator/src/viewer.cpp                           | 4 ++--
 33 files changed, 47 insertions(+), 47 deletions(-)

(limited to 'akregator/src')

diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 84695ce22..87b1ff19d 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -25,7 +25,7 @@
 #include <tqwidget.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <tdeshortcut.h>
 #include <kxmlguifactory.h>
diff --git a/akregator/src/addfeeddialog.cpp b/akregator/src/addfeeddialog.cpp
index 557fcd0f2..0642fa483 100644
--- a/akregator/src/addfeeddialog.cpp
+++ b/akregator/src/addfeeddialog.cpp
@@ -29,13 +29,13 @@
 
 #include <tdeapplication.h>
 #include <kurl.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kicontheme.h>
 #include <kdebug.h>
 #include <ksqueezedtextlabel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Akregator {
 
diff --git a/akregator/src/akregator_options.h b/akregator/src/akregator_options.h
index 1f59834de..20f29ffc6 100644
--- a/akregator/src/akregator_options.h
+++ b/akregator/src/akregator_options.h
@@ -26,7 +26,7 @@
 #define AKREGATOR_OPTIONS_H
 
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Akregator {
 
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 16ae8e085..48311dcce 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -31,18 +31,18 @@
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
 #include <tdefiledialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtmldefaults.h>
 #include <kinstance.h>
 #include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <tdepopupmenu.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <tdeio/netaccess.h>
 #include <tdeparts/browserinterface.h>
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index f03c23612..fa8691750 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -73,8 +73,8 @@
 #include <kinputdialog.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocess.h>
 #include <krun.h>
diff --git a/akregator/src/articlelistview.cpp b/akregator/src/articlelistview.cpp
index c08867b21..96a2a050c 100644
--- a/akregator/src/articlelistview.cpp
+++ b/akregator/src/articlelistview.cpp
@@ -34,9 +34,9 @@
 
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcharsets.h>
 #include <kurl.h>
 
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index e31cd3abc..96b269e6d 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -30,14 +30,14 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtmlview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <kshell.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeio/netaccess.h>
 #include <libtdepim/tdefileio.h>
 
diff --git a/akregator/src/articleviewer.h b/akregator/src/articleviewer.h
index ace931c8a..44443f7d6 100644
--- a/akregator/src/articleviewer.h
+++ b/akregator/src/articleviewer.h
@@ -26,7 +26,7 @@
 #ifndef ARTICLEVIEWER_H
 #define ARTICLEVIEWER_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcolor.h>
 #include <tqfont.h>
diff --git a/akregator/src/configdialog.cpp b/akregator/src/configdialog.cpp
index b88272b4c..5a280e1cc 100644
--- a/akregator/src/configdialog.cpp
+++ b/akregator/src/configdialog.cpp
@@ -25,7 +25,7 @@
 #include <tqstringlist.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configdialog.h"
 
diff --git a/akregator/src/feed.cpp b/akregator/src/feed.cpp
index a68aedbb1..3b0d81035 100644
--- a/akregator/src/feed.cpp
+++ b/akregator/src/feed.cpp
@@ -33,7 +33,7 @@
 
 #include <kurl.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include "akregatorconfig.h"
diff --git a/akregator/src/feedlist.cpp b/akregator/src/feedlist.cpp
index e05aded8a..708b4fb7e 100644
--- a/akregator/src/feedlist.cpp
+++ b/akregator/src/feedlist.cpp
@@ -29,7 +29,7 @@
 #include <tqvaluelist.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "article.h"
 #include "feed.h"
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index 6147f4d2a..d6ea394a1 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -42,7 +42,7 @@
 #include <kdebug.h>
 #include <kiconeffect.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemultipledrag.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index 351d35125..6e27b9155 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -27,7 +27,7 @@
 
 #include <tdeactioncollection.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/browserextension.h>
 #include <tdeparts/part.h>
 
diff --git a/akregator/src/main.cpp b/akregator/src/main.cpp
index f1726fccd..4c4b31ecf 100644
--- a/akregator/src/main.cpp
+++ b/akregator/src/main.cpp
@@ -26,7 +26,7 @@
 
 #include <dcopref.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kuniqueapplication.h>
 
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index a2d0725e3..6cf6ad51f 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -36,11 +36,11 @@
 #include <kdebug.h>
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kkeydialog.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/partmanager.h>
 #include <ksqueezedtextlabel.h>
 #include <kstandarddirs.h>
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index 58d5e31f9..501b8b260 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -35,7 +35,7 @@
 #include <tqfile.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 namespace Akregator {
diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp
index 788087f87..c028b1569 100644
--- a/akregator/src/mk4storage/mk4confwidget.cpp
+++ b/akregator/src/mk4storage/mk4confwidget.cpp
@@ -28,8 +28,8 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 namespace Akregator {
diff --git a/akregator/src/mk4storage/mk4plugin.cpp b/akregator/src/mk4storage/mk4plugin.cpp
index b3493be36..160003084 100644
--- a/akregator/src/mk4storage/mk4plugin.cpp
+++ b/akregator/src/mk4storage/mk4plugin.cpp
@@ -24,7 +24,7 @@
 
 #include "mk4plugin.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "storagefactorymk4impl.h"
 #include "storagefactoryregistry.h"
diff --git a/akregator/src/mk4storage/storagefactorymk4impl.cpp b/akregator/src/mk4storage/storagefactorymk4impl.cpp
index 7a9cd0655..6f0eec344 100644
--- a/akregator/src/mk4storage/storagefactorymk4impl.cpp
+++ b/akregator/src/mk4storage/storagefactorymk4impl.cpp
@@ -26,7 +26,7 @@
 //#include "mk4confwidget.h"
 //#include "mk4config.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqwidget.h>
diff --git a/akregator/src/notificationmanager.cpp b/akregator/src/notificationmanager.cpp
index 60066c5f9..5a1446816 100644
--- a/akregator/src/notificationmanager.cpp
+++ b/akregator/src/notificationmanager.cpp
@@ -22,7 +22,7 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 6bc2592ab..1408255ef 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -34,11 +34,11 @@
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
 #include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdehtml_settings.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <tdestdaccel.h>
diff --git a/akregator/src/pluginmanager.cpp b/akregator/src/pluginmanager.cpp
index 87e77a3bb..8efe9c71f 100644
--- a/akregator/src/pluginmanager.cpp
+++ b/akregator/src/pluginmanager.cpp
@@ -23,8 +23,8 @@ email                : markey@web.de
 
 #include <klibloader.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 using std::vector;
 using Akregator::Plugin;
diff --git a/akregator/src/progressmanager.cpp b/akregator/src/progressmanager.cpp
index 07290a13f..dd27fbe94 100644
--- a/akregator/src/progressmanager.cpp
+++ b/akregator/src/progressmanager.cpp
@@ -25,7 +25,7 @@
 #include <tqmap.h>
 #include <tqstylesheet.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstaticdeleter.h>
 
 #include <libtdepim/progressmanager.h>
diff --git a/akregator/src/propertiesdialog.cpp b/akregator/src/propertiesdialog.cpp
index a0f13c479..149eb480c 100644
--- a/akregator/src/propertiesdialog.cpp
+++ b/akregator/src/propertiesdialog.cpp
@@ -29,7 +29,7 @@
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 
 #include <tqcheckbox.h>
diff --git a/akregator/src/searchbar.cpp b/akregator/src/searchbar.cpp
index 9d2341866..afd3b3467 100644
--- a/akregator/src/searchbar.cpp
+++ b/akregator/src/searchbar.cpp
@@ -30,7 +30,7 @@
 #include <kcombobox.h>
 #include <kiconloader.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tqapplication.h>
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index 66ce00aea..4291bb453 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -29,7 +29,7 @@
 #include "treenodevisitor.h"
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqmap.h>
diff --git a/akregator/src/speechclient.cpp b/akregator/src/speechclient.cpp
index 38f1f8bfb..1eae57407 100644
--- a/akregator/src/speechclient.cpp
+++ b/akregator/src/speechclient.cpp
@@ -29,7 +29,7 @@
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kcharsets.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 #include <ktrader.h>
diff --git a/akregator/src/storagefactorydummyimpl.cpp b/akregator/src/storagefactorydummyimpl.cpp
index 45f9fc0a7..b794241c9 100644
--- a/akregator/src/storagefactorydummyimpl.cpp
+++ b/akregator/src/storagefactorydummyimpl.cpp
@@ -24,7 +24,7 @@
 #include "storagefactorydummyimpl.h"
 #include "storagedummyimpl.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqwidget.h>
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index da69b69e1..76c8b1980 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -40,7 +40,7 @@
 #include <ktabbar.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtmlview.h>
 #include <tdehtml_part.h>
 #include <kiconloader.h>
diff --git a/akregator/src/tagnodelist.cpp b/akregator/src/tagnodelist.cpp
index a30e1b3df..6d60da63b 100644
--- a/akregator/src/tagnodelist.cpp
+++ b/akregator/src/tagnodelist.cpp
@@ -36,7 +36,7 @@
 #include <tqvaluelist.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 namespace Akregator {
 
diff --git a/akregator/src/tagpropertiesdialog.cpp b/akregator/src/tagpropertiesdialog.cpp
index 531b7ff9f..4f73467e6 100644
--- a/akregator/src/tagpropertiesdialog.cpp
+++ b/akregator/src/tagpropertiesdialog.cpp
@@ -23,7 +23,7 @@
 */
 
 #include <kicondialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 3e87ca77f..fc26cadeb 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -29,8 +29,8 @@
 #include <twin.h>
 #include <kiconeffect.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <tdepopupmenu.h>
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 0693fd219..a9c4d6fc3 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -28,8 +28,8 @@
 #include <tdefiledialog.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <krun.h>
-- 
cgit v1.2.1