diff options
Diffstat (limited to 'konqueror')
52 files changed, 105 insertions, 105 deletions
diff --git a/konqueror/CMakeLists.txt b/konqueror/CMakeLists.txt index e257145ec..83d75d646 100644 --- a/konqueror/CMakeLists.txt +++ b/konqueror/CMakeLists.txt @@ -108,7 +108,7 @@ set( ${target}_SRCS tde_add_tdeinit_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK konqueror_intern-static konq-shared kutils-shared + LINK konqueror_intern-static konq-shared tdeutils-shared ) diff --git a/konqueror/DESIGN b/konqueror/DESIGN index 459ade9c8..45ff6e47f 100644 --- a/konqueror/DESIGN +++ b/konqueror/DESIGN @@ -39,7 +39,7 @@ dirtree/* : KonqDirTree, the directory tree Libs used by konqueror ====================== -tdecore, tdeui, kfile, khtml, kparts - usual stuff :) +tdecore, tdeui, kfile, tdehtml, tdeparts - usual stuff :) libkio - I/O stuff, mimetypes, services libkonq - bookmarks, properties dialog, templates ("new") menu, icon view widget @@ -83,7 +83,7 @@ when the loading is completed, and right before loading another URL). Reason: among other things, many views store the x and y offset of their scrollview in there. It calls restoreState() when restoring a particular item out of the history list. -From the khtml side: +From the tdehtml side: * Site with no frames: no problem, it just obeys to saveState/restoreState. @@ -91,9 +91,9 @@ From the khtml side: KHTMLPart saves the whole structure (all frames, and their URL) in the history buffer (saveState/restoreState). Every time a frame changes its URL, we want a new item in the history. -But when this happens, since it's internal to khtml, konqueror wouldn't know +But when this happens, since it's internal to tdehtml, konqueror wouldn't know about it. That's why there is the openURLNotify() signal in browser extension (see there for extensive docu about it). -When khtml emits it, KonqView creates a new history entry and fills it +When tdehtml emits it, KonqView creates a new history entry and fills it (calling saveState). diff --git a/konqueror/DESIGN_config b/konqueror/DESIGN_config index ee6abf206..bcd07f7dc 100644 --- a/konqueror/DESIGN_config +++ b/konqueror/DESIGN_config @@ -27,7 +27,7 @@ builtin (to view READMEs) but c++, h, java, ... to my editor. And one that doesn't like embedded viewers (like Martin ;)) can set defaults to 'no' without having to change all mimetypes (text, c, c++, ...) -but still use libkhtml for HTML pages, by setting 'use builtin' in the +but still use libtdehtml for HTML pages, by setting 'use builtin' in the mimetype text/html - this is the way to keep the exact (though inconsistent) behaviour of 1.1-kfm. diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am index 3d723a6bb..aa9e0d7ae 100644 --- a/konqueror/Makefile.am +++ b/konqueror/Makefile.am @@ -60,7 +60,7 @@ konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC) #check_PROGRAMS = konqueror_static # #konqueror_static_SOURCES = dummy.cc -#konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libkhtml.la +#konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libtdehtml.la #konqueror_static_LDFLAGS = $(all_libraries) -static messages: rc.cpp diff --git a/konqueror/about/CMakeLists.txt b/konqueror/about/CMakeLists.txt index 55e8f4462..5eb9cc0f6 100644 --- a/konqueror/about/CMakeLists.txt +++ b/konqueror/about/CMakeLists.txt @@ -39,6 +39,6 @@ set( target konq_aboutpage ) tde_add_kpart( ${target} AUTOMOC SOURCES konq_aboutpage.cc - LINK khtml-shared + LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cc index c87b5dbfd..fed36a1e2 100644 --- a/konqueror/about/konq_aboutpage.cc +++ b/konqueror/about/konq_aboutpage.cc @@ -281,12 +281,12 @@ TQString KonqAboutPageFactory::specs() .arg( i18n("<A HREF=\"%1\">Cascading Style Sheets</A> (CSS 1, partially CSS 2)").arg("http://www.w3.org/Style/CSS/") ) .arg( i18n("built-in") ) .arg( i18n("<A HREF=\"%1\">ECMA-262</A> Edition 3 (roughly equals JavaScript 1.5)").arg("http://www.ecma.ch/ecma1/STAND/ECMA-262.HTM") ) - .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) - .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! + .arg( i18n("JavaScript disabled (globally). Enable JavaScript <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) + .arg( i18n("JavaScript enabled (globally). Configure JavaScript <A HREF=\\\"%1\\\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) // leave the double backslashes here, they are necessary for javascript ! .arg( i18n("Secure <A HREF=\"%1\">Java</A><SUP>®</SUP> support").arg("http://java.sun.com") ) .arg( i18n("JDK 1.2.0 (Java 2) compatible VM (<A HREF=\"%1\">Blackdown</A>, <A HREF=\"%2\">IBM</A> or <A HREF=\"%3\">Sun</A>)") .arg("http://www.blackdown.org").arg("http://www.ibm.com").arg("http://java.sun.com") ) - .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell khtml_java_js") ) // TODO Maybe test if Java is enabled ? + .arg( i18n("Enable Java (globally) <A HREF=\"%1\">here</A>.").arg("exec:/kcmshell tdehtml_java_js") ) // TODO Maybe test if Java is enabled ? .arg( i18n("Netscape Communicator<SUP>®</SUP> <A HREF=\"%4\">plugins</A> (for viewing <A HREF=\"%1\">Flash<SUP>®</SUP></A>, <A HREF=\"%2\">Real<SUP>®</SUP></A>Audio, <A HREF=\"%3\">Real<SUP>®</SUP></A>Video, etc.)") .arg("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash") .arg("http://www.real.com").arg("http://www.real.com") diff --git a/konqueror/about/konq_aboutpage.h b/konqueror/about/konq_aboutpage.h index 96229c42c..d9513d5d3 100644 --- a/konqueror/about/konq_aboutpage.h +++ b/konqueror/about/konq_aboutpage.h @@ -1,8 +1,8 @@ #ifndef __konq_aboutpage_h__ #define __konq_aboutpage_h__ -#include <kparts/factory.h> -#include <khtml_part.h> +#include <tdeparts/factory.h> +#include <tdehtml_part.h> class KHTMLPart; class TDEInstance; diff --git a/konqueror/client/kfmclient_3_2_update.sh b/konqueror/client/kfmclient_3_2_update.sh index 6c3adbd15..6933a99fe 100644 --- a/konqueror/client/kfmclient_3_2_update.sh +++ b/konqueror/client/kfmclient_3_2_update.sh @@ -5,7 +5,7 @@ while read ln; do continue fi if test "$ln" = "StartNewKonqueror=Local only"; then - echo "SafeParts=khtml.desktop" + echo "SafeParts=tdehtml.desktop" elif test "$ln" = "StartNewKonqueror=Web only"; then echo "SafeParts=SAFE" elif test "$ln" = "StartNewKonqueror=Always" \ diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc index 78f6472c6..b5848dd8c 100644 --- a/konqueror/iconview/konq_iconview.cc +++ b/konqueror/iconview/konq_iconview.cc @@ -36,7 +36,7 @@ #include <konq_settings.h> #include <kpropertiesdialog.h> #include <kstdaction.h> -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <ktrader.h> #include <klocale.h> #include <kivdirectoryoverlay.h> diff --git a/konqueror/iconview/konq_iconview.h b/konqueror/iconview/konq_iconview.h index 107c83ca3..425f54d1d 100644 --- a/konqueror/iconview/konq_iconview.h +++ b/konqueror/iconview/konq_iconview.h @@ -19,7 +19,7 @@ #ifndef __konq_iconview_h__ #define __konq_iconview_h__ -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <konq_iconviewwidget.h> #include <konq_operations.h> #include <konq_dirpart.h> diff --git a/konqueror/keditbookmarks/DESIGN b/konqueror/keditbookmarks/DESIGN index 9ef300f81..723a279d7 100644 --- a/konqueror/keditbookmarks/DESIGN +++ b/konqueror/keditbookmarks/DESIGN @@ -11,7 +11,7 @@ various other thingies: exporters : forwarders to kio/bookmarks code, and html export code dcop : dcop handling, internal interface bookmarkiterator : is a baseclass for iterating actions, of sorts... - updater : favicon updating base stuff - kio/khtml crap + updater : favicon updating base stuff - kio/tdehtml crap testlink : link testing stuff 3 different selection styles: diff --git a/konqueror/keditbookmarks/Makefile.am b/konqueror/keditbookmarks/Makefile.am index 4da0053a6..681e1ab14 100644 --- a/konqueror/keditbookmarks/Makefile.am +++ b/konqueror/keditbookmarks/Makefile.am @@ -7,7 +7,7 @@ lib_LTLIBRARIES = tdeinit_LTLIBRARIES = keditbookmarks.la kbookmarkmerger_SOURCES = kbookmarkmerger.cpp -kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kbookmarkmerger_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kbookmarkmerger_LDADD = $(LIB_KIO) dcop_DCOPIDLNG = true diff --git a/konqueror/keditbookmarks/actionsimpl.cpp b/konqueror/keditbookmarks/actionsimpl.cpp index 75f96ed18..4bcd50735 100644 --- a/konqueror/keditbookmarks/actionsimpl.cpp +++ b/konqueror/keditbookmarks/actionsimpl.cpp @@ -55,8 +55,8 @@ #include <ktempfile.h> #include <kstandarddirs.h> -#include <kparts/part.h> -#include <kparts/componentfactory.h> +#include <tdeparts/part.h> +#include <tdeparts/componentfactory.h> #include <kicondialog.h> #include <kiconloader.h> diff --git a/konqueror/keditbookmarks/favicons.h b/konqueror/keditbookmarks/favicons.h index 97894d741..3be46d35f 100644 --- a/konqueror/keditbookmarks/favicons.h +++ b/konqueror/keditbookmarks/favicons.h @@ -24,8 +24,8 @@ #include <kbookmark.h> #include <konq_faviconmgr.h> -#include <kparts/part.h> -#include <kparts/browserinterface.h> +#include <tdeparts/part.h> +#include <tdeparts/browserinterface.h> #include "bookmarkiterator.h" diff --git a/konqueror/keditbookmarks/updater.cpp b/konqueror/keditbookmarks/updater.cpp index ee2b6d3b6..4060b08a8 100644 --- a/konqueror/keditbookmarks/updater.cpp +++ b/konqueror/keditbookmarks/updater.cpp @@ -32,9 +32,9 @@ #include <kio/job.h> -#include <kparts/part.h> -#include <kparts/componentfactory.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/browserextension.h> FavIconUpdater::FavIconUpdater(TQObject *parent, const char *name) : KonqFavIconMgr(parent, name) { @@ -123,7 +123,7 @@ void FavIconUpdater::downloadIconActual(const KBookmark &bk) { m_webGrabber = new FavIconWebGrabber(m_part, bk.url()); } -// khtml callback +// tdehtml callback void FavIconUpdater::setIconURL(const KURL &iconURL) { setIconForURL(m_bk.url(), iconURL); } diff --git a/konqueror/keditbookmarks/updater.h b/konqueror/keditbookmarks/updater.h index 454b51672..44a19af40 100644 --- a/konqueror/keditbookmarks/updater.h +++ b/konqueror/keditbookmarks/updater.h @@ -24,8 +24,8 @@ #include <kbookmark.h> #include <konq_faviconmgr.h> -#include <kparts/part.h> -#include <kparts/browserinterface.h> +#include <tdeparts/part.h> +#include <tdeparts/browserinterface.h> class FavIconWebGrabber : public QObject { diff --git a/konqueror/konq_browseriface.h b/konqueror/konq_browseriface.h index e21d0a9ec..1564a73e2 100644 --- a/konqueror/konq_browseriface.h +++ b/konqueror/konq_browseriface.h @@ -1,7 +1,7 @@ #ifndef __konq_browseriface_h__ #define __konq_browseriface_h__ -#include <kparts/browserinterface.h> +#include <tdeparts/browserinterface.h> class KonqView; diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cc index c252cd0dc..b07135366 100644 --- a/konqueror/konq_combo.cc +++ b/konqueror/konq_combo.cc @@ -651,7 +651,7 @@ void KonqCombo::setPageSecurity( int pageSecurity ) bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2) { - // Taken from khtml/misc/helper.cc + // Taken from tdehtml/misc/helper.cc #define HUE_DISTANCE 40 #define CONTRAST_DISTANCE 10 diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cc index ef53fd684..120f36e4e 100644 --- a/konqueror/konq_extensionmanager.cc +++ b/konqueror/konq_extensionmanager.cc @@ -20,8 +20,8 @@ #include <kconfig.h> #include <kdebug.h> #include <klocale.h> -#include <kparts/componentfactory.h> -#include <kparts/plugin.h> +#include <tdeparts/componentfactory.h> +#include <tdeparts/plugin.h> #include <kplugininfo.h> #include <kpluginselector.h> #include <ksettings/dispatcher.h> @@ -60,7 +60,7 @@ KonqExtensionManager::KonqExtensionManager(TQWidget *parent, KonqMainWindow *mai d->activePart = activePart; // There's a limitation of KPluginSelector here... It assumes that all plugins in a given widget (as created by addPlugins) - // have their config in the same TDEConfig[Group]. So we can't show konqueror extensions and khtml extensions in the same tab. + // have their config in the same TDEConfig[Group]. So we can't show konqueror extensions and tdehtml extensions in the same tab. d->pluginSelector->addPlugins("konqueror", i18n("Extensions"), "Extensions", TDEGlobal::config()); if ( activePart ) { TDEInstance* instance = activePart->instance(); diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cc index a61ae8068..4f7fdf842 100644 --- a/konqueror/konq_factory.cc +++ b/konqueror/konq_factory.cc @@ -19,7 +19,7 @@ */ -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include "konq_factory.h" #include "version.h" diff --git a/konqueror/konq_factory.h b/konqueror/konq_factory.h index 4307defb9..d856dbfa6 100644 --- a/konqueror/konq_factory.h +++ b/konqueror/konq_factory.h @@ -28,7 +28,7 @@ #include <klibloader.h> #include <ktrader.h> -#include <kparts/part.h> +#include <tdeparts/part.h> class BrowserView; class KonqMainWindow; diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc index f6451155b..09ea92c87 100644 --- a/konqueror/konq_mainwindow.cc +++ b/konqueror/konq_mainwindow.cc @@ -88,7 +88,7 @@ #include <kstdaccel.h> #include <kstdaction.h> #include <kstandarddirs.h> -#include <ksycoca.h> +#include <tdesycoca.h> #include <ktempfile.h> #include <kurlrequesterdlg.h> #include <kurlrequester.h> @@ -3875,13 +3875,13 @@ void KonqMainWindow::initActions() m_configureModules << "kde-filebehavior.desktop" << "kde-fileappearance.desktop" << "kde-filepreviews.desktop" << "tde-filetypes.desktop" << - "tde-khtml_behavior.desktop" << "tde-khtml_java_js.desktop" << - "tde-khtml_filter.desktop" << - "tde-khtml_fonts.desktop" << "tde-ebrowsing.desktop" << + "tde-tdehtml_behavior.desktop" << "tde-tdehtml_java_js.desktop" << + "tde-tdehtml_filter.desktop" << + "tde-tdehtml_fonts.desktop" << "tde-ebrowsing.desktop" << "tde-kcmhistory.desktop" << "tde-cookies.desktop" << "tde-cache.desktop" << "tde-proxy.desktop" << "tde-kcmcss.desktop" << "tde-crypto.desktop" << "tde-useragent.desktop" << - "tde-khtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop"; + "tde-tdehtml_plugins.desktop" << "kde-kcmkonqyperformance.desktop"; if (!kapp->authorizeControlModules(configModules()).isEmpty()) diff --git a/konqueror/konq_mainwindow.h b/konqueror/konq_mainwindow.h index fe016b18c..bb850195b 100644 --- a/konqueror/konq_mainwindow.h +++ b/konqueror/konq_mainwindow.h @@ -30,7 +30,7 @@ #include <kfileitem.h> #include "konq_openurlrequest.h" -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include <kbookmarkmanager.h> #include <kcompletion.h> #include <kurlcompletion.h> diff --git a/konqueror/konq_misc.h b/konqueror/konq_misc.h index bab4ca853..ada1712c5 100644 --- a/konqueror/konq_misc.h +++ b/konqueror/konq_misc.h @@ -24,7 +24,7 @@ // konq_main.cc #include <krun.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> class KonqMainWindow; class KonqView; diff --git a/konqueror/konq_openurlrequest.h b/konqueror/konq_openurlrequest.h index dffc0025d..3e0f65e2d 100644 --- a/konqueror/konq_openurlrequest.h +++ b/konqueror/konq_openurlrequest.h @@ -3,7 +3,7 @@ #include <tqstringlist.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> struct KonqOpenURLRequest { diff --git a/konqueror/konq_run.h b/konqueror/konq_run.h index 0fb97a1cf..a5539b993 100644 --- a/konqueror/konq_run.h +++ b/konqueror/konq_run.h @@ -20,7 +20,7 @@ #ifndef __kfm_run_h__ #define __kfm_run_h__ -#include <kparts/browserrun.h> +#include <tdeparts/browserrun.h> #include <tqguardedptr.h> #include <kservice.h> #include "konq_openurlrequest.h" diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc index ffa12321c..c19438668 100644 --- a/konqueror/konq_view.cc +++ b/konqueror/konq_view.cc @@ -29,8 +29,8 @@ #include "konq_viewmgr.h" #include "konq_tabs.h" #include "konq_browseriface.h" -#include <kparts/statusbarextension.h> -#include <kparts/browserextension.h> +#include <tdeparts/statusbarextension.h> +#include <tdeparts/browserextension.h> #include <konq_historymgr.h> #include <konq_pixmapprovider.h> diff --git a/konqueror/konq_viewmgr.h b/konqueror/konq_viewmgr.h index 0323bd504..766cfb799 100644 --- a/konqueror/konq_viewmgr.h +++ b/konqueror/konq_viewmgr.h @@ -29,7 +29,7 @@ #include <ktrader.h> -#include <kparts/partmanager.h> +#include <tdeparts/partmanager.h> #include "konq_openurlrequest.h" class TQString; diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg index c4a82225f..0b0b9f640 100644 --- a/konqueror/konqueror.kcfg +++ b/konqueror/konqueror.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <include>khtmldefaults.h</include> + <include>tdehtmldefaults.h</include> <kcfgfile name="konquerorrc" /> @@ -283,18 +283,18 @@ <whatsthis></whatsthis> <!-- Can't find writeEntry --> </entry> -<!-- KDELIBS/khtml_part.cpp --> +<!-- KDELIBS/tdehtml_part.cpp --> <entry key="AutomaticDetectionLanguage" type="Int"> <!--KHTML--> <label></label> <whatsthis></whatsthis> </entry> -<!-- KDELIBS/khtml_settings.cpp --> +<!-- KDELIBS/tdehtml_settings.cpp --> <entry key="EnforceDefaultCharset" type="Bool"> <!--KHTML--> <label></label> <whatsthis></whatsthis> <!-- Can't find writeEntry --> </entry> -<!-- kcmcss.cpp KDELIBS/khtml_settings.cpp --> +<!-- kcmcss.cpp KDELIBS/tdehtml_settings.cpp --> <entry key="UserStyleSheetEnabled" type="Bool"> <!--KHTML--> <label></label> <whatsthis></whatsthis> diff --git a/konqueror/kttsplugin/CMakeLists.txt b/konqueror/kttsplugin/CMakeLists.txt index 80180aa8e..fc3f409fe 100644 --- a/konqueror/kttsplugin/CMakeLists.txt +++ b/konqueror/kttsplugin/CMakeLists.txt @@ -24,16 +24,16 @@ link_directories( ##### other data ################################ install( FILES - khtmlkttsd.rc khtmlkttsd.desktop - DESTINATION ${DATA_INSTALL_DIR}/khtml/kpartplugins ) + tdehtmlkttsd.rc tdehtmlkttsd.desktop + DESTINATION ${DATA_INSTALL_DIR}/tdehtml/kpartplugins ) -##### libkhtmlkttsdplugin (module) ############## +##### libtdehtmlkttsdplugin (module) ############## -set( target libkhtmlkttsdplugin ) +set( target libtdehtmlkttsdplugin ) tde_add_kpart( ${target} AUTOMOC - SOURCES khtmlkttsd.cpp - LINK khtml-shared + SOURCES tdehtmlkttsd.cpp + LINK tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/kttsplugin/Makefile.am b/konqueror/kttsplugin/Makefile.am index 580a18dcd..d82a56fc2 100644 --- a/konqueror/kttsplugin/Makefile.am +++ b/konqueror/kttsplugin/Makefile.am @@ -2,15 +2,15 @@ INCLUDES = $(all_includes) METASOURCES = AUTO # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = libkhtmlkttsdplugin.la +kde_module_LTLIBRARIES = libtdehtmlkttsdplugin.la -libkhtmlkttsdplugin_la_SOURCES = khtmlkttsd.cpp -libkhtmlkttsdplugin_la_LIBADD = $(LIB_KHTML) -libkhtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) +libtdehtmlkttsdplugin_la_SOURCES = tdehtmlkttsd.cpp +libtdehtmlkttsdplugin_la_LIBADD = $(LIB_KHTML) +libtdehtmlkttsdplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -pluginsdir = $(kde_datadir)/khtml/kpartplugins -plugins_DATA = khtmlkttsd.rc khtmlkttsd.desktop +pluginsdir = $(kde_datadir)/tdehtml/kpartplugins +plugins_DATA = tdehtmlkttsd.rc tdehtmlkttsd.desktop messages: rc.cpp $(EXTRACTRC) *.rc > rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/khtmlkttsd.pot + $(XGETTEXT) *.cpp -o $(podir)/tdehtmlkttsd.pot diff --git a/konqueror/kttsplugin/khtmlkttsd.cpp b/konqueror/kttsplugin/tdehtmlkttsd.cpp index e832bd27a..80b756a8b 100644 --- a/konqueror/kttsplugin/khtmlkttsd.cpp +++ b/konqueror/kttsplugin/tdehtmlkttsd.cpp @@ -13,12 +13,12 @@ * * ***************************************************************************/ -#include <khtml_part.h> // this plugin applies to a khtml part +#include <tdehtml_part.h> // this plugin applies to a tdehtml part #include <dom/html_document.h> #include <dom/html_element.h> #include <dom/dom_string.h> #include <kdebug.h> -#include "khtmlkttsd.h" +#include "tdehtmlkttsd.h" #include <kaction.h> #include <kgenericfactory.h> #include <kiconloader.h> @@ -133,6 +133,6 @@ void KHTMLPluginKTTSD::slotReadOut() } } -K_EXPORT_COMPONENT_FACTORY( libkhtmlkttsdplugin, KGenericFactory<KHTMLPluginKTTSD>("khtmlkttsd") ) +K_EXPORT_COMPONENT_FACTORY( libtdehtmlkttsdplugin, KGenericFactory<KHTMLPluginKTTSD>("tdehtmlkttsd") ) -#include "khtmlkttsd.moc" +#include "tdehtmlkttsd.moc" diff --git a/konqueror/kttsplugin/khtmlkttsd.desktop b/konqueror/kttsplugin/tdehtmlkttsd.desktop index 5e8519eb3..35db3445c 100644 --- a/konqueror/kttsplugin/khtmlkttsd.desktop +++ b/konqueror/kttsplugin/tdehtmlkttsd.desktop @@ -1,8 +1,8 @@ [Desktop Entry] -X-TDE-Library=libkhtmlkttsdplugin +X-TDE-Library=libtdehtmlkttsdplugin X-TDE-PluginInfo-Author=Olaf Schmidt -X-TDE-PluginInfo-Name=khtmlkttsdplugin +X-TDE-PluginInfo-Name=tdehtmlkttsdplugin X-TDE-PluginInfo-Version=3.4 X-TDE-PluginInfo-Website= X-TDE-PluginInfo-Category=Tools diff --git a/konqueror/kttsplugin/khtmlkttsd.h b/konqueror/kttsplugin/tdehtmlkttsd.h index cfe1e7d38..f42c9b03e 100644 --- a/konqueror/kttsplugin/khtmlkttsd.h +++ b/konqueror/kttsplugin/tdehtmlkttsd.h @@ -17,7 +17,7 @@ #ifndef KHTMLKTTSD_H #define KHTMLKTTSD_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KURL; class TDEInstance; diff --git a/konqueror/kttsplugin/khtmlkttsd.rc b/konqueror/kttsplugin/tdehtmlkttsd.rc index 388aec9e7..a06a29742 100644 --- a/konqueror/kttsplugin/khtmlkttsd.rc +++ b/konqueror/kttsplugin/tdehtmlkttsd.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui> -<kpartgui name="khtmlkttsdplugin" library="libkhtmlkttsdplugin" version="2" > +<kpartgui name="tdehtmlkttsdplugin" library="libtdehtmlkttsdplugin" version="2" > <MenuBar> <Menu name="tools"> <Text>&Tools</Text> diff --git a/konqueror/listview/konq_listview.h b/konqueror/listview/konq_listview.h index 40f8b2269..127ecc3b2 100644 --- a/konqueror/listview/konq_listview.h +++ b/konqueror/listview/konq_listview.h @@ -20,10 +20,10 @@ #ifndef __konq_listview_h__ #define __konq_listview_h__ -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <kglobalsettings.h> #include <konq_operations.h> -#include <kparts/factory.h> +#include <tdeparts/factory.h> #include <konq_dirpart.h> #include <kmimetyperesolver.h> diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc index 1dd7a25ad..bd26db191 100644 --- a/konqueror/listview/konq_listviewwidget.cc +++ b/konqueror/listview/konq_listviewwidget.cc @@ -840,7 +840,7 @@ void KonqBaseListViewWidget::startDrag() { int iconSize = m_pBrowserView->m_pProps->iconSize(); iconSize = iconSize ? iconSize : TDEGlobal::iconLoader()->currentSize( KIcon::Small ); // Default = small - pixmap2 = DesktopIcon( "kmultiple", iconSize ); + pixmap2 = DesktopIcon( "tdemultiple", iconSize ); if ( pixmap2.isNull() ) kdWarning(1202) << "Could not find multiple pixmap" << endl; } diff --git a/konqueror/listview/konq_listviewwidget.h b/konqueror/listview/konq_listviewwidget.h index 5dd6aca11..9bdc60e3d 100644 --- a/konqueror/listview/konq_listviewwidget.h +++ b/konqueror/listview/konq_listviewwidget.h @@ -26,7 +26,7 @@ #include <kurl.h> #include <kfileitem.h> #include <klistview.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <konq_propsview.h> #include "konq_listviewitems.h" diff --git a/konqueror/profile_kde_devel.desktop b/konqueror/profile_kde_devel.desktop index afb7d36e8..6c30b886f 100644 --- a/konqueror/profile_kde_devel.desktop +++ b/konqueror/profile_kde_devel.desktop @@ -76,35 +76,35 @@ Tabs0_activeChildIndex=0 ViewT0_LinkedView=false ViewT0_LockedLocation=false ViewT0_PassiveMode=false -ViewT0_ServiceName=khtml +ViewT0_ServiceName=tdehtml ViewT0_ServiceType=text/html ViewT0_ToggleView=false ViewT0_URL=http://www.trinitydesktop.org/docs/trinity/current/kdelibs/html/main.html ViewT1_LinkedView=false ViewT1_LockedLocation=false ViewT1_PassiveMode=false -ViewT1_ServiceName=khtml +ViewT1_ServiceName=tdehtml ViewT1_ServiceType=text/html ViewT1_ToggleView=false ViewT1_URL=http://www.trinitydesktop.org/docs/qt3/index-2.html ViewT2_LinkedView=false ViewT2_LockedLocation=false ViewT2_PassiveMode=false -ViewT2_ServiceName=khtml +ViewT2_ServiceName=tdehtml ViewT2_ServiceType=text/html ViewT2_ToggleView=false ViewT2_URL=http://bugs.trinitydesktop.org/ ViewT3_LinkedView=false ViewT3_LockedLocation=false ViewT3_PassiveMode=false -ViewT3_ServiceName=khtml +ViewT3_ServiceName=tdehtml ViewT3_ServiceType=text/html ViewT3_ToggleView=false ViewT3_URL=man:/gcc ViewT4_LinkedView=false ViewT4_LockedLocation=false ViewT4_PassiveMode=false -ViewT4_ServiceName=khtml +ViewT4_ServiceName=tdehtml ViewT4_ServiceType=text/html ViewT4_ToggleView=false ViewT4_URL=info:/dir diff --git a/konqueror/profile_tabbedbrowsing.desktop b/konqueror/profile_tabbedbrowsing.desktop index 38cc09e3c..c910cbac1 100644 --- a/konqueror/profile_tabbedbrowsing.desktop +++ b/konqueror/profile_tabbedbrowsing.desktop @@ -77,28 +77,28 @@ Tabs0_activeChildIndex=0 ViewT0_LinkedView=false ViewT0_LockedLocation=false ViewT0_PassiveMode=false -ViewT0_ServiceName=khtml +ViewT0_ServiceName=tdehtml ViewT0_ServiceType=text/html ViewT0_ToggleView=false ViewT0_URL=http://www.kde.org/ ViewT1_LinkedView=false ViewT1_LockedLocation=false ViewT1_PassiveMode=false -ViewT1_ServiceName=khtml +ViewT1_ServiceName=tdehtml ViewT1_ServiceType=text/html ViewT1_ToggleView=false ViewT1_URL=http://dot.kde.org/ ViewT2_LinkedView=false ViewT2_LockedLocation=false ViewT2_PassiveMode=false -ViewT2_ServiceName=khtml +ViewT2_ServiceName=tdehtml ViewT2_ServiceType=text/html ViewT2_ToggleView=false ViewT2_URL=http://themes.kde.org/ ViewT3_LinkedView=false ViewT3_LockedLocation=false ViewT3_PassiveMode=false -ViewT3_ServiceName=khtml +ViewT3_ServiceName=tdehtml ViewT3_ServiceType=text/html ViewT3_ToggleView=false ViewT3_URL=http://www.kde-apps.org/ diff --git a/konqueror/quickprint/TODO b/konqueror/quickprint/TODO index d858e8db6..5001bfaf7 100644 --- a/konqueror/quickprint/TODO +++ b/konqueror/quickprint/TODO @@ -5,7 +5,7 @@ - set the position of the picture on the site and something like that - printing html (homepges) - print the html code like for the textprinting - - print the html file like it was parsed with khtml + - print the html file like it was parsed with tdehtml - printing TeX documents with a action on the TeX source - I don't know at the moment options for that - ... diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp index 9ae297285..838f2aad7 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.cpp @@ -37,7 +37,7 @@ #include <kprotocolinfo.h> #include <kio/slaveconfig.h> #include <konq_dirpart.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include "kremoteencodingplugin.h" diff --git a/konqueror/remoteencodingplugin/kremoteencodingplugin.h b/konqueror/remoteencodingplugin/kremoteencodingplugin.h index d663baf6c..9b80888a5 100644 --- a/konqueror/remoteencodingplugin/kremoteencodingplugin.h +++ b/konqueror/remoteencodingplugin/kremoteencodingplugin.h @@ -24,7 +24,7 @@ #include <tqstringlist.h> #include <kurl.h> #include <klibloader.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KActionMenu; class TDEConfig; diff --git a/konqueror/shellcmdplugin/kshellcmdplugin.h b/konqueror/shellcmdplugin/kshellcmdplugin.h index f942c82bf..16874adc0 100644 --- a/konqueror/shellcmdplugin/kshellcmdplugin.h +++ b/konqueror/shellcmdplugin/kshellcmdplugin.h @@ -19,7 +19,7 @@ #ifndef kshellcmdplugin_h #define kshellcmdplugin_h -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <klibloader.h> class KShellCmdPlugin : public KParts::Plugin diff --git a/konqueror/sidebar/CMakeLists.txt b/konqueror/sidebar/CMakeLists.txt index ba9f677ce..fa9c3cbd5 100644 --- a/konqueror/sidebar/CMakeLists.txt +++ b/konqueror/sidebar/CMakeLists.txt @@ -51,7 +51,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${LIB_INSTALL_DIR} ) @@ -66,6 +66,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK konqsidebarplugin-shared konq-shared kio-shared kutils-shared + LINK konqsidebarplugin-shared konq-shared kio-shared tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/sidebar/konqsidebar.h b/konqueror/sidebar/konqsidebar.h index 660fda9df..dfdd2e2e0 100644 --- a/konqueror/sidebar/konqsidebar.h +++ b/konqueror/sidebar/konqsidebar.h @@ -17,10 +17,10 @@ #ifndef KONQSIDEBARPART_H #define KONQSIDEBARPART_H -#include <kparts/part.h> -#include <kparts/factory.h> -#include <kparts/event.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/factory.h> +#include <tdeparts/event.h> +#include <tdeparts/browserextension.h> #include <tqguardedptr.h> #include "sidebar_widget.h" #include "konqsidebariface_p.h" diff --git a/konqueror/sidebar/konqsidebarplugin.h b/konqueror/sidebar/konqsidebarplugin.h index b9225edfa..0433261c7 100644 --- a/konqueror/sidebar/konqsidebarplugin.h +++ b/konqueror/sidebar/konqsidebarplugin.h @@ -22,8 +22,8 @@ #include <tqobject.h> #include <kurl.h> #include <tqstring.h> -#include <kparts/part.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/browserextension.h> #include <kio/job.h> #include <tqguardedptr.h> #include <kfileitem.h> diff --git a/konqueror/sidebar/sidebar_widget.h b/konqueror/sidebar/sidebar_widget.h index da5b0888b..c5ee75a8a 100644 --- a/konqueror/sidebar/sidebar_widget.h +++ b/konqueror/sidebar/sidebar_widget.h @@ -25,8 +25,8 @@ #include <kdockwidget.h> #include <kurl.h> #include <ktoolbar.h> -#include <kparts/part.h> -#include <kmultitabbar.h> +#include <tdeparts/part.h> +#include <tdemultitabbar.h> #include "konqsidebarplugin.h" #include "konqsidebariface_p.h" diff --git a/konqueror/sidebar/trees/konqsidebar_tree.h b/konqueror/sidebar/trees/konqsidebar_tree.h index b70230b9e..5a198eeca 100644 --- a/konqueror/sidebar/trees/konqsidebar_tree.h +++ b/konqueror/sidebar/trees/konqsidebar_tree.h @@ -3,9 +3,9 @@ #include <konqsidebarplugin.h> #include <tqlabel.h> #include <tqlayout.h> -#include <kparts/part.h> -#include <kparts/factory.h> -#include <kparts/browserextension.h> +#include <tdeparts/part.h> +#include <tdeparts/factory.h> +#include <tdeparts/browserextension.h> #include <kdialogbase.h> #include <tqcombobox.h> #include <tqstringlist.h> diff --git a/konqueror/sidebar/web_module/CMakeLists.txt b/konqueror/sidebar/web_module/CMakeLists.txt index a925474b4..a15866ebd 100644 --- a/konqueror/sidebar/web_module/CMakeLists.txt +++ b/konqueror/sidebar/web_module/CMakeLists.txt @@ -35,6 +35,6 @@ set( target konqsidebar_web ) tde_add_kpart( ${target} AUTOMOC SOURCES web_module.cpp - LINK konqsidebarplugin-shared konq-shared khtml-shared + LINK konqsidebarplugin-shared konq-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/konqueror/sidebar/web_module/web_module.cpp b/konqueror/sidebar/web_module/web_module.cpp index a337c65c6..1386ee0a7 100644 --- a/konqueror/sidebar/web_module/web_module.cpp +++ b/konqueror/sidebar/web_module/web_module.cpp @@ -28,7 +28,7 @@ #include <kglobal.h> #include <klocale.h> #include <konq_pixmapprovider.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserextension.h> #include <kstandarddirs.h> diff --git a/konqueror/sidebar/web_module/web_module.h b/konqueror/sidebar/web_module/web_module.h index 4e0c3d6d7..b7538bff3 100644 --- a/konqueror/sidebar/web_module/web_module.h +++ b/konqueror/sidebar/web_module/web_module.h @@ -20,7 +20,7 @@ #define web_module_h #include <assert.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kiconloader.h> #include <klocale.h> #include <konqsidebarplugin.h> |