From 4eb973efdbdbae1f12f605eded95fe25c0bcee04 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 20:58:31 -0600 Subject: Rename kiobuffer and KHTML --- acinclude.m4 | 4 ++-- aclocal.m4 | 4 ++-- cmake | 2 +- plugins/infowidget/Makefile.am | 2 +- plugins/ipfilter/Makefile.am | 2 +- plugins/logviewer/Makefile.am | 2 +- plugins/partfileimport/Makefile.am | 2 +- plugins/rssfeed/Makefile.am | 2 +- plugins/scheduler/Makefile.am | 2 +- plugins/search/Makefile.am | 2 +- plugins/search/htmlpart.cpp | 2 +- plugins/search/htmlpart.h | 2 +- plugins/search/searchwidget.cpp | 2 +- plugins/search/searchwidget.h | 2 +- plugins/webinterface/Makefile.am | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 657f827..2413bad 100644 --- a/acinclude.m4 +++ b/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") diff --git a/aclocal.m4 b/aclocal.m4 index 2b5e01e..8d0a3aa 100644 --- a/aclocal.m4 +++ b/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") diff --git a/cmake b/cmake index 9a21790..274366f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 9a217903f9fa35ca12213a6e9ee3d2cb87d1131d +Subproject commit 274366fb8b90704586d7beef216b765cc0688b08 diff --git a/plugins/infowidget/Makefile.am b/plugins/infowidget/Makefile.am index 21c98bb..10775f4 100644 --- a/plugins/infowidget/Makefile.am +++ b/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) diff --git a/plugins/ipfilter/Makefile.am b/plugins/ipfilter/Makefile.am index e54fcfc..4e78aba 100644 --- a/plugins/ipfilter/Makefile.am +++ b/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) diff --git a/plugins/logviewer/Makefile.am b/plugins/logviewer/Makefile.am index 3e59091..2c7f150 100644 --- a/plugins/logviewer/Makefile.am +++ b/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) diff --git a/plugins/partfileimport/Makefile.am b/plugins/partfileimport/Makefile.am index 86d6248..ec902f3 100644 --- a/plugins/partfileimport/Makefile.am +++ b/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) diff --git a/plugins/rssfeed/Makefile.am b/plugins/rssfeed/Makefile.am index 759af54..37faf75 100644 --- a/plugins/rssfeed/Makefile.am +++ b/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) diff --git a/plugins/scheduler/Makefile.am b/plugins/scheduler/Makefile.am index b1d352a..85d292d 100644 --- a/plugins/scheduler/Makefile.am +++ b/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) diff --git a/plugins/search/Makefile.am b/plugins/search/Makefile.am index 396a196..1cbb3ef 100644 --- a/plugins/search/Makefile.am +++ b/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 diff --git a/plugins/search/htmlpart.cpp b/plugins/search/htmlpart.cpp index 1ce0d5d..3179650 100644 --- a/plugins/search/htmlpart.cpp +++ b/plugins/search/htmlpart.cpp @@ -37,7 +37,7 @@ namespace kt { HTMLPart::HTMLPart(TQWidget *parent) - : KHTMLPart(parent) + : TDEHTMLPart(parent) { setJScriptEnabled(true); setJavaEnabled(true); diff --git a/plugins/search/htmlpart.h b/plugins/search/htmlpart.h index b1b9273..091c82f 100644 --- a/plugins/search/htmlpart.h +++ b/plugins/search/htmlpart.h @@ -34,7 +34,7 @@ namespace kt /** @author Joris Guisson */ - class HTMLPart : public KHTMLPart + class HTMLPart : public TDEHTMLPart { Q_OBJECT diff --git a/plugins/search/searchwidget.cpp b/plugins/search/searchwidget.cpp index 6ae19a9..61f871a 100644 --- a/plugins/search/searchwidget.cpp +++ b/plugins/search/searchwidget.cpp @@ -140,7 +140,7 @@ namespace kt void SearchWidget::onFrameAdded(KParts::Part* p) { - KHTMLPart* frame = dynamic_cast(p); + TDEHTMLPart* frame = dynamic_cast(p); if (frame) { connect(frame,TQT_SIGNAL(popupMenu(const TQString&, const TQPoint& )), diff --git a/plugins/search/searchwidget.h b/plugins/search/searchwidget.h index e7d14d6..c48be71 100644 --- a/plugins/search/searchwidget.h +++ b/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 { diff --git a/plugins/webinterface/Makefile.am b/plugins/webinterface/Makefile.am index 7243dcc..0fee620 100644 --- a/plugins/webinterface/Makefile.am +++ b/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 -- cgit v1.2.1