diff options
Diffstat (limited to 'konq-plugins')
68 files changed, 247 insertions, 247 deletions
diff --git a/konq-plugins/README b/konq-plugins/README index cca458b..cf6bf6f 100644 --- a/konq-plugins/README +++ b/konq-plugins/README @@ -4,7 +4,7 @@ This module contains plugins that interact with Konqueror. babelfish ------------------- -This works on KHTMLPart. It uses AltaVista's BabelFish site to +This works on TDEHTMLPart. It uses AltaVista's BabelFish site to translate the current page to whatever language you want (within reason). @@ -19,17 +19,17 @@ Displays the document object model (DOM) in a dialog box. htmlvalidator ------------------- -This works on KHTMLPart. It uses the w3c HTML validator to validate +This works on TDEHTMLPart. It uses the w3c HTML validator to validate the current page. This is very handy when creating web pages. cssvalidator ------------------- -This works on KHTMLPart. It uses the w3c HTML validator to validate +This works on TDEHTMLPart. It uses the w3c HTML validator to validate the current page. This is very handy when debugging Cascading Style Sheets. tdehtmlsettingsplugin ------------------- -This works on KHTMLPart. This allows you to enable or disable a bunch +This works on TDEHTMLPart. This allows you to enable or disable a bunch of HTML settings without going through the settings dialog. kimgalleryplugin @@ -39,7 +39,7 @@ all the images in the current directory. uachanger ------------------- -This works on KHTMLPart. It allows you to change the user agent +This works on TDEHTMLPart. It allows you to change the user agent without going through the settings dialog. kuick @@ -77,7 +77,7 @@ This lets you quickly archive or unarchive files from Konqueror, using Ark akregator ------------------- -This works on KHTMLPart and allows you to add feeds to Akregator directly from Konqueror. +This works on TDEHTMLPart and allows you to add feeds to Akregator directly from Konqueror. mediarealfolder ------------------- diff --git a/konq-plugins/adblock/Makefile.am b/konq-plugins/adblock/Makefile.am index da54f2b..3e7156d 100644 --- a/konq-plugins/adblock/Makefile.am +++ b/konq-plugins/adblock/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libadblock.la libadblock_la_SOURCES = adblock.cpp adblockdialogue.cpp -libadblock_la_LIBADD = $(LIB_KHTML) -lkonq +libadblock_la_LIBADD = $(LIB_TDEHTML) -lkonq libadblock_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) pluginsdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index d62eae5..07dbede 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -60,8 +60,8 @@ AdBlock::AdBlock(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), m_label(0), m_menu(0) { - m_part = dynamic_cast<KHTMLPart *>(parent); - if(!m_part) { kdDebug() << "couldn't get KHTMLPart" << endl; return; } + m_part = dynamic_cast<TDEHTMLPart *>(parent); + if(!m_part) { kdDebug() << "couldn't get TDEHTMLPart" << endl; return; } m_menu = new KPopupMenu(m_part->widget()); m_menu->insertTitle(i18n("Adblock")); @@ -147,7 +147,7 @@ void AdBlock::fillBlockableElements(AdElementList &elements) fillWithHtmlTag(elements, "object", "src", "OBJECT"); fillWithImages(elements); - const KHTMLSettings *settings = m_part->settings(); + const TDEHTMLSettings *settings = m_part->settings(); AdElementList::iterator it; for ( it = elements.begin(); it != elements.end(); ++it ) @@ -212,7 +212,7 @@ void AdBlock::fillWithHtmlTag(AdElementList &elements, void AdBlock::addAdFilter(const TQString &url) { //FIXME hackish - KHTMLSettings *settings = const_cast<KHTMLSettings *>(m_part->settings()); + TDEHTMLSettings *settings = const_cast<TDEHTMLSettings *>(m_part->settings()); settings->addAdFilter(url); } diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h index 4293169..dbb4549 100644 --- a/konq-plugins/adblock/adblock.h +++ b/konq-plugins/adblock/adblock.h @@ -25,9 +25,9 @@ #include <tqvaluelist.h> #include <tdeparts/plugin.h> -class KHTMLPart; +class TDEHTMLPart; class KURLLabel; -class KHTMLSettings; +class TDEHTMLSettings; class AdElement; class KPopupMenu; @@ -53,7 +53,7 @@ public: ~AdBlock(); private: - TQGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<TDEHTMLPart> m_part; KURLLabel *m_label; KPopupMenu *m_menu; 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<KHTMLView*>(TQT_TQWIDGET(popupmenu->parent())); + if (popupmenu && popupmenu->parent() && popupmenu->parent()->inherits("TDEHTMLView")) + view = static_cast<TDEHTMLView*>(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<KHTMLPart*>(parent); + m_part = dynamic_cast<TDEHTMLPart*>(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<KHTMLPart> m_part; + TQGuardedPtr<TDEHTMLPart> 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; diff --git a/konq-plugins/autorefresh/Makefile.am b/konq-plugins/autorefresh/Makefile.am index ebc6394..c4691e4 100644 --- a/konq-plugins/autorefresh/Makefile.am +++ b/konq-plugins/autorefresh/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = $(all_includes) libautorefresh_la_METASOURCES = AUTO libautorefresh_la_SOURCES = autorefresh.cpp -libautorefresh_la_LIBADD = $(LIB_KHTML) +libautorefresh_la_LIBADD = $(LIB_TDEHTML) libautorefresh_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) diff --git a/konq-plugins/babelfish/Makefile.am b/konq-plugins/babelfish/Makefile.am index 61eba5b..82cf1e0 100644 --- a/konq-plugins/babelfish/Makefile.am +++ b/konq-plugins/babelfish/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libbabelfishplugin.la libbabelfishplugin_la_SOURCES = plugin_babelfish.cpp -libbabelfishplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) +libbabelfishplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) libbabelfishplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined pluginsdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/babelfish/plugin_babelfish.cpp b/konq-plugins/babelfish/plugin_babelfish.cpp index 0cd4a54..a575396 100644 --- a/konq-plugins/babelfish/plugin_babelfish.cpp +++ b/konq-plugins/babelfish/plugin_babelfish.cpp @@ -178,7 +178,7 @@ PluginBabelFish::PluginBabelFish( TQObject* parent, const char* name, m_menu->setEnabled( true ); // TODO: we could also support plain text viewers... - if ( parent && parent->inherits( "KHTMLPart" ) ) + if ( parent && parent->inherits( "TDEHTMLPart" ) ) { KParts::ReadOnlyPart* part = static_cast<KParts::ReadOnlyPart *>(parent); connect( part, TQT_SIGNAL(started(TDEIO::Job*)), this, @@ -193,7 +193,7 @@ PluginBabelFish::~PluginBabelFish() void PluginBabelFish::slotStarted( TDEIO::Job* ) { - if ( parent()->inherits("KHTMLPart") && + if ( parent()->inherits("TDEHTMLPart") && // Babelfish wants http URLs only. No https. static_cast<KParts::ReadOnlyPart *>(parent())->url().protocol().lower() == "http" ) { @@ -211,8 +211,8 @@ void PluginBabelFish::translateURL() if ( !sender() ) return; - // The parent is assumed to be a KHTMLPart - if ( !parent()->inherits("KHTMLPart") ) + // The parent is assumed to be a TDEHTMLPart + if ( !parent()->inherits("TDEHTMLPart") ) { TQString title = i18n( "Cannot Translate Source" ); TQString text = i18n( "Only web pages can be translated using " @@ -227,7 +227,7 @@ void PluginBabelFish::translateURL() TQString engine = cfg.readEntry( TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name(), "babelfish" ); // Get URL - KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); + TDEHTMLPart *part = dynamic_cast<TDEHTMLPart *>(parent()); if ( !part ) return; diff --git a/konq-plugins/crashes/Makefile.am b/konq-plugins/crashes/Makefile.am index f27fbc1..df784e6 100644 --- a/konq-plugins/crashes/Makefile.am +++ b/konq-plugins/crashes/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libcrashesplugin.la libcrashesplugin_la_SOURCES = crashesplugin.cpp -libcrashesplugin_la_LIBADD = $(LIB_KHTML) -lkonq +libcrashesplugin_la_LIBADD = $(LIB_TDEHTML) -lkonq libcrashesplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) pluginsdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/crashes/crashesplugin.cpp b/konq-plugins/crashes/crashesplugin.cpp index 358d728..dda25ce 100644 --- a/konq-plugins/crashes/crashesplugin.cpp +++ b/konq-plugins/crashes/crashesplugin.cpp @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libcrashesplugin, CrashesPluginFactory( "crashesplug CrashesPlugin::CrashesPlugin( TQObject* parent, const char* name, const TQStringList & ) : KParts::Plugin( parent, name ) { - m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; + m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L; m_pCrashesMenu = new KActionMenu( i18n("&Crashes"), "core", actionCollection(), "crashes" ); diff --git a/konq-plugins/crashes/crashesplugin.h b/konq-plugins/crashes/crashesplugin.h index 8bdb2a8..f3ef55a 100644 --- a/konq-plugins/crashes/crashesplugin.h +++ b/konq-plugins/crashes/crashesplugin.h @@ -29,7 +29,7 @@ #include <klibloader.h> #include <tdeparts/plugin.h> -class KHTMLPart; +class TDEHTMLPart; class KActionMenu; class CrashesPlugin : public KParts::Plugin @@ -53,7 +53,7 @@ protected slots: private: int m_selectedItem; - KHTMLPart* m_part; + TDEHTMLPart* m_part; KActionMenu* m_pCrashesMenu; typedef TQPair<TQString,TQCString> Crash; diff --git a/konq-plugins/domtreeviewer/Makefile.am b/konq-plugins/domtreeviewer/Makefile.am index cfb3bb9..ce5cbb4 100644 --- a/konq-plugins/domtreeviewer/Makefile.am +++ b/konq-plugins/domtreeviewer/Makefile.am @@ -20,7 +20,7 @@ libdomtreeviewerplugin_la_SOURCES = plugin_domtreeviewer.cpp \ messagedialog.ui # klistview.cpp \ # -libdomtreeviewerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) +libdomtreeviewerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) libdomtreeviewerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) pluginsdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp index 175696e..32681ba 100644 --- a/konq-plugins/domtreeviewer/domtreeview.cpp +++ b/konq-plugins/domtreeviewer/domtreeview.cpp @@ -115,9 +115,9 @@ DOMTreeView::~DOMTreeView() disconnectFromActivePart(); } -void DOMTreeView::setHtmlPart(KHTMLPart *_part) +void DOMTreeView::setHtmlPart(TDEHTMLPart *_part) { - KHTMLPart *oldPart = part; + TDEHTMLPart *oldPart = part; part = _part; if (oldPart) { diff --git a/konq-plugins/domtreeviewer/domtreeview.h b/konq-plugins/domtreeviewer/domtreeview.h index f687ba9..250bc77 100644 --- a/konq-plugins/domtreeviewer/domtreeview.h +++ b/konq-plugins/domtreeviewer/domtreeview.h @@ -42,7 +42,7 @@ class TQListViewItem; class KPushButton; class KEdFind; -class KHTMLPart; +class TDEHTMLPart; class DOMTreeView : public DOMTreeViewBase { @@ -53,8 +53,8 @@ class DOMTreeView : public DOMTreeViewBase DOMTreeView(TQWidget *parent, const char* name, bool allowSaving = true); ~DOMTreeView(); - KHTMLPart *htmlPart() const { return part; } - void setHtmlPart(KHTMLPart *); + TDEHTMLPart *htmlPart() const { return part; } + void setHtmlPart(TDEHTMLPart *); /** returns the main window */ DOMTreeWindow *mainWindow() const; @@ -67,7 +67,7 @@ class DOMTreeView : public DOMTreeViewBase signals: /** emitted when the part has been changed. */ - void htmlPartChanged(KHTMLPart *part); + void htmlPartChanged(TDEHTMLPart *part); public slots: void refresh(); @@ -151,7 +151,7 @@ class DOMTreeView : public DOMTreeViewBase private: KEdFind* m_findDialog; - KHTMLPart *part; + TDEHTMLPart *part; TQTextStream* m_textStream; const KListView* m_rootListView; diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp index e3ae074..03e3581 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.cpp +++ b/konq-plugins/domtreeviewer/domtreewindow.cpp @@ -89,8 +89,8 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin) connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), this, TQT_SLOT(changeCaption(const TQString&))); #endif - connect(view(), TQT_SIGNAL(htmlPartChanged(KHTMLPart *)), - TQT_SLOT(slotHtmlPartChanged(KHTMLPart *))); + connect(view(), TQT_SIGNAL(htmlPartChanged(TDEHTMLPart *)), + TQT_SLOT(slotHtmlPartChanged(TDEHTMLPart *))); ManipulationCommand::connect(TQT_SIGNAL(error(int, const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(addMessage(int, const TQString &))); @@ -328,7 +328,7 @@ void DOMTreeWindow::changeCaption(const TQString& text) setCaption(text); } -void DOMTreeWindow::slotHtmlPartChanged(KHTMLPart *p) +void DOMTreeWindow::slotHtmlPartChanged(TDEHTMLPart *p) { kdDebug(90180) << k_funcinfo << p << endl; @@ -356,7 +356,7 @@ void DOMTreeWindow::slotActivePartChanged(KParts::Part *p) m_commandHistory->clear(); view()->disconnectFromTornDownPart(); - view()->setHtmlPart(::tqqt_cast<KHTMLPart *>(p)); + view()->setHtmlPart(::tqqt_cast<TDEHTMLPart *>(p)); } void DOMTreeWindow::slotPartRemoved(KParts::Part *p) diff --git a/konq-plugins/domtreeviewer/domtreewindow.h b/konq-plugins/domtreeviewer/domtreewindow.h index 2715eb5..9681df2 100644 --- a/konq-plugins/domtreeviewer/domtreewindow.h +++ b/konq-plugins/domtreeviewer/domtreewindow.h @@ -46,7 +46,7 @@ class TDEConfig; class KPrinter; class KURL; class KCommandHistory; -class KHTMLPart; +class TDEHTMLPart; class MessageDialog; class TQPopupMenu; @@ -168,7 +168,7 @@ private slots: void changeStatusbar(const TQString& text); void changeCaption(const TQString& text); - void slotHtmlPartChanged(KHTMLPart *); + void slotHtmlPartChanged(TDEHTMLPart *); void slotActivePartChanged(KParts::Part *); void slotPartRemoved(KParts::Part *); void slotClosePart(); diff --git a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp index b58a733..1993526 100644 --- a/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp +++ b/konq-plugins/domtreeviewer/plugin_domtreeviewer.cpp @@ -38,7 +38,7 @@ void PluginDomtreeviewer::slotShowDOMTree() delete m_dialog; Q_ASSERT((DOMTreeWindow *)m_dialog == (DOMTreeWindow *)0); } - if (KHTMLPart *part = ::tqqt_cast<KHTMLPart *>(parent())) + if (TDEHTMLPart *part = ::tqqt_cast<TDEHTMLPart *>(parent())) { m_dialog = new DOMTreeWindow(this); connect( m_dialog, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) ); diff --git a/konq-plugins/kuick/Makefile.am b/konq-plugins/kuick/Makefile.am index 143b698..1e520bc 100644 --- a/konq-plugins/kuick/Makefile.am +++ b/konq-plugins/kuick/Makefile.am @@ -6,8 +6,8 @@ METASOURCES = AUTO # Install this plugin in the KDE modules directory kde_module_LTLIBRARIES = libkuickplugin.la -# This is all standard. Remove the LIB_KHTML reference if you are not -# using the KHTML Part +# This is all standard. Remove the LIB_TDEHTML reference if you are not +# using the TDEHTML Part libkuickplugin_la_SOURCES = kuick_plugin.cpp kdirmenu.cpp kmetamenu.cpp kimcontactmenu.cpp libkuickplugin_la_LIBADD = $(LIB_KABC) -ltdeimproxy -lkonq libkuickplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) @@ -19,7 +19,7 @@ appsdir = $(kde_appsdir)/.hidden apps_DATA = kuickplugin.desktop # Install the .rc file in the Part's directory (in this case, the part -# is KHTMLPart) +# is TDEHTMLPart) messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/kuick_plugin.pot diff --git a/konq-plugins/mediarealfolder/kio_media_realfolder b/konq-plugins/mediarealfolder/tdeio_media_realfolder index cbb3d06..cbb3d06 100755 --- a/konq-plugins/mediarealfolder/kio_media_realfolder +++ b/konq-plugins/mediarealfolder/tdeio_media_realfolder diff --git a/konq-plugins/microformat/Makefile.am b/konq-plugins/microformat/Makefile.am index 6e13655..fe0114d 100644 --- a/konq-plugins/microformat/Makefile.am +++ b/konq-plugins/microformat/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libmfkonqmficon.la libmfkonqmficon_la_SOURCES = konqmficon.cpp pluginbase.cpp -libmfkonqmficon_la_LIBADD = -lkonq $(LIB_KHTML) +libmfkonqmficon_la_LIBADD = -lkonq $(LIB_TDEHTML) libmfkonqmficon_la_LDFLAGS = -module $(KDE_PLUGIN) -avoid-version -no-undefined $(all_libraries) konqmficondir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/microformat/konqmficon.cpp b/konq-plugins/microformat/konqmficon.cpp index b6db90c..d3f5239 100644 --- a/konq-plugins/microformat/konqmficon.cpp +++ b/konq-plugins/microformat/konqmficon.cpp @@ -45,7 +45,7 @@ KonqMFIcon::KonqMFIcon(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name), PluginBase(), m_part(0), m_mfIcon(0), m_statusBarEx(0), m_menu(0) { TDEGlobal::locale()->insertCatalogue("mf_konqplugin"); - m_part = dynamic_cast<KHTMLPart*>(parent); + m_part = dynamic_cast<TDEHTMLPart*>(parent); if (!m_part) { kdDebug() << "couldn't get part" << endl; return; diff --git a/konq-plugins/microformat/konqmficon.h b/konq-plugins/microformat/konqmficon.h index 6d1267c..33dac4c 100644 --- a/konq-plugins/microformat/konqmficon.h +++ b/konq-plugins/microformat/konqmficon.h @@ -53,7 +53,7 @@ class KonqMFIcon : public KParts::Plugin, PluginBase { void extractCard(DOM::Node node); void extractEvent(DOM::Node node); - TQGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<TDEHTMLPart> m_part; KURLLabel *m_mfIcon; KParts::StatusBarExtension *m_statusBarEx; TQGuardedPtr<KPopupMenu> m_menu; diff --git a/konq-plugins/minitools/Makefile.am b/konq-plugins/minitools/Makefile.am index ed6f8f5..bb569cc 100644 --- a/konq-plugins/minitools/Makefile.am +++ b/konq-plugins/minitools/Makefile.am @@ -4,7 +4,7 @@ KDE_ICON = AUTO kde_module_LTLIBRARIES = libminitoolsplugin.la libminitoolsplugin_la_SOURCES = minitoolsplugin.cpp -libminitoolsplugin_la_LIBADD = $(LIB_KHTML) -lkonq +libminitoolsplugin_la_LIBADD = $(LIB_TDEHTML) -lkonq libminitoolsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) pluginsdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 97fc4aa..a6837ba 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -44,7 +44,7 @@ K_EXPORT_COMPONENT_FACTORY( libminitoolsplugin, MinitoolsPluginFactory("minitool MinitoolsPlugin::MinitoolsPlugin(TQObject* parent, const char* name, const TQStringList &) : KParts::Plugin(parent, name) { - m_part = (parent && parent->inherits( "KHTMLPart" )) ? static_cast<KHTMLPart*>(parent) : 0L; + m_part = (parent && parent->inherits( "TDEHTMLPart" )) ? static_cast<TDEHTMLPart*>(parent) : 0L; m_pMinitoolsMenu = new KActionMenu(i18n("&Minitools"), "minitools", actionCollection(), "minitools"); diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h index 0e5ba82..f30c7b2 100644 --- a/konq-plugins/minitools/minitoolsplugin.h +++ b/konq-plugins/minitools/minitoolsplugin.h @@ -29,7 +29,7 @@ #include <klibloader.h> #include <tdeparts/plugin.h> -class KHTMLPart; +class TDEHTMLPart; class KActionMenu; class MinitoolsPlugin : public KParts::Plugin { @@ -55,7 +55,7 @@ private: int m_selectedItem; - KHTMLPart* m_part; + TDEHTMLPart* m_part; KActionMenu* m_pMinitoolsMenu; typedef TQPair<TQString,TQCString> Minitool; diff --git a/konq-plugins/rellinks/ChangeLog b/konq-plugins/rellinks/ChangeLog index bc62fdf..86b4b48 100644 --- a/konq-plugins/rellinks/ChangeLog +++ b/konq-plugins/rellinks/ChangeLog @@ -26,6 +26,6 @@ Sun Mar 21 16:23 CET 2004 - Franck Qulain <shift@free.fr> o Distinction between "rel" and "rev" relations Tue Jun 22 23:05 CET 2004 - Kevin Krammer <kevin.krammer@gmx.at> o Move toolbar creation from XML GUI to code as a workaround - because KHTML loads the plugins before it initializes its + because TDEHTML loads the plugins before it initializes its d pointer and so there is no way to get to either the view or the toolbar in the plugin's contructor. diff --git a/konq-plugins/rellinks/Makefile.am b/konq-plugins/rellinks/Makefile.am index f320d96..cb2540d 100644 --- a/konq-plugins/rellinks/Makefile.am +++ b/konq-plugins/rellinks/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(all_includes) METASOURCES = AUTO kde_module_LTLIBRARIES = librellinksplugin.la librellinksplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -librellinksplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) +librellinksplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) librellinksplugin_la_SOURCES = plugin_rellinks.cpp plugins_DATA = plugin_rellinks.rc plugin_rellinks.desktop pluginsdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/rellinks/plugin_rellinks.cpp b/konq-plugins/rellinks/plugin_rellinks.cpp index 69a8e11..6bb3cbd 100644 --- a/konq-plugins/rellinks/plugin_rellinks.cpp +++ b/konq-plugins/rellinks/plugin_rellinks.cpp @@ -175,7 +175,7 @@ RelLinksPlugin::RelLinksPlugin(TQObject *parent, const char *name, const TQStrin disableAll(); // When the rendering of the HTML is done, we update the site navigation bar - m_part = dynamic_cast<KHTMLPart *>(parent); + m_part = dynamic_cast<TDEHTMLPart *>(parent); if (!m_part) return; @@ -364,7 +364,7 @@ void RelLinksPlugin::updateToolbar() { void RelLinksPlugin::guessRelations() { - m_part = dynamic_cast<KHTMLPart *>(parent()); + m_part = dynamic_cast<TDEHTMLPart *>(parent()); if (!m_part || m_part->document().isNull() ) return; @@ -421,8 +421,8 @@ void RelLinksPlugin::guessRelations() /** Menu links */ void RelLinksPlugin::goToLink(const TQString & rel, int id) { - // have the KHTML part open it - KHTMLPart *part = dynamic_cast<KHTMLPart *>(parent()); + // have the TDEHTML part open it + TDEHTMLPart *part = dynamic_cast<TDEHTMLPart *>(parent()); if (!part) return; diff --git a/konq-plugins/rellinks/plugin_rellinks.h b/konq-plugins/rellinks/plugin_rellinks.h index d791eb9..e8e5adb 100644 --- a/konq-plugins/rellinks/plugin_rellinks.h +++ b/konq-plugins/rellinks/plugin_rellinks.h @@ -44,8 +44,8 @@ typedef TQMap<TQString, KActionMenu*> KActionMenuMap; // forward declarations class KActionMenu; -class KHTMLPart; -class KHTMLView; +class TDEHTMLPart; +class TDEHTMLView; class KToolBar; class KURL; class TQTimer; @@ -70,13 +70,13 @@ private slots: void delayedSetup(); /** - * KHTMLPart has created a new document, disable actions and + * TDEHTMLPart has created a new document, disable actions and * start polling for links */ void newDocument(); /** - * KHTMLPart has finished loading, stop the poller and + * TDEHTMLPart has finished loading, stop the poller and * parse the document a last time. */ void loadingFinished(); @@ -149,8 +149,8 @@ private: void goToLink(const TQString & rel, int id=0); private: - KHTMLPart* m_part; - KHTMLView* m_view; + TDEHTMLPart* m_part; + TDEHTMLView* m_view; bool m_viewVisible; KActionMenu *m_document; diff --git a/konq-plugins/searchbar/Makefile.am b/konq-plugins/searchbar/Makefile.am index 3a4c1b5..04e33fa 100644 --- a/konq-plugins/searchbar/Makefile.am +++ b/konq-plugins/searchbar/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = libsearchbarplugin.la libsearchbarplugin_la_SOURCES = searchbar.cpp -libsearchbarplugin_la_LIBADD = $(LIB_KHTML) +libsearchbarplugin_la_LIBADD = $(LIB_TDEHTML) libsearchbarplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) pluginsdir = $(kde_datadir)/konqueror/kpartplugins diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp index e6c1830..7e2ed07 100644 --- a/konq-plugins/searchbar/searchbar.cpp +++ b/konq-plugins/searchbar/searchbar.cpp @@ -515,7 +515,7 @@ void SearchBarPlugin::configurationChanged() void SearchBarPlugin::partChanged(KParts::Part *newPart) { - m_part = ::tqqt_cast<KHTMLPart*>(newPart); + m_part = ::tqqt_cast<TDEHTMLPart*>(newPart); //Delay since when destroying tabs part 0 gets activated for a bit, before the proper part TQTimer::singleShot(0, this, TQT_SLOT(updateComboVisibility())); diff --git a/konq-plugins/searchbar/searchbar.h b/konq-plugins/searchbar/searchbar.h index e52f482..a1423f8 100644 --- a/konq-plugins/searchbar/searchbar.h +++ b/konq-plugins/searchbar/searchbar.h @@ -31,7 +31,7 @@ #include <tqpixmap.h> #include <tqstring.h> -class KHTMLPart; +class TDEHTMLPart; class TDEProcess; class TQPopupMenu; class TQTimer; @@ -68,7 +68,7 @@ class SearchBarCombo : public KHistoryCombo /** * Sets whether the plugin is active. It can be inactive - * in case the current Konqueror part isn't a KHTML part. + * in case the current Konqueror part isn't a TDEHTML part. */ void setPluginActive(bool pluginActive); @@ -174,7 +174,7 @@ class SearchBarPlugin : public KParts::Plugin void nextSearchEntry(); void previousSearchEntry(); - TQGuardedPtr<KHTMLPart> m_part; + TQGuardedPtr<TDEHTMLPart> m_part; SearchBarCombo *m_searchCombo; KWidgetAction *m_searchComboAction; TQPopupMenu *m_popupMenu; diff --git a/konq-plugins/sidebar/metabar/src/Makefile.am b/konq-plugins/sidebar/metabar/src/Makefile.am index cd18deb..78fd97b 100644 --- a/konq-plugins/sidebar/metabar/src/Makefile.am +++ b/konq-plugins/sidebar/metabar/src/Makefile.am @@ -9,7 +9,7 @@ konqsidebar_metabar_la_SOURCES = metabar.cpp metabarwidget.cpp configdialog.cpp serviceloader.cpp defaultplugin.cpp protocolplugin.cpp settingsplugin.cpp \ remoteplugin.cpp httpplugin.cpp metabarfunctions.cpp konqsidebar_metabar_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkonqsidebarplugin -konqsidebar_metabar_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(LIB_KPARTS) +konqsidebar_metabar_la_LIBADD = $(LIB_KIO) $(LIB_TDEHTML) $(LIB_KPARTS) metabar_entrydir = $(kde_datadir)/konqsidebartng/entries metabar_entry_DATA = metabar.desktop diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp index 0edf060..f2cbb52 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.cpp @@ -53,7 +53,7 @@ #define EVENT_TYPE DOM::DOMString("click") #define MODIFICATION 1 -DefaultPlugin::DefaultPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name) +DefaultPlugin::DefaultPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name) { services = new ServiceLoader(m_html->view(), "serviceloader"); diff --git a/konq-plugins/sidebar/metabar/src/defaultplugin.h b/konq-plugins/sidebar/metabar/src/defaultplugin.h index a9feb56..282b0c9 100644 --- a/konq-plugins/sidebar/metabar/src/defaultplugin.h +++ b/konq-plugins/sidebar/metabar/src/defaultplugin.h @@ -35,7 +35,7 @@ class DefaultPlugin : public ProtocolPlugin public: - DefaultPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0); + DefaultPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0); ~DefaultPlugin(); void deactivate(); diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.cpp b/konq-plugins/sidebar/metabar/src/httpplugin.cpp index f994eb5..cdb1f79 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/httpplugin.cpp @@ -38,7 +38,7 @@ #include <dom_node.h> #include <html_inline.h> -HTTPPlugin::HTTPPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name) +HTTPPlugin::HTTPPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name) { } diff --git a/konq-plugins/sidebar/metabar/src/httpplugin.h b/konq-plugins/sidebar/metabar/src/httpplugin.h index 3311bd6..b3ee302 100644 --- a/konq-plugins/sidebar/metabar/src/httpplugin.h +++ b/konq-plugins/sidebar/metabar/src/httpplugin.h @@ -34,7 +34,7 @@ class HTTPPlugin : public ProtocolPlugin public: - HTTPPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0); + HTTPPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0); ~HTTPPlugin(); bool handleRequest(const KURL &url); diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp index aefa5fd..4f9cfd1 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.cpp @@ -32,7 +32,7 @@ #define RESIZE_SPEED 5 #define RESIZE_STEP 2 -MetabarFunctions::MetabarFunctions(KHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) +MetabarFunctions::MetabarFunctions(TDEHTMLPart *html, TQObject *parent, const char* name) : TQObject(parent, name), m_html(html) { timer = new TQTimer(this); connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); diff --git a/konq-plugins/sidebar/metabar/src/metabarfunctions.h b/konq-plugins/sidebar/metabar/src/metabarfunctions.h index 800bb55..b88d1cc 100644 --- a/konq-plugins/sidebar/metabar/src/metabarfunctions.h +++ b/konq-plugins/sidebar/metabar/src/metabarfunctions.h @@ -35,7 +35,7 @@ class MetabarFunctions : public TQObject public: - MetabarFunctions(KHTMLPart *html, TQObject *parent = 0, const char* name=0); + MetabarFunctions(TDEHTMLPart *html, TQObject *parent = 0, const char* name=0); ~MetabarFunctions(); void toggle(DOM::DOMString item); @@ -45,7 +45,7 @@ class MetabarFunctions : public TQObject void handleRequest(const KURL &url); protected: - KHTMLPart *m_html; + TDEHTMLPart *m_html; private: TQTimer *timer; diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp index af44158..af141cc 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp @@ -88,7 +88,7 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare connect(dir_watch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotUpdateCurrentInfo(const TQString&))); connect(dir_watch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteCurrentInfo(const TQString&))); - html = new KHTMLPart(this, "metabarhtmlpart"); + html = new TDEHTMLPart(this, "metabarhtmlpart"); html->setJScriptEnabled(true); html->setPluginsEnabled(true); html->setCaretVisible(false); diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.h b/konq-plugins/sidebar/metabar/src/metabarwidget.h index aad695b..667b461 100644 --- a/konq-plugins/sidebar/metabar/src/metabarwidget.h +++ b/konq-plugins/sidebar/metabar/src/metabarwidget.h @@ -53,7 +53,7 @@ class MetabarWidget : public TQWidget KFileItemList *currentItems; TDEConfig *config; - KHTMLPart *html; + TDEHTMLPart *html; ProtocolPlugin *currentPlugin; ProtocolPlugin *defaultPlugin; diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp index 75e62c3..ce3844a 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.cpp @@ -32,7 +32,7 @@ ProtocolPlugin* ProtocolPlugin::activePlugin = 0; -ProtocolPlugin::ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name) : TQObject(html, name), m_html(html), m_functions(functions) +ProtocolPlugin::ProtocolPlugin(TDEHTMLPart *html, MetabarFunctions *functions, const char* name) : TQObject(html, name), m_html(html), m_functions(functions) { } diff --git a/konq-plugins/sidebar/metabar/src/protocolplugin.h b/konq-plugins/sidebar/metabar/src/protocolplugin.h index 2ffd207..b0c87ab 100644 --- a/konq-plugins/sidebar/metabar/src/protocolplugin.h +++ b/konq-plugins/sidebar/metabar/src/protocolplugin.h @@ -35,7 +35,7 @@ class ProtocolPlugin : public TQObject{ public: static ProtocolPlugin* activePlugin; - ProtocolPlugin(KHTMLPart *html, MetabarFunctions *functions, const char* name = 0); + ProtocolPlugin(TDEHTMLPart *html, MetabarFunctions *functions, const char* name = 0); ~ProtocolPlugin(); void setFileItems(const KFileItemList &items); @@ -54,7 +54,7 @@ class ProtocolPlugin : public TQObject{ virtual void loadBookmarks(DOM::HTMLElement node) = 0; KFileItemList m_items; - KHTMLPart *m_html; + TDEHTMLPart *m_html; MetabarFunctions *m_functions; }; diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp index df5bf75..395c2cb 100644 --- a/konq-plugins/sidebar/metabar/src/remoteplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/remoteplugin.cpp @@ -24,7 +24,7 @@ #include <klocale.h> #include <kstandarddirs.h> -RemotePlugin::RemotePlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name) : DefaultPlugin (html, functions, name) +RemotePlugin::RemotePlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : DefaultPlugin (html, functions, name) { } diff --git a/konq-plugins/sidebar/metabar/src/remoteplugin.h b/konq-plugins/sidebar/metabar/src/remoteplugin.h index 530aed3..a3e6889 100644 --- a/konq-plugins/sidebar/metabar/src/remoteplugin.h +++ b/konq-plugins/sidebar/metabar/src/remoteplugin.h @@ -29,7 +29,7 @@ class RemotePlugin : public DefaultPlugin public: - RemotePlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0); + RemotePlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0); ~RemotePlugin(); void loadActions(DOM::HTMLElement node); diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp index b5186e7..4a053dd 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.cpp +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.cpp @@ -29,7 +29,7 @@ #include <html_element.h> #include <dom_string.h> -SettingsPlugin::SettingsPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name) +SettingsPlugin::SettingsPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name) : ProtocolPlugin (html, functions, name) { list_job = 0; } diff --git a/konq-plugins/sidebar/metabar/src/settingsplugin.h b/konq-plugins/sidebar/metabar/src/settingsplugin.h index 75f61d3..0f15043 100644 --- a/konq-plugins/sidebar/metabar/src/settingsplugin.h +++ b/konq-plugins/sidebar/metabar/src/settingsplugin.h @@ -32,7 +32,7 @@ class SettingsPlugin : public ProtocolPlugin public: - SettingsPlugin(KHTMLPart* html, MetabarFunctions *functions, const char *name = 0); + SettingsPlugin(TDEHTMLPart* html, MetabarFunctions *functions, const char *name = 0); ~SettingsPlugin(); void deactivate(); diff --git a/konq-plugins/tdehtmlsettingsplugin/Makefile.am b/konq-plugins/tdehtmlsettingsplugin/Makefile.am index 6647c14..3227c17 100644 --- a/konq-plugins/tdehtmlsettingsplugin/Makefile.am +++ b/konq-plugins/tdehtmlsettingsplugin/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = libtdehtmlsettingsplugin.la libtdehtmlsettingsplugin_la_SOURCES = settingsplugin.cpp -libtdehtmlsettingsplugin_la_LIBADD = $(LIB_KHTML) +libtdehtmlsettingsplugin_la_LIBADD = $(LIB_TDEHTML) libtdehtmlsettingsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) pluginsdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp index 708c3da..f81dacc 100644 --- a/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp +++ b/konq-plugins/tdehtmlsettingsplugin/settingsplugin.cpp @@ -118,13 +118,13 @@ SettingsPlugin::~SettingsPlugin() void SettingsPlugin::showPopup() { - if( !parent() || !parent()->inherits("KHTMLPart")) + if( !parent() || !parent()->inherits("TDEHTMLPart")) return; if (!mConfig) mConfig = new TDEConfig("settingspluginrc", false, false); - KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); + TDEHTMLPart *part = static_cast<TDEHTMLPart *>( parent() ); KProtocolManager::reparseConfiguration(); bool cookies = cookiesEnabled( part->url().url() ); @@ -159,28 +159,28 @@ void SettingsPlugin::showPopup() void SettingsPlugin::toggleJava() { - if( parent() && parent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("TDEHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(parent()); + TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); part->setJavaEnabled( ((KToggleAction*)actionCollection()->action("java"))->isChecked() ); } } void SettingsPlugin::toggleJavascript() { - if( parent() && parent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("TDEHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(parent()); + TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); part->setJScriptEnabled( ((KToggleAction*)actionCollection()->action("javascript"))->isChecked() ); } } void SettingsPlugin::toggleCookies() { - if( !parent() || !parent()->inherits("KHTMLPart")) + if( !parent() || !parent()->inherits("TDEHTMLPart")) return; - KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); + TDEHTMLPart *part = static_cast<TDEHTMLPart *>( parent() ); TQString advice; bool enable = ((KToggleAction*)actionCollection()->action("cookies"))->isChecked(); @@ -203,18 +203,18 @@ void SettingsPlugin::toggleCookies() void SettingsPlugin::togglePlugins() { - if( parent() && parent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("TDEHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(parent()); + TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); part->setPluginsEnabled( ((KToggleAction*)actionCollection()->action("plugins"))->isChecked() ); } } void SettingsPlugin::toggleImageLoading() { - if( parent() && parent()->inherits("KHTMLPart")) + if( parent() && parent()->inherits("TDEHTMLPart")) { - KHTMLPart *part = static_cast<KHTMLPart *>(parent()); + TDEHTMLPart *part = static_cast<TDEHTMLPart *>(parent()); part->setAutoloadImages( ((KToggleAction*)actionCollection()->action("imageloading"))->isChecked() ); } } diff --git a/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop index c6af847..417f0b9 100644 --- a/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop +++ b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.desktop @@ -9,128 +9,128 @@ X-TDE-PluginInfo-Category=Tools X-TDE-PluginInfo-Depends= X-TDE-PluginInfo-License=GPL X-TDE-PluginInfo-EnabledByDefault=true -Name=KHTML Settings +Name=TDEHTML Settings Name[af]=Khtml Instellings -Name[ar]=اعدادات KHTML -Name[az]=KHTML Qurğuları -Name[bg]=Настройки на KHTML -Name[br]=Dibarzhoù KHTML -Name[bs]=KHTML postavke -Name[ca]=Preferències KHTML -Name[cs]=Nastavení KHTML -Name[cy]=Gosodiadau KHTML -Name[da]=KHTML-opsætning -Name[de]=KHTML-Einstellungen -Name[el]=Ρυθμίσεις KHTML -Name[eo]=KHTML-agordo -Name[es]=Preferencias de KHTML -Name[et]=KHTML seadistused -Name[eu]=KHTMLren ezarpenak -Name[fa]=تنظیمات KHTML -Name[fi]=KHTML-asetukset -Name[fo]=KHTML-uppseting -Name[fr]=Réglages KHTML -Name[fy]=KHTML-ynstellingen -Name[ga]=Socruithe KHTML -Name[gl]=Configuración de KHTML -Name[he]=הגדרות KHTML +Name[ar]=اعدادات TDEHTML +Name[az]=TDEHTML Qurğuları +Name[bg]=Настройки на TDEHTML +Name[br]=Dibarzhoù TDEHTML +Name[bs]=TDEHTML postavke +Name[ca]=Preferències TDEHTML +Name[cs]=Nastavení TDEHTML +Name[cy]=Gosodiadau TDEHTML +Name[da]=TDEHTML-opsætning +Name[de]=TDEHTML-Einstellungen +Name[el]=Ρυθμίσεις TDEHTML +Name[eo]=TDEHTML-agordo +Name[es]=Preferencias de TDEHTML +Name[et]=TDEHTML seadistused +Name[eu]=TDEHTMLren ezarpenak +Name[fa]=تنظیمات TDEHTML +Name[fi]=TDEHTML-asetukset +Name[fo]=TDEHTML-uppseting +Name[fr]=Réglages TDEHTML +Name[fy]=TDEHTML-ynstellingen +Name[ga]=Socruithe TDEHTML +Name[gl]=Configuración de TDEHTML +Name[he]=הגדרות TDEHTML Name[hi]=के-एचटीएमएल विन्यास -Name[hr]=KHTML postavke -Name[hu]=KHTML-beállítások -Name[it]=Impostazioni KHTML -Name[ja]=KHTML 設定 -Name[ka]=KHTML პარამეტრები -Name[kk]=KHTML параметрлері -Name[km]=ការកំណត់ KHTML -Name[lt]=KHTML nustatymai -Name[mk]=Поставувања за KHTML -Name[ms]=Seting KHTML -Name[nb]=KHTML-innstillinger -Name[nds]=KHTML-Instellen +Name[hr]=TDEHTML postavke +Name[hu]=TDEHTML-beállítások +Name[it]=Impostazioni TDEHTML +Name[ja]=TDEHTML 設定 +Name[ka]=TDEHTML პარამეტრები +Name[kk]=TDEHTML параметрлері +Name[km]=ការកំណត់ TDEHTML +Name[lt]=TDEHTML nustatymai +Name[mk]=Поставувања за TDEHTML +Name[ms]=Seting TDEHTML +Name[nb]=TDEHTML-innstillinger +Name[nds]=TDEHTML-Instellen Name[ne]=केएचटीएमएल सेटिङ -Name[nl]=KHTML-instellingen -Name[nn]=KHTML-innstillingar -Name[pa]=KHTML ਸਥਾਪਨ -Name[pl]=Ustawienia KHTML -Name[pt]=Configuração do KHTML -Name[pt_BR]=Configurações KHTML -Name[ro]=Setări KHTML -Name[ru]=Параметры KHTML -Name[sk]=KHTML nastavenia -Name[sl]=Nastavitve KHTML -Name[sr]=Подешавања KHTML-а -Name[sr@Latn]=Podešavanja KHTML-a -Name[sv]=KHTML-inställningar -Name[ta]=KHTML அமைப்புகள் -Name[tg]=Танзимотҳои KHTML -Name[tr]=KHTML Ayarları -Name[uk]=Параметри KHTML -Name[uz]=KHTML moslamalari -Name[uz@cyrillic]=KHTML мосламалари -Name[vi]=Thiết lập KHTML -Name[xh]=Ucwangciso lwe KHTML -Name[zh_CN]=KHTML 设置 -Name[zh_TW]=KHTML 設定 -Comment=Fast way to change the KHTML settings +Name[nl]=TDEHTML-instellingen +Name[nn]=TDEHTML-innstillingar +Name[pa]=TDEHTML ਸਥਾਪਨ +Name[pl]=Ustawienia TDEHTML +Name[pt]=Configuração do TDEHTML +Name[pt_BR]=Configurações TDEHTML +Name[ro]=Setări TDEHTML +Name[ru]=Параметры TDEHTML +Name[sk]=TDEHTML nastavenia +Name[sl]=Nastavitve TDEHTML +Name[sr]=Подешавања TDEHTML-а +Name[sr@Latn]=Podešavanja TDEHTML-a +Name[sv]=TDEHTML-inställningar +Name[ta]=TDEHTML அமைப்புகள் +Name[tg]=Танзимотҳои TDEHTML +Name[tr]=TDEHTML Ayarları +Name[uk]=Параметри TDEHTML +Name[uz]=TDEHTML moslamalari +Name[uz@cyrillic]=TDEHTML мосламалари +Name[vi]=Thiết lập TDEHTML +Name[xh]=Ucwangciso lwe TDEHTML +Name[zh_CN]=TDEHTML 设置 +Name[zh_TW]=TDEHTML 設定 +Comment=Fast way to change the TDEHTML settings Comment[af]=Vinnige weg na verander die Khtml instellings -Comment[ar]=طريقة سهلة لتغيير اعدادات KHTML -Comment[az]=KHTML qurğularını dəyişdirmənin sür'ətli yolu -Comment[bg]=Бърз начин да се променят някои от най-важните настройки на KHTML -Comment[bs]=Brz način za mijenjanje KHTML postavki -Comment[ca]=Per a canviar ràpidament les preferències de KHTML -Comment[cs]=Rychlé přepínání nastavení KHTML -Comment[cy]=Ffordd cyflym o newid y gosodiadau KHTML -Comment[da]=Hurtig måde at ændre KHTML-opsætningen på -Comment[de]=Schnelle Möglichkeiten zur Änderung der KHTML-Einstellungen -Comment[el]=Γρήγορος τρόπος αλλαγής των ρυθμίσεων του KHTML -Comment[eo]=Rapida kielo por ŝanĝi la KHTML-agordon -Comment[es]=Una forma rápida de cambiar las preferencias de KHTML -Comment[et]=Kiirmeetod muuta KHTML seadistusi -Comment[eu]=KHTMLren ezarpenak aldatzeko bide azkarra -Comment[fa]=روش سریع تغییر تنظیمات KHTML -Comment[fi]=Nopea tapa muuttaa KHTML asetuksia -Comment[fo]=Snarvegur uppsetingin av KHTML -Comment[fr]=Méthode rapide pour configurer les réglages KHTML -Comment[fy]=Snelle manier om de ynstellingen fan KHTML te wizigjen -Comment[gl]=Unha forma rápida de alterar a configuración de KHTML -Comment[he]=דרך מהירה לשנות את ההגדרות של KHTML +Comment[ar]=طريقة سهلة لتغيير اعدادات TDEHTML +Comment[az]=TDEHTML qurğularını dəyişdirmənin sür'ətli yolu +Comment[bg]=Бърз начин да се променят някои от най-важните настройки на TDEHTML +Comment[bs]=Brz način za mijenjanje TDEHTML postavki +Comment[ca]=Per a canviar ràpidament les preferències de TDEHTML +Comment[cs]=Rychlé přepínání nastavení TDEHTML +Comment[cy]=Ffordd cyflym o newid y gosodiadau TDEHTML +Comment[da]=Hurtig måde at ændre TDEHTML-opsætningen på +Comment[de]=Schnelle Möglichkeiten zur Änderung der TDEHTML-Einstellungen +Comment[el]=Γρήγορος τρόπος αλλαγής των ρυθμίσεων του TDEHTML +Comment[eo]=Rapida kielo por ŝanĝi la TDEHTML-agordon +Comment[es]=Una forma rápida de cambiar las preferencias de TDEHTML +Comment[et]=Kiirmeetod muuta TDEHTML seadistusi +Comment[eu]=TDEHTMLren ezarpenak aldatzeko bide azkarra +Comment[fa]=روش سریع تغییر تنظیمات TDEHTML +Comment[fi]=Nopea tapa muuttaa TDEHTML asetuksia +Comment[fo]=Snarvegur uppsetingin av TDEHTML +Comment[fr]=Méthode rapide pour configurer les réglages TDEHTML +Comment[fy]=Snelle manier om de ynstellingen fan TDEHTML te wizigjen +Comment[gl]=Unha forma rápida de alterar a configuración de TDEHTML +Comment[he]=דרך מהירה לשנות את ההגדרות של TDEHTML Comment[hi]=के-एचटीएमएल विन्यास बदलने का तेज तरीका -Comment[hr]=Brz način izmjene KHTML postavki -Comment[hu]=A KHTML objektum beállításai -Comment[is]=Fljótvirk leið til að stilla KHTML -Comment[it]=Modo veloce per cambiare le impostazioni KHTML -Comment[ja]=KHTML 設定を素早く変更します -Comment[ka]=KHTML პარამეტრების შეცვლის სწრაფი გზა -Comment[kk]=KHTML параметрлерін шұғыл өзгертудің жолы -Comment[km]=វិធីដ៏រហ័សដើម្បីផ្លាស់ប្ដូរការកំណត់ KHTML -Comment[lt]=Greitas būdas KHTML parinktims pakeisti -Comment[mk]=Брз начин за промена на поставувањата за KHTML -Comment[ms]=Cara pantas untuk mengubah seting KHTML -Comment[nb]=Rask måte å endre KHTML-innstillinger -Comment[nds]=De KHTML-Instellen gau ännern +Comment[hr]=Brz način izmjene TDEHTML postavki +Comment[hu]=A TDEHTML objektum beállításai +Comment[is]=Fljótvirk leið til að stilla TDEHTML +Comment[it]=Modo veloce per cambiare le impostazioni TDEHTML +Comment[ja]=TDEHTML 設定を素早く変更します +Comment[ka]=TDEHTML პარამეტრების შეცვლის სწრაფი გზა +Comment[kk]=TDEHTML параметрлерін шұғыл өзгертудің жолы +Comment[km]=វិធីដ៏រហ័សដើម្បីផ្លាស់ប្ដូរការកំណត់ TDEHTML +Comment[lt]=Greitas būdas TDEHTML parinktims pakeisti +Comment[mk]=Брз начин за промена на поставувањата за TDEHTML +Comment[ms]=Cara pantas untuk mengubah seting TDEHTML +Comment[nb]=Rask måte å endre TDEHTML-innstillinger +Comment[nds]=De TDEHTML-Instellen gau ännern Comment[ne]=केएचटीएमएल सेटिङ परिवर्तन गर्ने छिटो तरिका -Comment[nl]=Snelle manier om de instellingen van KHTML te wijzigen -Comment[nn]=Ein rask måte å endra KHTML-innstillingane -Comment[pl]=Szybka zmiana ustawień KHTML -Comment[pt]=Uma forma rápida de alterar a configuração do KHTML -Comment[pt_BR]=Modo rápido de mudar as configurações do KHTML -Comment[ro]=Configurează rapid şi uşor setările KHTML -Comment[ru]=Быстрое изменение параметров KHTML -Comment[sk]=Rýchla cesta ako zmeniť nastavenia KHTML -Comment[sl]=Hiter način za spreminjanje nastavitev KHTML -Comment[sr]=Брз начин за промену подешавања KHTML-а -Comment[sr@Latn]=Brz način za promenu podešavanja KHTML-a -Comment[sv]=Snabbt sätt att ändra KHTML-inställningarna -Comment[ta]=KHTML அமைப்புகளை மாற்றுவதற்கான விரைவான வழி -Comment[tg]=Тағйирёбии тези танзимотҳои KHTML -Comment[tr]=KHTML ayarlarını değiştirmek için hızlı bir yol -Comment[uk]=Швидкий шлях змінити параметри KHTML -Comment[uz]=KHTML moslamalarini tez oʻzgartirish yoʻli -Comment[uz@cyrillic]=KHTML мосламаларини тез ўзгартириш йўли -Comment[vi]=Cách thay đổi nhanh thiết lập KHTML -Comment[xh]=Indlela ekhawulezayo yokutshintsha ucwangciso lwe KHTML -Comment[zh_CN]=改变 KHTML 设置的快速方式 -Comment[zh_TW]=快速變更 KHTML 設定的方法 +Comment[nl]=Snelle manier om de instellingen van TDEHTML te wijzigen +Comment[nn]=Ein rask måte å endra TDEHTML-innstillingane +Comment[pl]=Szybka zmiana ustawień TDEHTML +Comment[pt]=Uma forma rápida de alterar a configuração do TDEHTML +Comment[pt_BR]=Modo rápido de mudar as configurações do TDEHTML +Comment[ro]=Configurează rapid şi uşor setările TDEHTML +Comment[ru]=Быстрое изменение параметров TDEHTML +Comment[sk]=Rýchla cesta ako zmeniť nastavenia TDEHTML +Comment[sl]=Hiter način za spreminjanje nastavitev TDEHTML +Comment[sr]=Брз начин за промену подешавања TDEHTML-а +Comment[sr@Latn]=Brz način za promenu podešavanja TDEHTML-a +Comment[sv]=Snabbt sätt att ändra TDEHTML-inställningarna +Comment[ta]=TDEHTML அமைப்புகளை மாற்றுவதற்கான விரைவான வழி +Comment[tg]=Тағйирёбии тези танзимотҳои TDEHTML +Comment[tr]=TDEHTML ayarlarını değiştirmek için hızlı bir yol +Comment[uk]=Швидкий шлях змінити параметри TDEHTML +Comment[uz]=TDEHTML moslamalarini tez oʻzgartirish yoʻli +Comment[uz@cyrillic]=TDEHTML мосламаларини тез ўзгартириш йўли +Comment[vi]=Cách thay đổi nhanh thiết lập TDEHTML +Comment[xh]=Indlela ekhawulezayo yokutshintsha ucwangciso lwe TDEHTML +Comment[zh_CN]=改变 TDEHTML 设置的快速方式 +Comment[zh_TW]=快速變更 TDEHTML 設定的方法 X-TDE-ParentApp=konqueror Icon=configure DocPath=konq-plugins/tdehtmlsettings/index.html diff --git a/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.lsm b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.lsm index 59dc147..da64194 100644 --- a/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.lsm +++ b/konq-plugins/tdehtmlsettingsplugin/tdehtmlsettingsplugin.lsm @@ -1,5 +1,5 @@ Begin4 -Title: KHTMLSettingsPlugin +Title: TDEHTMLSettingsPlugin Version: R14.0.0 Entered-date: 2010-05-10 Description: Puts a button with a dropdown menu with settings for Java, Javascript, Cookies diff --git a/konq-plugins/uachanger/Makefile.am b/konq-plugins/uachanger/Makefile.am index 61dcc36..169a700 100644 --- a/konq-plugins/uachanger/Makefile.am +++ b/konq-plugins/uachanger/Makefile.am @@ -4,7 +4,7 @@ AM_CPPFLAGS = $(all_includes) METASOURCES = AUTO libuachangerplugin_la_SOURCES = uachangerplugin.cpp -libuachangerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) +libuachangerplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) libuachangerplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) pluginsdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/uachanger/uachangerplugin.cpp b/konq-plugins/uachanger/uachangerplugin.cpp index b61036c..bf389ee 100644 --- a/konq-plugins/uachanger/uachangerplugin.cpp +++ b/konq-plugins/uachanger/uachangerplugin.cpp @@ -65,9 +65,9 @@ UAChangerPlugin::UAChangerPlugin( TQObject* parent, const char* name, m_pUAMenu->setEnabled ( false ); - if ( parent && parent->inherits( "KHTMLPart" ) ) + if ( parent && parent->inherits( "TDEHTMLPart" ) ) { - m_part = static_cast<KHTMLPart*>(parent); + m_part = static_cast<TDEHTMLPart*>(parent); connect( m_part, TQT_SIGNAL(started(TDEIO::Job*)), this, TQT_SLOT(slotStarted(TDEIO::Job*)) ); } diff --git a/konq-plugins/uachanger/uachangerplugin.h b/konq-plugins/uachanger/uachangerplugin.h index fc5b707..d90ac76 100644 --- a/konq-plugins/uachanger/uachangerplugin.h +++ b/konq-plugins/uachanger/uachangerplugin.h @@ -29,7 +29,7 @@ #include <klibloader.h> #include <tdeparts/plugin.h> -class KHTMLPart; +class TDEHTMLPart; class KActionMenu; class TDEConfig; @@ -72,7 +72,7 @@ private: bool m_bApplyToDomain; bool m_bSettingsLoaded; - KHTMLPart* m_part; + TDEHTMLPart* m_part; KActionMenu* m_pUAMenu; TDEConfig* m_config; diff --git a/konq-plugins/validators/Makefile.am b/konq-plugins/validators/Makefile.am index 41fe2b0..e3b386f 100644 --- a/konq-plugins/validators/Makefile.am +++ b/konq-plugins/validators/Makefile.am @@ -5,7 +5,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libvalidatorsplugin.la libvalidatorsplugin_la_SOURCES = plugin_validators.cpp validatorsdialog.cpp -libvalidatorsplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) +libvalidatorsplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) libvalidatorsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) pluginsdir = $(kde_datadir)/tdehtml/kpartplugins diff --git a/konq-plugins/validators/plugin_validators.cpp b/konq-plugins/validators/plugin_validators.cpp index 3d6514a..c411038 100644 --- a/konq-plugins/validators/plugin_validators.cpp +++ b/konq-plugins/validators/plugin_validators.cpp @@ -71,14 +71,14 @@ PluginValidators::PluginValidators( TQObject* parent, const char* name, m_menu->setEnabled( false ); - if ( parent && parent->inherits( "KHTMLPart" )) + if ( parent && parent->inherits( "TDEHTMLPart" )) { m_menu->insert( new KAction( i18n( "C&onfigure Validator..." ), "configure", 0, this, TQT_SLOT(slotConfigure()), actionCollection(), "configure") ); - m_part = static_cast<KHTMLPart *>( parent ); + m_part = static_cast<TDEHTMLPart *>( parent ); m_configDialog = new ValidatorsDialog( m_part->widget() ); setURLs(); @@ -140,8 +140,8 @@ void PluginValidators::slotConfigure() void PluginValidators::validateURL(const KURL &url, const KURL &uploadUrl) { - // The parent is assumed to be a KHTMLPart - if ( !parent()->inherits("KHTMLPart") ) + // The parent is assumed to be a TDEHTMLPart + if ( !parent()->inherits("TDEHTMLPart") ) { TQString title = i18n( "Cannot Validate Source" ); TQString text = i18n( "You cannot validate anything except web pages with " diff --git a/konq-plugins/validators/plugin_validators.h b/konq-plugins/validators/plugin_validators.h index 63df771..97e528e 100644 --- a/konq-plugins/validators/plugin_validators.h +++ b/konq-plugins/validators/plugin_validators.h @@ -60,7 +60,7 @@ private: KActionMenu *m_menu; TQGuardedPtr<ValidatorsDialog> m_configDialog; // | // +-> Order dependency. - KHTMLPart* m_part; // | + TDEHTMLPart* m_part; // | KURL m_WWWValidatorUrl, m_WWWValidatorUploadUrl; KURL m_CSSValidatorUrl, m_CSSValidatorUploadUrl; diff --git a/konq-plugins/webarchiver/Makefile.am b/konq-plugins/webarchiver/Makefile.am index 6a3779a..43dbfb0 100644 --- a/konq-plugins/webarchiver/Makefile.am +++ b/konq-plugins/webarchiver/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libwebarchiverplugin.la webarchivethumbnail.la libwebarchiverplugin_la_SOURCES = plugin_webarchiver.cpp archiveviewbase.ui archivedialog.cpp -libwebarchiverplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) +libwebarchiverplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEHTML) libwebarchiverplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) pluginsdir = $(kde_datadir)/tdehtml/kpartplugins @@ -20,7 +20,7 @@ install-data-local: $(srcdir)/../uninstall.desktop $(INSTALL_DATA) $(srcdir)/../uninstall.desktop $(DESTDIR)$(pluginsdir)/webarchiverplugin.desktop webarchivethumbnail_la_SOURCES = webarchivecreator.cpp -webarchivethumbnail_la_LIBADD = $(LIB_KHTML) +webarchivethumbnail_la_LIBADD = $(LIB_TDEHTML) webarchivethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) servicesdir = $(kde_servicesdir) diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 4c83c43..9048d67 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -50,7 +50,7 @@ #define CONTENT_TYPE "<meta http-equiv=\"content-type\" content=\"text/html; charset=utf-8\">" ArchiveDialog::ArchiveDialog(TQWidget *parent, const TQString &filename, - KHTMLPart *part) : + TDEHTMLPart *part) : KDialogBase(parent, "WebArchiveDialog", false, i18n("Web Archiver"), KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::User1 ), m_bPreserveWS(false), m_tmpFile(0), m_url(part->url()) @@ -271,7 +271,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas /* Going recursively down creating a DOM-Tree for the Frame, second Level of recursion */ //## Add Termination criteria, on the other hand frames are not indefinetly nested, are they :) - KHTMLPart* part = new KHTMLPart(); + TDEHTMLPart* part = new TDEHTMLPart(); KURL absoluteURL = getAbsoluteURL(baseURL, attrValue); part->openURL(absoluteURL); saveFile(getUniqueFileName(absoluteURL.fileName()), part); diff --git a/konq-plugins/webarchiver/archivedialog.h b/konq-plugins/webarchiver/archivedialog.h index da0212c..c64307d 100644 --- a/konq-plugins/webarchiver/archivedialog.h +++ b/konq-plugins/webarchiver/archivedialog.h @@ -32,7 +32,7 @@ #include <tqvaluelist.h> class TQWidget; -class KHTMLPart; +class TDEHTMLPart; class ArchiveViewBase; class KURL; class KTar; @@ -44,7 +44,7 @@ class ArchiveDialog : public KDialogBase Q_OBJECT public: - ArchiveDialog(TQWidget *parent, const TQString &targetFilename, KHTMLPart *part); + ArchiveDialog(TQWidget *parent, const TQString &targetFilename, TDEHTMLPart *part); ~ArchiveDialog(); void archive(); diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index 2d7f006..abb72c9 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -67,9 +67,9 @@ PluginWebArchiver::~PluginWebArchiver() void PluginWebArchiver::slotSaveToArchive() { // ## Unicode ok? - if( !parent() || !parent()->inherits("KHTMLPart")) + if( !parent() || !parent()->inherits("TDEHTMLPart")) return; - KHTMLPart *part = static_cast<KHTMLPart *>( parent() ); + TDEHTMLPart *part = static_cast<TDEHTMLPart *>( parent() ); TQString archiveName = TQString::fromUtf8(part->htmlDocument().title().string().utf8()); diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp index 200dc54..48e1454 100644 --- a/konq-plugins/webarchiver/webarchivecreator.cpp +++ b/konq-plugins/webarchiver/webarchivecreator.cpp @@ -52,7 +52,7 @@ bool WebArchiveCreator::create(const TQString &path, int width, int height, TQIm { if (!m_html) { - m_html = new KHTMLPart; + m_html = new TDEHTMLPart; connect(m_html, TQT_SIGNAL(completed()), TQT_SLOT(slotCompleted())); m_html->setJScriptEnabled(false); m_html->setJavaEnabled(false); diff --git a/konq-plugins/webarchiver/webarchivecreator.h b/konq-plugins/webarchiver/webarchivecreator.h index 461ccfc..4bd1ccf 100644 --- a/konq-plugins/webarchiver/webarchivecreator.h +++ b/konq-plugins/webarchiver/webarchivecreator.h @@ -24,7 +24,7 @@ #include <tdeio/thumbcreator.h> -class KHTMLPart; +class TDEHTMLPart; class WebArchiveCreator : public TQObject, public ThumbCreator { @@ -43,7 +43,7 @@ private slots: void slotCompleted(); private: - KHTMLPart *m_html; + TDEHTMLPart *m_html; bool m_completed; }; |