diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:15:08 -0600 |
| commit | 39177c1528006932b00136d34cf022434df73d72 (patch) | |
| tree | a0791bebede3e7eb454ac2268a14c4e8a157de6d /konq-plugins/webarchiver | |
| parent | 2a74bca8c834c4d4f391c70de8fdfa12a7cc972c (diff) | |
| download | tdeaddons-39177c1528006932b00136d34cf022434df73d72.tar.gz tdeaddons-39177c1528006932b00136d34cf022434df73d72.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'konq-plugins/webarchiver')
| -rw-r--r-- | konq-plugins/webarchiver/Makefile.am | 2 | ||||
| -rw-r--r-- | konq-plugins/webarchiver/archivedialog.cpp | 6 | ||||
| -rw-r--r-- | konq-plugins/webarchiver/plugin_webarchiver.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/webarchiver/plugin_webarchiver.h | 2 | ||||
| -rw-r--r-- | konq-plugins/webarchiver/webarchivecreator.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/konq-plugins/webarchiver/Makefile.am b/konq-plugins/webarchiver/Makefile.am index 53d519e..6a3779a 100644 --- a/konq-plugins/webarchiver/Makefile.am +++ b/konq-plugins/webarchiver/Makefile.am @@ -9,7 +9,7 @@ libwebarchiverplugin_la_SOURCES = plugin_webarchiver.cpp archiveviewbase.ui arch libwebarchiverplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KHTML) libwebarchiverplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -pluginsdir = $(kde_datadir)/khtml/kpartplugins +pluginsdir = $(kde_datadir)/tdehtml/kpartplugins plugins_DATA = plugin_webarchiver.rc plugin_webarchiver.desktop appsdir = $(kde_appsdir)/.hidden diff --git a/konq-plugins/webarchiver/archivedialog.cpp b/konq-plugins/webarchiver/archivedialog.cpp index 0a3e6a6..63a7570 100644 --- a/konq-plugins/webarchiver/archivedialog.cpp +++ b/konq-plugins/webarchiver/archivedialog.cpp @@ -20,7 +20,7 @@ #include "archivedialog.h" #include <tqwidget.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include "archiveviewbase.h" #include <kinstance.h> #include <ktempfile.h> @@ -31,7 +31,7 @@ #include <kpassivepopup.h> #include <klocale.h> #include <kio/netaccess.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kactivelabel.h> @@ -234,7 +234,7 @@ void ArchiveDialog::saveArchiveRecursive(const DOM::Node &pNode, const KURL& bas if ( !element.isNull() ) { if (nodeName.at(0)=='-') { - /* Don't save khtml internal tags '-konq..' + /* Don't save tdehtml internal tags '-konq..' * Approximating it with <DIV> */ text += "<DIV> <!-- -KONTQ_BLOCK -->"; diff --git a/konq-plugins/webarchiver/plugin_webarchiver.cpp b/konq-plugins/webarchiver/plugin_webarchiver.cpp index a9c6d06..338c52e 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.cpp +++ b/konq-plugins/webarchiver/plugin_webarchiver.cpp @@ -38,7 +38,7 @@ #include <kfiledialog.h> #include <kmessagebox.h> #include <klocale.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kglobalsettings.h> diff --git a/konq-plugins/webarchiver/plugin_webarchiver.h b/konq-plugins/webarchiver/plugin_webarchiver.h index 3e96ca6..7c75d58 100644 --- a/konq-plugins/webarchiver/plugin_webarchiver.h +++ b/konq-plugins/webarchiver/plugin_webarchiver.h @@ -22,7 +22,7 @@ #ifndef plugin_webarchiver_h #define plugin_webarchiver_h -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> #include <klibloader.h> class PluginWebArchiver : public KParts::Plugin diff --git a/konq-plugins/webarchiver/webarchivecreator.cpp b/konq-plugins/webarchiver/webarchivecreator.cpp index 1ffd242..200dc54 100644 --- a/konq-plugins/webarchiver/webarchivecreator.cpp +++ b/konq-plugins/webarchiver/webarchivecreator.cpp @@ -26,7 +26,7 @@ #include <tqpainter.h> #include <kapplication.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include "webarchivecreator.moc" |