summaryrefslogtreecommitdiffstats
path: root/kjsembed/plugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:53 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:53 -0600
commit545706afdcf29b8f584e78275452cca715e284db (patch)
treefdbfaa34f2d633372ba4ab3e46d22cf10f38b40b /kjsembed/plugins
parent9d4971a2ffb5be9c6fc1b6d6bc74020c37fb2169 (diff)
downloadtdebindings-545706afdcf29b8f584e78275452cca715e284db.tar.gz
tdebindings-545706afdcf29b8f584e78275452cca715e284db.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kjsembed/plugins')
-rw-r--r--kjsembed/plugins/Makefile.am4
-rw-r--r--kjsembed/plugins/tdefileitem_plugin.desktop (renamed from kjsembed/plugins/kfileitem_plugin.desktop)0
-rw-r--r--kjsembed/plugins/tdefileitemloader.cpp (renamed from kjsembed/plugins/kfileitemloader.cpp)4
-rw-r--r--kjsembed/plugins/tdefileitemloader.h (renamed from kjsembed/plugins/kfileitemloader.h)0
4 files changed, 4 insertions, 4 deletions
diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am
index 5468d792..3f1e4fab 100644
--- a/kjsembed/plugins/Makefile.am
+++ b/kjsembed/plugins/Makefile.am
@@ -26,12 +26,12 @@ libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT)
libqprocessplugin_la_LIBADD = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la
# the Plugin's source, library search path, and link libraries
-libfileitemplugin_la_SOURCES = kfileitemloader.cpp
+libfileitemplugin_la_SOURCES = tdefileitemloader.cpp
libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries)
libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la
# this is where the desktop file will go
plugindesktopdir = $(kde_servicesdir)
-plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop kfileitem_plugin.desktop
+plugindesktop_DATA = imagefx_plugin.desktop qprocess_plugin.desktop tdefileitem_plugin.desktop
noinst_DATA = customobject_plugin.desktop customqobject_plugin.desktop
diff --git a/kjsembed/plugins/kfileitem_plugin.desktop b/kjsembed/plugins/tdefileitem_plugin.desktop
index f5f91552..f5f91552 100644
--- a/kjsembed/plugins/kfileitem_plugin.desktop
+++ b/kjsembed/plugins/tdefileitem_plugin.desktop
diff --git a/kjsembed/plugins/kfileitemloader.cpp b/kjsembed/plugins/tdefileitemloader.cpp
index e3fcdb7f..6ab7cc45 100644
--- a/kjsembed/plugins/kfileitemloader.cpp
+++ b/kjsembed/plugins/tdefileitemloader.cpp
@@ -17,7 +17,7 @@
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "kfileitemloader.h"
+#include "tdefileitemloader.h"
#include <kjsembed/jsopaqueproxy.h>
#include <kjsembed/jsbinding.h>
@@ -25,7 +25,7 @@
#include <kjsembed/jsfactory_imp.h>
#include <kjsembed/kjsembedpart.h>
-#include <kfileitem.h>
+#include <tdefileitem.h>
#include <kdebug.h>
namespace KJSEmbed {
diff --git a/kjsembed/plugins/kfileitemloader.h b/kjsembed/plugins/tdefileitemloader.h
index 384379f3..384379f3 100644
--- a/kjsembed/plugins/kfileitemloader.h
+++ b/kjsembed/plugins/tdefileitemloader.h