Rename kiobuffer and KHTML

acinclude.m4

@@ -2099,7 +2099,7 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
@@ -2120,7 +2120,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_TDEPRINT, "-ltdeprint")

aclocal.m4

@@ -2111,7 +2111,7 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_KABC, "-lkabc")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")
@@ -2132,7 +2132,7 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_SMB, "-lsmb")
    AC_SUBST(LIB_KFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
-   AC_SUBST(LIB_KHTML, "-ltdehtml")
+   AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
    AC_SUBST(LIB_KPARTS, "-ltdeparts")
    AC_SUBST(LIB_KDEPRINT, "-lkdeprint")

cmake

@@ -1 +1 @@
-Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d
+Subproject commit 274366fb8b90704586d7beef216b765cc0688b08

plugins/infowidget/Makefile.am

@@ -11,7 +11,7 @@ ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \
 
 # Libs needed by the plugin
 ktinfowidgetplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
-			   $(LIB_KHTML) $(LIB_KPARTS) $(LIB_QT) \
+			   $(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_QT) \
 			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
 
 

plugins/ipfilter/Makefile.am

@@ -8,7 +8,7 @@ ktipfilterplugin_la_SOURCES = ipfilterplugin.cpp ipblockingpref.ui \
 	convertdialog.cpp
 
 # Libs needed by the plugin
-ktipfilterplugin_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) \
+ktipfilterplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_KPARTS) \
 	../../libktorrent/libktorrent.la $(LIB_QT) \
 	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
 

plugins/logviewer/Makefile.am

@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = ktlogviewerplugin.la
 
 
 # Libs needed by the plugin
-ktlogviewerplugin_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) \
+ktlogviewerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_KPARTS) \
 	../../libktorrent/libktorrent.la $(LIB_QT) \
 	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
 

plugins/partfileimport/Makefile.am

@@ -6,7 +6,7 @@ noinst_HEADERS = partfileimportplugin.h importdialog.h
 ktpartfileimportplugin_la_SOURCES = partfileimportplugin.cpp importdlgbase.ui importdialog.cpp
 
 # Libs needed by the plugin
-ktpartfileimportplugin_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) \
+ktpartfileimportplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_KPARTS) \
 	../../libktorrent/libktorrent.la \
 	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
 

plugins/rssfeed/Makefile.am

@@ -24,7 +24,7 @@ noinst_HEADERS = rssfeedplugin.h rssfeedmanager.h rssfeed.h rssfilter.h \
 ktrssfeedplugin_la_SOURCES = rssfeedplugin.cpp rssfeedmanager.cpp \
 			rssfeedwidget.ui rssfeed.cpp rssfilter.cpp rssarticle.cpp rsslinkdownloader.cpp
 ktrssfeedplugin_la_LIBADD = $(LIB_KIO) $(LIB_QT) rss/librsslocal.la \
-	../../libktorrent/libktorrent.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS)
+	../../libktorrent/libktorrent.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_KPARTS)
 
 SUBDIRS = rss
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)

plugins/scheduler/Makefile.am

@@ -8,7 +8,7 @@ ktschedulerplugin_la_SOURCES = schedulerplugin.cpp \
 	bwsprefpagewidget.cpp bwswidget.cpp schedulerprefpage.cpp
 
 # Libs needed by the plugin
-ktschedulerplugin_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) \
+ktschedulerplugin_la_LIBADD = $(LIB_TDEHTML) $(LIB_KPARTS) \
 	../../libktorrent/libktorrent.la \
 	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
 

plugins/search/Makefile.am

@@ -8,7 +8,7 @@ ktsearchplugin_la_SOURCES = searchplugin.cpp htmlpart.cpp searchbar.ui \
 
 # Libs needed by the plugin
 ktsearchplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
-			   $(LIB_KHTML) $(LIB_KPARTS) $(LIB_QT) \
+			   $(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_QT) \
 			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
 
 # LD flags for the plugin

plugins/search/htmlpart.cpp

@@ -37,7 +37,7 @@ namespace kt
 {
 	
 	HTMLPart::HTMLPart(TQWidget *parent)
-			: KHTMLPart(parent)
+			: TDEHTMLPart(parent)
 	{
 		setJScriptEnabled(true);
 		setJavaEnabled(true);

plugins/search/htmlpart.h

@@ -34,7 +34,7 @@ namespace kt
 	/**
 	@author Joris Guisson
 	*/
-	class HTMLPart : public KHTMLPart
+	class HTMLPart : public TDEHTMLPart
 	{
 		Q_OBJECT
   

plugins/search/searchwidget.cpp

@@ -140,7 +140,7 @@ namespace kt
 	
 	void SearchWidget::onFrameAdded(KParts::Part* p)
 	{
-		KHTMLPart* frame = dynamic_cast<KHTMLPart*>(p);
+		TDEHTMLPart* frame = dynamic_cast<TDEHTMLPart*>(p);
 		if (frame)
 		{
 			connect(frame,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )),

plugins/search/searchwidget.h

@@ -43,7 +43,7 @@ namespace kt
 	/**
 		@author Joris Guisson
 		
-		Widget which shows a KHTML window with the users search in it
+		Widget which shows a TDEHTML window with the users search in it
 	*/
 	class SearchWidget : public TQWidget
 	{

plugins/webinterface/Makefile.am

@@ -11,7 +11,7 @@ ktwebinterfaceplugin_la_SOURCES = webinterfaceplugin.cpp httpserver.cpp \
 		httpclienthandler.cpp httpresponseheader.cpp
 # Libs needed by the plugin
 ktwebinterfaceplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
-			   $(LIB_KHTML) $(LIB_KPARTS) $(LIB_QT) \
+			   $(LIB_TDEHTML) $(LIB_KPARTS) $(LIB_QT) \
 			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
 
 # LD flags for the plugin