summaryrefslogtreecommitdiffstats
path: root/chalk/plugins/viewplugins/scripting
diff options
context:
space:
mode:
Diffstat (limited to 'chalk/plugins/viewplugins/scripting')
-rw-r--r--chalk/plugins/viewplugins/scripting/Makefile.am14
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am6
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp8
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am19
-rw-r--r--chalk/plugins/viewplugins/scripting/chaltdescripting.desktop (renamed from chalk/plugins/viewplugins/scripting/chalkscripting.desktop)2
-rw-r--r--chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am19
-rw-r--r--chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp (renamed from chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp)0
-rw-r--r--chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h (renamed from chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h)0
-rw-r--r--chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp (renamed from chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp)0
-rw-r--r--chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h (renamed from chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h)0
-rw-r--r--chalk/plugins/viewplugins/scripting/scripting.cc6
-rw-r--r--chalk/plugins/viewplugins/scripting/scripting.h2
-rw-r--r--chalk/plugins/viewplugins/scripting/scripting.rc2
13 files changed, 39 insertions, 39 deletions
diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am
index 5757c06d..abb558ca 100644
--- a/chalk/plugins/viewplugins/scripting/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/Makefile.am
@@ -1,9 +1,9 @@
-SUBDIRS = chalkscripting chalkcore samples
+SUBDIRS = chaltdescripting chalkcore samples
chalkrcdir = $(kde_datadir)/chalkplugins
chalkrc_DATA = scripting.rc
-kde_services_DATA = chalkscripting.desktop
+kde_services_DATA = chaltdescripting.desktop
INCLUDES = -I$(top_srcdir)/chalk/sdk \
@@ -15,17 +15,17 @@ INCLUDES = -I$(top_srcdir)/chalk/sdk \
$(KOFFICE_INCLUDES) \
$(all_includes)
-chalkscripting_la_SOURCES = scripting.cc
+chaltdescripting_la_SOURCES = scripting.cc
-kde_module_LTLIBRARIES = chalkscripting.la
+kde_module_LTLIBRARIES = chaltdescripting.la
noinst_HEADERS = scripting.h
-chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
-chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \
+chaltdescripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -ltdeparts
+chaltdescripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chaltdescripting/libchaltdescripting.la \
../../../../chalk/chalkcolor/libchalkcolor.la \
../../../../chalk/core/libchalkimage.la \
../../../../chalk/ui/libchalkui.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-chalkscripting_la_METASOURCES = AUTO
+chaltdescripting_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
index e3eee892..cef0a96a 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 45c1705a..d137ab8c 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) {
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am
deleted file mode 100644
index b805ef18..00000000
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-INCLUDES = -I$(top_srcdir)/chalk/sdk \
- -I$(top_srcdir)/chalk/core \
- -I$(top_srcdir)/chalk/chalkcolor/ \
- -I$(top_srcdir)/chalk/ui \
- $(KROSS_INCLUDES) \
- $(KOFFICE_INCLUDES) \
- $(all_includes)
-
-
-lib_LTLIBRARIES = libchalkscripting.la
-libchalkscripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp
-noinst_HEADERS = kis_script_progress.h
-
-libchalkscripting_la_LDFLAGS = -no-undefined $(all_libraries)
-libchalkscripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la
-
-KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-
-libchalkscripting_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop b/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop
index eba3ea37..c4267097 100644
--- a/chalk/plugins/viewplugins/scripting/chalkscripting.desktop
+++ b/chalk/plugins/viewplugins/scripting/chaltdescripting.desktop
@@ -77,5 +77,5 @@ Comment[zh_CN]=允许执行脚本
Comment[zh_TW]=允許執行命令稿
ServiceTypes=Chalk/ViewPlugin
Type=Service
-X-TDE-Library=chalkscripting
+X-TDE-Library=chaltdescripting
X-Chalk-Version=2
diff --git a/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am b/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am
new file mode 100644
index 00000000..a38d8df0
--- /dev/null
+++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/Makefile.am
@@ -0,0 +1,19 @@
+INCLUDES = -I$(top_srcdir)/chalk/sdk \
+ -I$(top_srcdir)/chalk/core \
+ -I$(top_srcdir)/chalk/chalkcolor/ \
+ -I$(top_srcdir)/chalk/ui \
+ $(KROSS_INCLUDES) \
+ $(KOFFICE_INCLUDES) \
+ $(all_includes)
+
+
+lib_LTLIBRARIES = libchaltdescripting.la
+libchaltdescripting_la_SOURCES = kis_script_progress.cpp kis_script_monitor.cpp
+noinst_HEADERS = kis_script_progress.h
+
+libchaltdescripting_la_LDFLAGS = -no-undefined $(all_libraries)
+libchaltdescripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la
+
+KDE_CXXFLAGS = $(USE_EXCEPTIONS)
+
+libchaltdescripting_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp
index 3967ffe7..3967ffe7 100644
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.cpp
+++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.cpp
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h
index b2495d8b..b2495d8b 100644
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_monitor.h
+++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_monitor.h
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp
index d7af4eb4..d7af4eb4 100644
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.cpp
+++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.cpp
diff --git a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h
index 48af433c..48af433c 100644
--- a/chalk/plugins/viewplugins/scripting/chalkscripting/kis_script_progress.h
+++ b/chalk/plugins/viewplugins/scripting/chaltdescripting/kis_script_progress.h
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc
index 31e9897a..5cbbb85d 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cc
+++ b/chalk/plugins/viewplugins/scripting/scripting.cc
@@ -48,11 +48,11 @@
#include <kis_image.h>
#include <kis_layer.h>
-#include "chalkscripting/kis_script_progress.h"
-#include "chalkscripting/kis_script_monitor.h"
+#include "chaltdescripting/kis_script_progress.h"
+#include "chaltdescripting/kis_script_monitor.h"
typedef KGenericFactory<Scripting> ChalkScriptingFactory;
-K_EXPORT_COMPONENT_FACTORY( chalkscripting, ChalkScriptingFactory( "chalk" ) )
+K_EXPORT_COMPONENT_FACTORY( chaltdescripting, ChalkScriptingFactory( "chalk" ) )
Scripting::Scripting(TQObject *parent, const char *name, const TQStringList &)
: KParts::Plugin(parent, name)
diff --git a/chalk/plugins/viewplugins/scripting/scripting.h b/chalk/plugins/viewplugins/scripting/scripting.h
index ad9f6059..a2353d7a 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.h
+++ b/chalk/plugins/viewplugins/scripting/scripting.h
@@ -21,7 +21,7 @@
#ifndef SCRIPTING_H
#define SCRIPTING_H
-#include <kparts/plugin.h>
+#include <tdeparts/plugin.h>
class KisView;
class KisScript;
diff --git a/chalk/plugins/viewplugins/scripting/scripting.rc b/chalk/plugins/viewplugins/scripting/scripting.rc
index 1b4999df..b4978b4c 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.rc
+++ b/chalk/plugins/viewplugins/scripting/scripting.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui library="chalkscripting" version="3">
+<kpartgui library="chaltdescripting" version="3">
<MenuBar>
<Menu name="Scripts"><text>S&amp;cripts</text>
<Separator/>