diff options
Diffstat (limited to 'src/modules/pythoncore')
| -rw-r--r-- | src/modules/pythoncore/kvircmodule.cpp | 2 | ||||
| -rw-r--r-- | src/modules/pythoncore/libkvipythoncore.cpp | 6 | ||||
| -rw-r--r-- | src/modules/pythoncore/pythoncoreinterface.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp index 06e478b75..8aea2c4b5 100644 --- a/src/modules/pythoncore/kvircmodule.cpp +++ b/src/modules/pythoncore/kvircmodule.cpp @@ -41,7 +41,7 @@ extern KviKvsRunTimeContext * g_pCurrentKvsContext; extern bool g_bExecuteQuiet; -extern KviStr g_szLastReturnValue; +extern KviCString g_szLastReturnValue; extern QStringList g_lWarningList; extern QString g_lError; diff --git a/src/modules/pythoncore/libkvipythoncore.cpp b/src/modules/pythoncore/libkvipythoncore.cpp index f14cf454e..825a47260 100644 --- a/src/modules/pythoncore/libkvipythoncore.cpp +++ b/src/modules/pythoncore/libkvipythoncore.cpp @@ -25,9 +25,9 @@ #include "kvi_settings.h" #include "kvi_module.h" -#include "kvi_locale.h" +#include "KviLocale.h" //#include "kvi_modulemanager.h" -//#include "kvi_fileutils.h" +//#include "KviFileUtils.h" //#include "kvi_app.h" //#include "kvi_options.h" //#include "kvi_out.h" @@ -42,7 +42,7 @@ KviKvsRunTimeContext * g_pCurrentKvsContext = 0; bool g_bExecuteQuiet = false; QStringList g_lWarningList; QString g_lError; -static KviStr g_szLastReturnValue(""); +static KviCString g_szLastReturnValue(""); static PyThreadState * mainThreadState = NULL; diff --git a/src/modules/pythoncore/pythoncoreinterface.h b/src/modules/pythoncore/pythoncoreinterface.h index 3463ce28b..bb6d533e9 100644 --- a/src/modules/pythoncore/pythoncoreinterface.h +++ b/src/modules/pythoncore/pythoncoreinterface.h @@ -26,7 +26,7 @@ //============================================================================= #include "kvi_settings.h" -#include "kvi_qstring.h" +#include "KviQString.h" #include "kvi_kvs_runtimecontext.h" #include <QStringList> |
