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

---
 tdehtml/domtreeview.h               | 2 +-
 tdehtml/ecma/kjs_debugwin.cpp       | 8 ++++----
 tdehtml/ecma/kjs_debugwin.h         | 2 +-
 tdehtml/misc/knsplugininstaller.cpp | 2 +-
 tdehtml/rendering/render_form.h     | 2 +-
 tdehtml/tdehtml_ext.cpp             | 4 ++--
 tdehtml/tdehtml_ext.h               | 2 +-
 tdehtml/tdehtml_part.cpp            | 2 +-
 tdehtml/tdehtmlpart_p.h             | 2 +-
 tdehtml/tdehtmlview.cpp             | 2 +-
 tdehtml/test_regression.cpp         | 4 ++--
 tdehtml/testtdehtml.cpp             | 4 ++--
 12 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'tdehtml')

diff --git a/tdehtml/domtreeview.h b/tdehtml/domtreeview.h
index a0f5d942a..4156f083a 100644
--- a/tdehtml/domtreeview.h
+++ b/tdehtml/domtreeview.h
@@ -18,7 +18,7 @@
 #ifndef DOMTREEVIEW_H
 #define DOMTREEVIEW_H
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <tqlistview.h>
 #include <tqptrdict.h>
diff --git a/tdehtml/ecma/kjs_debugwin.cpp b/tdehtml/ecma/kjs_debugwin.cpp
index ac78526ae..c57b26c7b 100644
--- a/tdehtml/ecma/kjs_debugwin.cpp
+++ b/tdehtml/ecma/kjs_debugwin.cpp
@@ -47,12 +47,12 @@
 #include <kglobal.h>
 #include <kmessagebox.h>
 #include <kguiitem.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kmenubar.h>
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kglobalsettings.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <tdeconfig.h>
 #include <tdeconfigbase.h>
 #include <kapplication.h>
diff --git a/tdehtml/ecma/kjs_debugwin.h b/tdehtml/ecma/kjs_debugwin.h
index af205d654..be6b31dda 100644
--- a/tdehtml/ecma/kjs_debugwin.h
+++ b/tdehtml/ecma/kjs_debugwin.h
@@ -34,7 +34,7 @@
 #include <tqptrstack.h>
 #include <tqcheckbox.h>
 #include <kdialogbase.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqscrollview.h>
 
 #include <kjs/debugger.h>
diff --git a/tdehtml/misc/knsplugininstaller.cpp b/tdehtml/misc/knsplugininstaller.cpp
index 3a0146547..0edcc34ea 100644
--- a/tdehtml/misc/knsplugininstaller.cpp
+++ b/tdehtml/misc/knsplugininstaller.cpp
@@ -25,7 +25,7 @@
 
 #include <kdebug.h>
 #include <kdiroperator.h> 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klocale.h>
 #include <kstddirs.h>
 #include <ktempfile.h> 
diff --git a/tdehtml/rendering/render_form.h b/tdehtml/rendering/render_form.h
index 7543b9e90..d6124528d 100644
--- a/tdehtml/rendering/render_form.h
+++ b/tdehtml/rendering/render_form.h
@@ -41,7 +41,7 @@ class QListboxItem;
 #include <tqradiobutton.h>
 #include <tqpushbutton.h>
 #include <tqhbox.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include "dom/dom_misc.h"
 
diff --git a/tdehtml/tdehtml_ext.cpp b/tdehtml/tdehtml_ext.cpp
index 72576e91e..fe9763b0e 100644
--- a/tdehtml/tdehtml_ext.cpp
+++ b/tdehtml/tdehtml_ext.cpp
@@ -48,8 +48,8 @@
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <kprocess.h>
-#include <ktoolbarbutton.h>
-#include <ktoolbar.h>
+#include <tdetoolbarbutton.h>
+#include <tdetoolbar.h>
 #include <ksavefile.h>
 #include <kurldrag.h>
 #include <kstringhandler.h>
diff --git a/tdehtml/tdehtml_ext.h b/tdehtml/tdehtml_ext.h
index 165cedb0e..7cea57956 100644
--- a/tdehtml/tdehtml_ext.h
+++ b/tdehtml/tdehtml_ext.h
@@ -31,7 +31,7 @@
 
 #include <tqguardedptr.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeio/global.h>
 
 /**
diff --git a/tdehtml/tdehtml_part.cpp b/tdehtml/tdehtml_part.cpp
index caa55ae61..9f771268e 100644
--- a/tdehtml/tdehtml_part.cpp
+++ b/tdehtml/tdehtml_part.cpp
@@ -115,7 +115,7 @@ using namespace DOM;
 
 #include "tdehtmlpart_p.h"
 #include "kpassivepopup.h"
-#include "kpopupmenu.h"
+#include "tdepopupmenu.h"
 #include "rendering/render_form.h"
 #include <twin.h>
 
diff --git a/tdehtml/tdehtmlpart_p.h b/tdehtml/tdehtmlpart_p.h
index 149483493..de99c9400 100644
--- a/tdehtml/tdehtmlpart_p.h
+++ b/tdehtml/tdehtmlpart_p.h
@@ -29,7 +29,7 @@
 #include <kcursor.h>
 #include <klibloader.h>
 #include <kxmlguifactory.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeparts/partmanager.h>
 #include <tdeparts/statusbarextension.h>
 #include <tdeparts/browserextension.h>
diff --git a/tdehtml/tdehtmlview.cpp b/tdehtml/tdehtmlview.cpp
index 049ac0073..6bd3ff8a5 100644
--- a/tdehtml/tdehtmlview.cpp
+++ b/tdehtml/tdehtmlview.cpp
@@ -72,7 +72,7 @@
 #include <kprinter.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 #include <kstringhandler.h>
 #include <kurldrag.h>
 
diff --git a/tdehtml/test_regression.cpp b/tdehtml/test_regression.cpp
index 88a662eb6..3e1e14d8c 100644
--- a/tdehtml/test_regression.cpp
+++ b/tdehtml/test_regression.cpp
@@ -59,11 +59,11 @@
 #define HTML_DEFAULT_VIEW_FANTASY_FONT "helvetica"
 
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcmdlineargs.h>
 #include "tdehtml_factory.h"
 #include <tdeio/job.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <ksimpleconfig.h>
 #include <kglobalsettings.h>
 
diff --git a/tdehtml/testtdehtml.cpp b/tdehtml/testtdehtml.cpp
index e9d1cd4e1..78ae83203 100644
--- a/tdehtml/testtdehtml.cpp
+++ b/tdehtml/testtdehtml.cpp
@@ -26,9 +26,9 @@
 #include "css/cssstyleselector.h"
 #include "html/html_imageimpl.h"
 #include "rendering/render_style.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kcmdlineargs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include "domtreeview.h"
 #include <tdefiledialog.h>
 
-- 
cgit v1.2.3