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/minitools | |
| 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/minitools')
| -rw-r--r-- | konq-plugins/minitools/Makefile.am | 2 | ||||
| -rw-r--r-- | konq-plugins/minitools/minitoolsplugin.cpp | 2 | ||||
| -rw-r--r-- | konq-plugins/minitools/minitoolsplugin.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/konq-plugins/minitools/Makefile.am b/konq-plugins/minitools/Makefile.am index 48f63e4..ed6f8f5 100644 --- a/konq-plugins/minitools/Makefile.am +++ b/konq-plugins/minitools/Makefile.am @@ -7,7 +7,7 @@ libminitoolsplugin_la_SOURCES = minitoolsplugin.cpp libminitoolsplugin_la_LIBADD = $(LIB_KHTML) -lkonq libminitoolsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -pluginsdir = $(kde_datadir)/khtml/kpartplugins +pluginsdir = $(kde_datadir)/tdehtml/kpartplugins plugins_DATA = minitoolsplugin.rc minitoolsplugin.desktop messages: rc.cpp diff --git a/konq-plugins/minitools/minitoolsplugin.cpp b/konq-plugins/minitools/minitoolsplugin.cpp index 6616e0e..ea89b7e 100644 --- a/konq-plugins/minitools/minitoolsplugin.cpp +++ b/konq-plugins/minitools/minitoolsplugin.cpp @@ -25,7 +25,7 @@ #include <kglobal.h> #include <kconfig.h> #include <kinstance.h> -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kgenericfactory.h> #include <kstandarddirs.h> diff --git a/konq-plugins/minitools/minitoolsplugin.h b/konq-plugins/minitools/minitoolsplugin.h index b66a24d..0e5ba82 100644 --- a/konq-plugins/minitools/minitoolsplugin.h +++ b/konq-plugins/minitools/minitoolsplugin.h @@ -27,7 +27,7 @@ #include <kurl.h> #include <klibloader.h> -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class KHTMLPart; class KActionMenu; |