diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:59 -0600 |
| commit | 1515a4f2eb9cf023ed7f9c2e10106b5e93164a08 (patch) | |
| tree | d5617734090b254659ff331ce7d1e574c4807caf /kapptemplate/kpartplugin | |
| parent | f8069e2ea048f2657cc417d83820576ec55c181b (diff) | |
| download | tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.tar.gz tdesdk-1515a4f2eb9cf023ed7f9c2e10106b5e93164a08.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kapptemplate/kpartplugin')
| -rw-r--r-- | kapptemplate/kpartplugin/plugin-Makefile.am | 2 | ||||
| -rw-r--r-- | kapptemplate/kpartplugin/plugin_app.cpp | 2 | ||||
| -rw-r--r-- | kapptemplate/kpartplugin/plugin_app.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kapptemplate/kpartplugin/plugin-Makefile.am b/kapptemplate/kpartplugin/plugin-Makefile.am index cdb7d510..21b5ccdd 100644 --- a/kapptemplate/kpartplugin/plugin-Makefile.am +++ b/kapptemplate/kpartplugin/plugin-Makefile.am @@ -16,5 +16,5 @@ lib${APP_NAME_LC}plugin_la_LDFLAGS = -module \$(KDE_PLUGIN) \$(all_libraries) # Install the .rc file in the Part's directory (in this case, the part # is KHTMLPart) -pluginsdir = \$(kde_datadir)/khtml/kpartplugins +pluginsdir = \$(kde_datadir)/tdehtml/kpartplugins plugins_DATA = plugin_${APP_NAME_LC}.rc diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp index 0ec7a273..98a44cad 100644 --- a/kapptemplate/kpartplugin/plugin_app.cpp +++ b/kapptemplate/kpartplugin/plugin_app.cpp @@ -2,7 +2,7 @@ echo "Creating $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp..."; cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp #include "plugin_${APP_NAME_LC}.h" -#include <khtml_part.h> +#include <tdehtml_part.h> #include <kaction.h> #include <kinstance.h> #include <kmessagebox.h> diff --git a/kapptemplate/kpartplugin/plugin_app.h b/kapptemplate/kpartplugin/plugin_app.h index a480a187..5f0e655c 100644 --- a/kapptemplate/kpartplugin/plugin_app.h +++ b/kapptemplate/kpartplugin/plugin_app.h @@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.h #ifndef PLUGIN_${APP_NAME_UC}_H #define PLUGIN_${APP_NAME_UC}_H -#include <kparts/plugin.h> +#include <tdeparts/plugin.h> class Plugin${APP_NAME} : public KParts::Plugin { |