diff options
Diffstat (limited to 'nsplugins')
-rw-r--r-- | nsplugins/CMakeLists.txt | 4 | ||||
-rw-r--r-- | nsplugins/Makefile.am | 4 | ||||
-rw-r--r-- | nsplugins/nspluginloader.cpp | 2 | ||||
-rw-r--r-- | nsplugins/plugin_part.cpp | 8 | ||||
-rw-r--r-- | nsplugins/plugin_part.h | 6 | ||||
-rw-r--r-- | nsplugins/tdehtml_plugins.desktop (renamed from nsplugins/khtml_plugins.desktop) | 6 | ||||
-rw-r--r-- | nsplugins/test/Makefile.am | 2 | ||||
-rw-r--r-- | nsplugins/viewer/CMakeLists.txt | 2 | ||||
-rw-r--r-- | nsplugins/viewer/nsplugin.h | 2 |
9 files changed, 18 insertions, 18 deletions
diff --git a/nsplugins/CMakeLists.txt b/nsplugins/CMakeLists.txt index 09731c2a9..9ed66c7bb 100644 --- a/nsplugins/CMakeLists.txt +++ b/nsplugins/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### other data ################################ -install( FILES khtml_plugins.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES tdehtml_plugins.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install( FILES nspluginpart.rc DESTINATION ${DATA_INSTALL_DIR}/plugin ) @@ -36,7 +36,7 @@ tde_add_kpart( libnsplugin AUTOMOC viewer/NSPluginClassIface.stub NSPluginCallbackIface.skel plugin_part.cpp nspluginloader.cpp - LINK kparts-shared + LINK tdeparts-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/nsplugins/Makefile.am b/nsplugins/Makefile.am index 7a01b759a..d23881b6f 100644 --- a/nsplugins/Makefile.am +++ b/nsplugins/Makefile.am @@ -11,7 +11,7 @@ libnsplugin_la_SOURCES = plugin_part.cpp nspluginloader.cpp \ NSPluginCallbackIface.skel libnsplugin_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_PLUGIN) -no-undefined -libnsplugin_la_LIBADD = -lkparts +libnsplugin_la_LIBADD = -ltdeparts bin_PROGRAMS = nspluginscan nspluginscan_SOURCES = pluginscan.cpp @@ -25,7 +25,7 @@ kcm_nsplugins_la_LIBADD = $(LIB_TDECORE) libpluginpaths.la noinst_LTLIBRARIES = libpluginpaths.la libpluginpaths_la_SOURCES = plugin_paths.cpp -xdg_apps_DATA = khtml_plugins.desktop +xdg_apps_DATA = tdehtml_plugins.desktop partrcdir = $(kde_datadir)/plugin partrc_DATA = nspluginpart.rc diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp index 55fd769cf..115490552 100644 --- a/nsplugins/nspluginloader.cpp +++ b/nsplugins/nspluginloader.cpp @@ -378,7 +378,7 @@ bool NSPluginLoader::loadViewer(const TQString &mimeType) int cnt = 0; while (!kapp->dcopClient()->isApplicationRegistered(_dcopid)) { - //kapp->processEvents(); // would lead to recursive calls in khtml + //kapp->processEvents(); // would lead to recursive calls in tdehtml #ifdef HAVE_USLEEP usleep( 50*1000 ); #else diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp index 714a4c269..104619f29 100644 --- a/nsplugins/plugin_part.cpp +++ b/nsplugins/plugin_part.cpp @@ -28,8 +28,8 @@ #include <kfiledialog.h> #include <kio/netaccess.h> #include <klocale.h> -#include <kparts/browserinterface.h> -#include <kparts/browserextension.h> +#include <tdeparts/browserinterface.h> +#include <tdeparts/browserextension.h> #include <tqlabel.h> @@ -210,7 +210,7 @@ PluginPart::PluginPart(TQWidget *parentWidget, const char *widgetName, TQObject kdDebug(1432) << "PluginPart::PluginPart" << endl; // we have to keep the class name of KParts::PluginBrowserExtension - // to let khtml find it + // to let tdehtml find it _extension = static_cast<PluginBrowserExtension*>(new KParts::BrowserExtension(this)); _liveconnect = new PluginLiveConnectExtension(this); @@ -277,7 +277,7 @@ bool PluginPart::openURL(const KURL &url) kdDebug(1432) << "name=" << name << " value=" << value << endl; if (!name.isEmpty()) { - // hack to pass view mode from khtml + // hack to pass view mode from tdehtml if ( name=="__KHTML__PLUGINEMBED" ) { embed = true; kdDebug(1432) << "__KHTML__PLUGINEMBED found" << endl; diff --git a/nsplugins/plugin_part.h b/nsplugins/plugin_part.h index e29d91ee7..f3fa68984 100644 --- a/nsplugins/plugin_part.h +++ b/nsplugins/plugin_part.h @@ -24,9 +24,9 @@ #ifndef __plugin_part_h__ #define __plugin_part_h__ -#include <kparts/browserextension.h> -#include <kparts/factory.h> -#include <kparts/part.h> +#include <tdeparts/browserextension.h> +#include <tdeparts/factory.h> +#include <tdeparts/part.h> #include <klibloader.h> #include <tqwidget.h> #include <tqguardedptr.h> diff --git a/nsplugins/khtml_plugins.desktop b/nsplugins/tdehtml_plugins.desktop index 9a2e0813a..b38c16160 100644 --- a/nsplugins/khtml_plugins.desktop +++ b/nsplugins/tdehtml_plugins.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Application -DocPath=kcontrol/khtml/index.html#kbrowse-plugins +DocPath=kcontrol/tdehtml/index.html#kbrowse-plugins Icon=konqueror -Exec=kcmshell khtml_plugins +Exec=kcmshell tdehtml_plugins X-TDE-ModuleType=Library X-TDE-Library=konqhtml -X-TDE-FactoryName=khtml_plugins +X-TDE-FactoryName=tdehtml_plugins X-TDE-Init-Library=nsplugins X-TDE-Init=nsplugin X-TDE-ParentApp=kcontrol diff --git a/nsplugins/test/Makefile.am b/nsplugins/test/Makefile.am index 1fc99ceba..24985baa1 100644 --- a/nsplugins/test/Makefile.am +++ b/nsplugins/test/Makefile.am @@ -4,7 +4,7 @@ noinst_HEADERS = testnsplugin.h check_PROGRAMS = testnsplugin testnsplugin_SOURCES = testnsplugin.cpp -testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor testnsplugin_LDADD = $(LIB_TDEUI) ../libnsplugin.la $(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt index 23452e84f..cfd95de6c 100644 --- a/nsplugins/viewer/CMakeLists.txt +++ b/nsplugins/viewer/CMakeLists.txt @@ -30,6 +30,6 @@ tde_add_executable( nspluginviewer AUTOMOC ../NSPluginCallbackIface.stub NSPluginClassIface.skel nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp glibevents.cpp - LINK kparts-shared kio-shared ${GLIB2_LIBRARIES} Xt dl + LINK tdeparts-shared kio-shared ${GLIB2_LIBRARIES} Xt dl DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h index d06ffada3..6eb5d6be3 100644 --- a/nsplugins/viewer/nsplugin.h +++ b/nsplugins/viewer/nsplugin.h @@ -41,7 +41,7 @@ #include <tqintdict.h> #include <tqguardedptr.h> -#include <kparts/browserextension.h> // for URLArgs +#include <tdeparts/browserextension.h> // for URLArgs #include <kio/job.h> |