diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:15:08 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:15:08 -0600 |
| commit | 39177c1528006932b00136d34cf022434df73d72 (patch) | |
| tree | a0791bebede3e7eb454ac2268a14c4e8a157de6d /konq-plugins/adblock | |
| 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/adblock')
| -rw-r--r-- | konq-plugins/adblock/Makefile.am | 2 | ||||
| -rw-r--r-- | konq-plugins/adblock/adblock.cpp | 8 | ||||
| -rw-r--r-- | konq-plugins/adblock/adblock.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/konq-plugins/adblock/Makefile.am b/konq-plugins/adblock/Makefile.am index 47c4074..da54f2b 100644 --- a/konq-plugins/adblock/Makefile.am +++ b/konq-plugins/adblock/Makefile.am @@ -8,7 +8,7 @@ libadblock_la_SOURCES = adblock.cpp adblockdialogue.cpp libadblock_la_LIBADD = $(LIB_KHTML) -lkonq libadblock_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -pluginsdir = $(kde_datadir)/khtml/kpartplugins +pluginsdir = $(kde_datadir)/tdehtml/kpartplugins plugins_DATA = plugin_adblock.rc plugin_adblock.desktop messages: rc.cpp diff --git a/konq-plugins/adblock/adblock.cpp b/konq-plugins/adblock/adblock.cpp index c07a2c1..eff9c78 100644 --- a/konq-plugins/adblock/adblock.cpp +++ b/konq-plugins/adblock/adblock.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> #include <kiconloader.h> #include <klibloader.h> -#include <kparts/statusbarextension.h> -#include <khtml_part.h> -#include <khtml_settings.h> +#include <tdeparts/statusbarextension.h> +#include <tdehtml_part.h> +#include <tdehtml_settings.h> #include <kstatusbar.h> #include <kurllabel.h> #include <kdialogbase.h> @@ -129,7 +129,7 @@ void AdBlock::showDialogue() void AdBlock::showTDECModule() { KCMultiDialog* dialogue = new KCMultiDialog(m_part->widget()); - dialogue->addModule("khtml_filter"); + dialogue->addModule("tdehtml_filter"); connect(dialogue, TQT_SIGNAL( cancelClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); connect(dialogue, TQT_SIGNAL( closeClicked() ), dialogue, TQT_SLOT( delayedDestruct() )); dialogue->show(); diff --git a/konq-plugins/adblock/adblock.h b/konq-plugins/adblock/adblock.h index 391934c..4293169 100644 --- a/konq-plugins/adblock/adblock.h +++ b/konq-plugins/adblock/adblock.h @@ -23,7 +23,7 @@ #include <tqguardedptr.h> #include <tqvaluelist.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KHTMLPart; class KURLLabel; |