From 7422cac1a18dca897d3830a267eb91683d05a95b Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:10:41 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am         | 6 +++---
 chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'chalk/plugins/viewplugins/scripting/chalkcore')

diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
index e3eee8928..cef0a96a7 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chalkscripting \
+INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chaltdescripting \
 	-I$(top_srcdir)/chalk $(KOFFICECORE_INCLUDES) $(KROSS_INCLUDES) \
 	-I$(top_srcdir)/chalk/ui -I$(top_srcdir)/chalk/core -I$(top_srcdir)/chalk/sdk \
 	-I$(top_srcdir)/chalk/chalkcolor $(all_includes)
@@ -11,7 +11,7 @@ krosschalkcore_la_SOURCES = chalkcoremodule.cpp krs_doc.cpp krs_paint_layer.cpp
 	krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \
 	krs_wavelet.cpp
 
-krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
 krosschalkcore_la_LIBADD = \
     $(LIB_KOFFICE_CORE) $(LIB_KOFFICEUI) \
     $(LIB_QT) \
@@ -19,7 +19,7 @@ krosschalkcore_la_LIBADD = \
     $(top_builddir)/lib/kross/api/libkrossapi.la \
     $(top_builddir)/lib/kross/main/libkrossmain.la \
     $(top_builddir)/chalk/libchalkcommon.la \
-    $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la \
+    $(top_builddir)/chalk/plugins/viewplugins/scripting/chaltdescripting/libchaltdescripting.la \
     ../../../../../chalk/chalkcolor/libchalkcolor.la \
     ../../../../../chalk/core/libchalkimage.la \
     ../../../../../chalk/ui/libchalkui.la
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
index 45c1705af..d137ab8c2 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp
@@ -247,11 +247,11 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager)
     }
    // Wrap ChalkScriptProgress
     TQString packagePath;
-    Kross::Api::Object::Ptr chalkscriptprogress = manager->getChild("ChalkScriptProgress");
+    Kross::Api::Object::Ptr chaltdescriptprogress = manager->getChild("ChalkScriptProgress");
     if(chalkdocument) {
-        Kross::Api::QtObject* chalkscriptprogressqt = (Kross::Api::QtObject*)( chalkscriptprogress.data() );
-        if(chalkscriptprogressqt) {
-                ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chalkscriptprogressqt->getObject() );
+        Kross::Api::QtObject* chaltdescriptprogressqt = (Kross::Api::QtObject*)( chaltdescriptprogress.data() );
+        if(chaltdescriptprogressqt) {
+                ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chaltdescriptprogressqt->getObject() );
                 scriptprogress->activateAsSubject();
                 packagePath = scriptprogress->packagePath();
                 if(scriptprogress) {
-- 
cgit v1.2.3