From d318087925a540a204c9d3820d5a09fbda58b8b2 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:21:55 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 akregator/src/actionmanagerimpl.cpp  | 10 +++++-----
 akregator/src/akregator_part.cpp     | 10 +++++-----
 akregator/src/akregator_view.cpp     |  4 ++--
 akregator/src/articlelistview.h      |  2 +-
 akregator/src/articleviewer.cpp      |  2 +-
 akregator/src/feeditem.cpp           |  2 +-
 akregator/src/feedlistview.h         |  2 +-
 akregator/src/folderitem.cpp         |  2 +-
 akregator/src/frame.cpp              |  2 +-
 akregator/src/mainwindow.cpp         |  2 +-
 akregator/src/pageviewer.cpp         |  6 +++---
 akregator/src/settings_appearance.ui |  8 ++++----
 akregator/src/simplenodeselector.cpp |  2 +-
 akregator/src/tabwidget.cpp          |  2 +-
 akregator/src/tagaction.cpp          |  2 +-
 akregator/src/tagaction.h            |  2 +-
 akregator/src/tagfolderitem.cpp      |  2 +-
 akregator/src/tagnodeitem.cpp        |  2 +-
 akregator/src/trayicon.cpp           |  2 +-
 akregator/src/treenodeitem.h         |  2 +-
 akregator/src/viewer.cpp             |  4 ++--
 21 files changed, 36 insertions(+), 36 deletions(-)

(limited to 'akregator')

diff --git a/akregator/src/actionmanagerimpl.cpp b/akregator/src/actionmanagerimpl.cpp
index 1de44c31c..84695ce22 100644
--- a/akregator/src/actionmanagerimpl.cpp
+++ b/akregator/src/actionmanagerimpl.cpp
@@ -23,11 +23,11 @@
 */
 
 #include <tqwidget.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
-#include <kshortcut.h>
+#include <tdepopupmenu.h>
+#include <tdeshortcut.h>
 #include <kxmlguifactory.h>
 
 #include <tqmap.h>
@@ -55,7 +55,7 @@
 #include "treenode.h"
 #include "treenodevisitor.h"
 #include "tabwidget.h"
-#include "kstdaccel.h"
+#include "tdestdaccel.h"
 
 
 
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 9fb07f79a..fdfbf447a 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -24,9 +24,9 @@
 */
 #include <dcopclient.h>
 #include <kaboutdata.h>
-#include <kaction.h>
-#include <kactionclasses.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <tdeconfigdialog.h>
@@ -34,11 +34,11 @@
 #include <kglobalsettings.h>
 #include <tdehtmldefaults.h>
 #include <kinstance.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kmessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kservice.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
diff --git a/akregator/src/akregator_view.cpp b/akregator/src/akregator_view.cpp
index 5e0809f62..07507383f 100644
--- a/akregator/src/akregator_view.cpp
+++ b/akregator/src/akregator_view.cpp
@@ -58,7 +58,7 @@
 #include "treenodevisitor.h"
 #include "notificationmanager.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
@@ -72,7 +72,7 @@
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <kpassdlg.h>
diff --git a/akregator/src/articlelistview.h b/akregator/src/articlelistview.h
index 4e2ad4ff6..caf1258bd 100644
--- a/akregator/src/articlelistview.h
+++ b/akregator/src/articlelistview.h
@@ -24,7 +24,7 @@
 #ifndef AKREGATORARTICLELISTVIEW_H
 #define AKREGATORARTICLELISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQKeyEvent;
 class TQDragObject;
diff --git a/akregator/src/articleviewer.cpp b/akregator/src/articleviewer.cpp
index 757e56eb3..1b89d87ae 100644
--- a/akregator/src/articleviewer.cpp
+++ b/akregator/src/articleviewer.cpp
@@ -27,7 +27,7 @@
 #include <tqscrollview.h>
 #include <tqvaluelist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <kglobalsettings.h>
diff --git a/akregator/src/feeditem.cpp b/akregator/src/feeditem.cpp
index da53ca16f..6571977e6 100644
--- a/akregator/src/feeditem.cpp
+++ b/akregator/src/feeditem.cpp
@@ -27,7 +27,7 @@
 #include "feeditem.h"
 
 #include <tqpopupmenu.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tqstring.h>
diff --git a/akregator/src/feedlistview.h b/akregator/src/feedlistview.h
index 4451c00fe..28d79d090 100644
--- a/akregator/src/feedlistview.h
+++ b/akregator/src/feedlistview.h
@@ -24,7 +24,7 @@
 #ifndef AKREGATORFEEDLISTVIEW_H
 #define AKREGATORFEEDLISTVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 
 namespace Akregator
