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

---
 khelpcenter/fontdialog.cpp    | 2 +-
 khelpcenter/glossary.cpp      | 2 +-
 khelpcenter/glossary.h        | 2 +-
 khelpcenter/history.cpp       | 6 +++---
 khelpcenter/infotree.cpp      | 2 +-
 khelpcenter/kcmhelpcenter.cpp | 2 +-
 khelpcenter/mainwindow.cpp    | 4 ++--
 khelpcenter/mainwindow.h      | 2 +-
 khelpcenter/navigator.cpp     | 4 ++--
 khelpcenter/navigator.h       | 2 +-
 khelpcenter/view.cpp          | 6 +++---
 11 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'khelpcenter')

diff --git a/khelpcenter/fontdialog.cpp b/khelpcenter/fontdialog.cpp
index 9bea68004..1f0df4530 100644
--- a/khelpcenter/fontdialog.cpp
+++ b/khelpcenter/fontdialog.cpp
@@ -23,7 +23,7 @@
 #include <kcharsets.h>
 #include <kcombobox.h>
 #include <tdeconfig.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <tdehtmldefaults.h>
 #include <klocale.h>
 #include <knuminput.h>
diff --git a/khelpcenter/glossary.cpp b/khelpcenter/glossary.cpp
index e1f6aaa73..3f8fc50ed 100644
--- a/khelpcenter/glossary.cpp
+++ b/khelpcenter/glossary.cpp
@@ -25,7 +25,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
 #include <kstatusbar.h>
diff --git a/khelpcenter/glossary.h b/khelpcenter/glossary.h
index e0d9fd901..616c51b86 100644
--- a/khelpcenter/glossary.h
+++ b/khelpcenter/glossary.h
@@ -20,7 +20,7 @@
 #ifndef KHC_GLOSSARY_H
 #define KHC_GLOSSARY_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqdict.h>
 #include <tqdom.h>
diff --git a/khelpcenter/history.cpp b/khelpcenter/history.cpp
index 1a5218da2..c15ce6811 100644
--- a/khelpcenter/history.cpp
+++ b/khelpcenter/history.cpp
@@ -20,11 +20,11 @@
 #include "history.h"
 #include "view.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
-#include <kmainwindow.h>
-#include <kpopupmenu.h>
+#include <tdemainwindow.h>
+#include <tdepopupmenu.h>
 #include <kstdguiitem.h>
 #include <kstringhandler.h>
 
diff --git a/khelpcenter/infotree.cpp b/khelpcenter/infotree.cpp
index 0e8e5875b..4b9c3087c 100644
--- a/khelpcenter/infotree.cpp
+++ b/khelpcenter/infotree.cpp
@@ -27,7 +27,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
diff --git a/khelpcenter/kcmhelpcenter.cpp b/khelpcenter/kcmhelpcenter.cpp
index 12646c330..303dbfec5 100644
--- a/khelpcenter/kcmhelpcenter.cpp
+++ b/khelpcenter/kcmhelpcenter.cpp
@@ -39,7 +39,7 @@
 #include <ktempfile.h>
 #include <kurlrequester.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <tqlayout.h>
 #include <tqpushbutton.h>
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp
index c5b4932b6..f8d02f186 100644
--- a/khelpcenter/mainwindow.cpp
+++ b/khelpcenter/mainwindow.cpp
@@ -37,9 +37,9 @@
 #include <kdebug.h>
 #include <tdehtmlview.h>
 #include <tdehtml_settings.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstatusbar.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kdialogbase.h>
 
 #include <tqsplitter.h>
diff --git a/khelpcenter/mainwindow.h b/khelpcenter/mainwindow.h
index 698e0150f..795b6e13c 100644
--- a/khelpcenter/mainwindow.h
+++ b/khelpcenter/mainwindow.h
@@ -3,7 +3,7 @@
 
 #include <tqptrlist.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tdeio/job.h>
 #include <kurl.h>
 #include <tdeparts/browserextension.h>
diff --git a/khelpcenter/navigator.cpp b/khelpcenter/navigator.cpp
index eb5e0c4f7..55809904a 100644
--- a/khelpcenter/navigator.cpp
+++ b/khelpcenter/navigator.cpp
@@ -37,14 +37,14 @@
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kmessagebox.h>
 #include <kiconloader.h>
 #include <kprocio.h>
diff --git a/khelpcenter/navigator.h b/khelpcenter/navigator.h
index fef806e21..f91de4327 100644
--- a/khelpcenter/navigator.h
+++ b/khelpcenter/navigator.h
@@ -23,7 +23,7 @@
 
 #include "glossary.h"
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kurl.h>
 
 #include <tqfile.h>
diff --git a/khelpcenter/view.cpp b/khelpcenter/view.cpp
index c4bf2c182..8be813619 100644
--- a/khelpcenter/view.cpp
+++ b/khelpcenter/view.cpp
@@ -5,14 +5,14 @@
 
 #include <dom/html_document.h>
 #include <dom/html_misc.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdehtml_settings.h>
 #include <tdehtmlview.h>
 #include <klocale.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
 #include <tqfileinfo.h>
-- 
cgit v1.2.1