From 2fb700f92bb787fab0845a63a541cd5640daa449 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:18:13 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 parts/documentation/CMakeLists.txt            | 2 +-
 parts/documentation/bookmarkview.cpp          | 4 ++--
 parts/documentation/docglobalconfigwidget.cpp | 4 ++--
 parts/documentation/documentation_part.cpp    | 4 ++--
 parts/documentation/documentation_widget.cpp  | 2 +-
 parts/documentation/interfaces/Makefile.am    | 2 +-
 parts/documentation/protocols/chm/Makefile.am | 2 +-
 parts/documentation/protocols/chm/kchmpart.h  | 8 ++++----
 parts/documentation/tools/htdig/Makefile.am   | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'parts/documentation')

diff --git a/parts/documentation/CMakeLists.txt b/parts/documentation/CMakeLists.txt
index 0fa6cdca..accc3401 100644
--- a/parts/documentation/CMakeLists.txt
+++ b/parts/documentation/CMakeLists.txt
@@ -53,6 +53,6 @@ tde_add_kpart( libkdevdocumentation AUTOMOC
     docprojectconfigwidget.cpp KDevDocumentationIface.cpp
     KDevDocumentationIface.skel addcatalogdlgbase.ui
     addcatalogdlg.cpp
-  LINK documentation_interfaces-shared tdevelop-shared khtml-shared
+  LINK documentation_interfaces-shared tdevelop-shared tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp
index 6ee782ee..0ca74f43 100644
--- a/parts/documentation/bookmarkview.cpp
+++ b/parts/documentation/bookmarkview.cpp
@@ -30,8 +30,8 @@
 #include <kpushbutton.h>
 #include <kurlrequester.h>
 #include <kpopupmenu.h>
-#include <kparts/part.h>
-#include <khtml_part.h>
+#include <tdeparts/part.h>
+#include <tdehtml_part.h>
 #include <dom/html_document.h>
 
 #include <kdevpartcontroller.h>
diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp
index 0b04548d..21fc1b5b 100644
--- a/parts/documentation/docglobalconfigwidget.cpp
+++ b/parts/documentation/docglobalconfigwidget.cpp
@@ -35,8 +35,8 @@
 #include <kapplication.h>
 #include <kurlrequester.h>
 #include <kfontcombo.h>
-#include <khtml_part.h>
-#include <khtml_settings.h>
+#include <tdehtml_part.h>
+#include <tdehtml_settings.h>
 
 #include "kdevdocumentationplugin.h"
 #include "kdevpartcontroller.h"
diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp
index 32b08323..77b4e6b2 100644
--- a/parts/documentation/documentation_part.cpp
+++ b/parts/documentation/documentation_part.cpp
@@ -35,7 +35,7 @@
 #include <klocale.h>
 #include <ktrader.h>
 #include <kdebug.h>
-#include <kparts/componentfactory.h>
+#include <tdeparts/componentfactory.h>
 #include <kservice.h>
 #include <kdialogbase.h>
 #include <kaction.h>
@@ -46,7 +46,7 @@
 #include <kstringhandler.h>
 #include <kconfig.h>
 #include <twin.h>
-#include <ktexteditor/document.h>
+#include <tdetexteditor/document.h>
 
 #include "kdevplugininfo.h"
 #include "kdevcore.h"
diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp
index 84d8eada..567237e2 100644
--- a/parts/documentation/documentation_widget.cpp
+++ b/parts/documentation/documentation_widget.cpp
@@ -23,7 +23,7 @@
 #include <tqtoolbox.h>
 
 #include <klineedit.h>
-#include <kparts/part.h>
+#include <tdeparts/part.h>
 #include <klibloader.h>
 #include <kurl.h>
 #include <klocale.h>
diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am
index 93f5e7a0..6e66b46c 100644
--- a/parts/documentation/interfaces/Makefile.am
+++ b/parts/documentation/interfaces/Makefile.am
@@ -10,7 +10,7 @@ partincludedir_HEADERS = kdevdocumentationplugin.h
 servicetypedir = $(kde_servicetypesdir)
 servicetype_DATA = tdevelopdocumentationplugins.desktop
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils kdevutil kdevinterfaces
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils kdevutil kdevinterfaces
 DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library
 DOXYGEN_DOCDIRPREFIX = kdevdoc
 include ../../../Doxyfile.am
diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am
index eba29efd..d68f20bd 100644
--- a/parts/documentation/protocols/chm/Makefile.am
+++ b/parts/documentation/protocols/chm/Makefile.am
@@ -9,7 +9,7 @@ kio_chm_la_LIBADD = $(LIB_KIO)
 kio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
 libkchmpart_la_SOURCES = kchmpart.cpp
-libkchmpart_la_LIBADD = -lkhtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
+libkchmpart_la_LIBADD = -ltdehtml $(LIB_KPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la
 libkchmpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
 
 noinst_HEADERS = chm.h chmfile.h decompress.h kchmpart.h
diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h
index 1ec2eaf8..f8779d75 100644
--- a/parts/documentation/protocols/chm/kchmpart.h
+++ b/parts/documentation/protocols/chm/kchmpart.h
@@ -17,10 +17,10 @@
 #ifndef __kchmpart_h__
 #define __kchmpart_h__
 
-#include <kparts/factory.h>
-#include <kparts/part.h>
-#include <kparts/browserextension.h>
-#include <khtml_part.h>
+#include <tdeparts/factory.h>
+#include <tdeparts/part.h>
+#include <tdeparts/browserextension.h>
+#include <tdehtml_part.h>
 #include <kio/job.h>
 #include <kio/jobclasses.h>
 #include <kdevhtmlpart.h>
diff --git a/parts/documentation/tools/htdig/Makefile.am b/parts/documentation/tools/htdig/Makefile.am
index b46c07e7..303ff645 100644
--- a/parts/documentation/tools/htdig/Makefile.am
+++ b/parts/documentation/tools/htdig/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes)
 METASOURCES = AUTO
 bin_PROGRAMS =  tdevelop-htdig
-tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdevelop_htdig_LDFLAGS = $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 tdevelop_htdig_SOURCES = htdigindex.cpp
 noinst_HEADERS =  htdigindex.h
-- 
cgit v1.2.3