diff --git a/akregator/src/folderitem.cpp b/akregator/src/folderitem.cpp
index ed33312ea..166811853 100644
--- a/akregator/src/folderitem.cpp
+++ b/akregator/src/folderitem.cpp
@@ -28,7 +28,7 @@
 #include "treenode.h"
 
 #include <tqpopupmenu.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 
 namespace Akregator {
diff --git a/akregator/src/frame.cpp b/akregator/src/frame.cpp
index 988549e97..351d35125 100644
--- a/akregator/src/frame.cpp
+++ b/akregator/src/frame.cpp
@@ -25,7 +25,7 @@
 #include <tqregexp.h>
 #include <tqstylesheet.h>
 
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <tdeparts/browserextension.h>
diff --git a/akregator/src/mainwindow.cpp b/akregator/src/mainwindow.cpp
index afe2ecbab..b4276c6d1 100644
--- a/akregator/src/mainwindow.cpp
+++ b/akregator/src/mainwindow.cpp
@@ -30,7 +30,7 @@
 
 #include <dcopclient.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
diff --git a/akregator/src/pageviewer.cpp b/akregator/src/pageviewer.cpp
index 6fb91780b..8e316d7d8 100644
--- a/akregator/src/pageviewer.cpp
+++ b/akregator/src/pageviewer.cpp
@@ -29,7 +29,7 @@
 #include "pageviewer.h"
 #include "viewer.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kbookmark.h>
 #include <kbookmarkmanager.h>
@@ -39,9 +39,9 @@
 #include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <tdeparts/browserinterface.h>
 
 #include <tqclipboard.h>
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index e2a6998c5..93897cc09 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -238,13 +238,13 @@
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
-    <includehint>kfontcombo.h</includehint>
+    <includehint>tdefontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
 </includehints>
 </UI>
diff --git a/akregator/src/simplenodeselector.cpp b/akregator/src/simplenodeselector.cpp
index d0d69e456..66ce00aea 100644
--- a/akregator/src/simplenodeselector.cpp
+++ b/akregator/src/simplenodeselector.cpp
@@ -28,7 +28,7 @@
 #include "treenode.h"
 #include "treenodevisitor.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 
 #include <tqlayout.h>
diff --git a/akregator/src/tabwidget.cpp b/akregator/src/tabwidget.cpp
index 492e440ac..6940acee1 100644
--- a/akregator/src/tabwidget.cpp
+++ b/akregator/src/tabwidget.cpp
@@ -38,7 +38,7 @@
 #include <kdebug.h>
 #include <ktabwidget.h>
 #include <ktabbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <krun.h>
 #include <klocale.h>
 #include <tdehtmlview.h>
diff --git a/akregator/src/tagaction.cpp b/akregator/src/tagaction.cpp
index d3bcce299..d517f740b 100644
--- a/akregator/src/tagaction.cpp
+++ b/akregator/src/tagaction.cpp
@@ -28,7 +28,7 @@
 
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #include <tqmap.h>
 #include <tqpopupmenu.h>
diff --git a/akregator/src/tagaction.h b/akregator/src/tagaction.h
index b869f9ecd..26abb636d 100644
--- a/akregator/src/tagaction.h
+++ b/akregator/src/tagaction.h
@@ -25,7 +25,7 @@
 #ifndef AKREGATOR_TAGACTION_H
 #define AKREGATOR_TAGACTION_H
 
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 
 class TQString;
 class TQWidget;
diff --git a/akregator/src/tagfolderitem.cpp b/akregator/src/tagfolderitem.cpp
index 68bab5a5d..de0b441d0 100644
--- a/akregator/src/tagfolderitem.cpp
+++ b/akregator/src/tagfolderitem.cpp
@@ -28,7 +28,7 @@
 #include "treenode.h"
 
 #include <tqpopupmenu.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 
 namespace Akregator {
diff --git a/akregator/src/tagnodeitem.cpp b/akregator/src/tagnodeitem.cpp
index 8697a3419..1152935c4 100644
--- a/akregator/src/tagnodeitem.cpp
+++ b/akregator/src/tagnodeitem.cpp
@@ -27,7 +27,7 @@
 #include "tagnodeitem.h"
 #include "treenode.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kiconloader.h>
 
 #include <tqpoint.h>
diff --git a/akregator/src/trayicon.cpp b/akregator/src/trayicon.cpp
index 441f1baf8..093306f61 100644
--- a/akregator/src/trayicon.cpp
+++ b/akregator/src/trayicon.cpp
@@ -33,7 +33,7 @@
 #include <kglobalsettings.h>
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kiconloader.h>
 
 #include <tqbitmap.h>
diff --git a/akregator/src/treenodeitem.h b/akregator/src/treenodeitem.h
index ca1583471..296b47812 100644
--- a/akregator/src/treenodeitem.h
+++ b/akregator/src/treenodeitem.h
@@ -25,7 +25,7 @@
 #ifndef AKREGATORTREENODEITEM_H
 #define AKREGATORTREENODEITEM_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 class TQPoint;
 class TQString;
diff --git a/akregator/src/viewer.cpp b/akregator/src/viewer.cpp
index 57afb3ec2..70a2d5cf4 100644
--- a/akregator/src/viewer.cpp
+++ b/akregator/src/viewer.cpp
@@ -23,14 +23,14 @@
     without including the source code for TQt in the source distribution.
 */
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <tdefiledialog.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kshell.h>
-- 
cgit v1.2.1