diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-02 13:31:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-02 13:31:35 -0600 |
| commit | d39184b18ee1b3e5c96c8fb03e292c4317dd664a (patch) | |
| tree | ee8998aee1f24c529e8ee4b467acff285c361e02 /chalk/plugins/viewplugins/scripting/chalkcore | |
| parent | ece35c015c54312eb13f583cc247cdd9a4051b4d (diff) | |
| download | koffice-d39184b18ee1b3e5c96c8fb03e292c4317dd664a.tar.gz koffice-d39184b18ee1b3e5c96c8fb03e292c4317dd664a.zip | |
Fix unintended renaming
Diffstat (limited to 'chalk/plugins/viewplugins/scripting/chalkcore')
| -rw-r--r-- | chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am | 4 | ||||
| -rw-r--r-- | chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am index b56a3d064..570154ba0 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/chaltdescripting \ +INCLUDES = -I$(top_srcdir)/core -I$(top_srcdir)/chalk/plugins/viewplugins/scripting/chalkscripting \ -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) @@ -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/chaltdescripting/libchaltdescripting.la \ + $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.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 d137ab8c2..45c1705af 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 chaltdescriptprogress = manager->getChild("ChalkScriptProgress"); + Kross::Api::Object::Ptr chalkscriptprogress = manager->getChild("ChalkScriptProgress"); if(chalkdocument) { - Kross::Api::QtObject* chaltdescriptprogressqt = (Kross::Api::QtObject*)( chaltdescriptprogress.data() ); - if(chaltdescriptprogressqt) { - ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chaltdescriptprogressqt->getObject() ); + Kross::Api::QtObject* chalkscriptprogressqt = (Kross::Api::QtObject*)( chalkscriptprogress.data() ); + if(chalkscriptprogressqt) { + ::KisScriptProgress* scriptprogress = (::KisScriptProgress*)( chalkscriptprogressqt->getObject() ); scriptprogress->activateAsSubject(); packagePath = scriptprogress->packagePath(); if(scriptprogress) { |