From a5a7573f3597f76e3cf9ebfb5a38416906289ff3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 21:01:57 -0600 Subject: Rename kiobuffer and KHTML --- konq-plugins/akregator/Makefile.am | 4 ++-- konq-plugins/akregator/akregatorplugin.cpp | 6 +++--- konq-plugins/akregator/akregatorplugin.h | 4 ++-- konq-plugins/akregator/konqfeedicon.cpp | 2 +- konq-plugins/akregator/konqfeedicon.h | 4 ++-- konq-plugins/akregator/pluginbase.h | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'konq-plugins/akregator') diff --git a/konq-plugins/akregator/Makefile.am b/konq-plugins/akregator/Makefile.am index 1be20ad..a0ef668 100644 --- a/konq-plugins/akregator/Makefile.am +++ b/konq-plugins/akregator/Makefile.am @@ -6,11 +6,11 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libakregatorkonqplugin.la libakregatorkonqfeedicon.la libakregatorkonqplugin_la_SOURCES = akregatorplugin.cpp pluginbase.cpp -libakregatorkonqplugin_la_LIBADD = -lkonq $(LIB_KHTML) +libakregatorkonqplugin_la_LIBADD = -lkonq $(LIB_TDEHTML) libakregatorkonqplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -avoid-version -no-undefined $(all_libraries) libakregatorkonqfeedicon_la_SOURCES = konqfeedicon.cpp feeddetector.cpp pluginbase.cpp -libakregatorkonqfeedicon_la_LIBADD = -lkonq $(LIB_KHTML) +libakregatorkonqfeedicon_la_LIBADD = -lkonq $(LIB_TDEHTML) libakregatorkonqfeedicon_la_LDFLAGS = -module $(KDE_PLUGIN) -avoid-version -no-undefined $(all_libraries) konqplugindir = $(kde_servicesdir) diff --git a/konq-plugins/akregator/akregatorplugin.cpp b/konq-plugins/akregator/akregatorplugin.cpp index 6c4d0ff..f798a27 100644 --- a/konq-plugins/akregator/akregatorplugin.cpp +++ b/konq-plugins/akregator/akregatorplugin.cpp @@ -63,10 +63,10 @@ AkregatorMenu::AkregatorMenu( KonqPopupMenu * popupmenu, const char *name, const return; */ - KHTMLView* view = 0L; + TDEHTMLView* view = 0L; - if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("KHTMLView")) - view = static_cast(TQT_TQWIDGET(popupmenu->parent())); + if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("TDEHTMLView")) + view = static_cast(TQT_TQWIDGET(popupmenu->parent())); if (view) m_part = view->part(); diff --git a/konq-plugins/akregator/akregatorplugin.h b/konq-plugins/akregator/akregatorplugin.h index ee99306..fd4267d 100644 --- a/konq-plugins/akregator/akregatorplugin.h +++ b/konq-plugins/akregator/akregatorplugin.h @@ -28,7 +28,7 @@ #include "pluginbase.h" class KAction; -class KHTMLPart; +class TDEHTMLPart; namespace Akregator { @@ -51,7 +51,7 @@ protected: private: TQStringList m_feedMimeTypes; TDEConfig *m_conf; - KHTMLPart *m_part; + TDEHTMLPart *m_part; TQString m_feedURL; }; diff --git a/konq-plugins/akregator/konqfeedicon.cpp b/konq-plugins/akregator/konqfeedicon.cpp index 07006b6..a888c6e 100644 --- a/konq-plugins/akregator/konqfeedicon.cpp +++ b/konq-plugins/akregator/konqfeedicon.cpp @@ -60,7 +60,7 @@ KonqFeedIcon::KonqFeedIcon(TQObject *parent, const char *name, const TQStringLis { TDEGlobal::locale()->insertCatalogue("akregator_konqplugin"); - m_part = dynamic_cast(parent); + m_part = dynamic_cast(parent); if(!m_part) { kdDebug() << "couldn't get part" << endl; return; } // FIXME: need to do this because of a bug in tdehtmlpart, it's fixed now for 3.4 (and prolly backported for 3.3.3?) //connect(m_part->view(), TQT_SIGNAL(finishedLayout()), this, TQT_SLOT(addFeedIcon())); diff --git a/konq-plugins/akregator/konqfeedicon.h b/konq-plugins/akregator/konqfeedicon.h index 3bcaa38..d186e08 100644 --- a/konq-plugins/akregator/konqfeedicon.h +++ b/konq-plugins/akregator/konqfeedicon.h @@ -35,7 +35,7 @@ @author Teemu Rytilahti */ class KURLLabel; -class KHTMLPart; +class TDEHTMLPart; class TQStringList; namespace KParts { @@ -59,7 +59,7 @@ private: */ bool feedFound(); - TQGuardedPtr m_part; + TQGuardedPtr m_part; KURLLabel *m_feedIcon; KParts::StatusBarExtension *m_statusBarEx; FeedDetectorEntryList m_feedList; diff --git a/konq-plugins/akregator/pluginbase.h b/konq-plugins/akregator/pluginbase.h index 64e1853..2b9f998 100644 --- a/konq-plugins/akregator/pluginbase.h +++ b/konq-plugins/akregator/pluginbase.h @@ -26,7 +26,7 @@ #define PLUGINBASE_H class FeedDetectorEntry; -class KHTMLPart; +class TDEHTMLPart; class TQString; class TQStringList; -- cgit v1.2.1