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

---
 lib/widgets/CMakeLists.txt         | 2 +-
 lib/widgets/Makefile.am            | 2 +-
 lib/widgets/kdevhtmlpart.cpp       | 4 ++--
 lib/widgets/kdevhtmlpart.h         | 2 +-
 lib/widgets/propeditor/Makefile.am | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/widgets')

diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt
index b819bc91..d7e92092 100644
--- a/lib/widgets/CMakeLists.txt
+++ b/lib/widgets/CMakeLists.txt
@@ -47,6 +47,6 @@ tde_add_library( kdevwidgets SHARED AUTOMOC
     processlinemaker.cpp processwidget.cpp ksavealldialog.cpp
     fancylistviewitem.cpp
   VERSION 0.0.0
-  LINK kio-shared khtml-shared
+  LINK kio-shared tdehtml-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am
index f42447e7..ecf57f7f 100644
--- a/lib/widgets/Makefile.am
+++ b/lib/widgets/Makefile.am
@@ -24,7 +24,7 @@ rcdir = $(kde_datadir)/tdevelop
 
 rc_DATA =  kdevhtml_partui.rc
 
-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 Widgets Library
 DOXYGEN_DOCDIRPREFIX = kdev
 include ../../Doxyfile.am
diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp
index abbeebbc..85990989 100644
--- a/lib/widgets/kdevhtmlpart.cpp
+++ b/lib/widgets/kdevhtmlpart.cpp
@@ -10,8 +10,8 @@
 #include <kpopupmenu.h>
 #include <kiconloader.h>
 #include <kmainwindow.h>
-#include <khtmlview.h>
-#include <khtml_settings.h>
+#include <tdehtmlview.h>
+#include <tdehtml_settings.h>
 #include <kconfig.h>
 
 #include <kdevmainwindow.h>
diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h
index 805134a0..13f155a5 100644
--- a/lib/widgets/kdevhtmlpart.h
+++ b/lib/widgets/kdevhtmlpart.h
@@ -5,7 +5,7 @@
 
 #include <tqdatetime.h>
 
-#include <khtml_part.h>
+#include <tdehtml_part.h>
 
 /**
 @file kdevhtmlpart.h
diff --git a/lib/widgets/propeditor/Makefile.am b/lib/widgets/propeditor/Makefile.am
index 00bc07ca..0c037873 100644
--- a/lib/widgets/propeditor/Makefile.am
+++ b/lib/widgets/propeditor/Makefile.am
@@ -13,6 +13,6 @@ pcolorcombo.cpp    pdoublenuminput.cpp  ppixmapedit.cpp   propertylist.cpp    ps
 kdevpropeditorincludedir = $(includedir)/tdevelop/propeditor
 kdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h
 
-DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui khtml kmdi kio kjs kparts kutils
+DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi kio kjs tdeparts tdeutils
 DOXYGEN_PROJECTNAME = KDevelop Property Editing Library
 include ../../../Doxyfile.am
-- 
cgit v1.2.3