kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

do not use doCommand without using format string, add overloaded method of runCommand

Browse Source
This commit is contained in:
wmayer
2016-09-15 18:53:37 +02:00
parent 1efd9a4b4f
commit f44df3cdf0
17 changed files with 60 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Gui/Command.cpp
View File

@@ -464,7 +464,7 @@ void Command::doCommand(DoCmd_Type eType, const char* sCmd, ...)
}
/// Run a App level Action
void Command::runCommand(DoCmd_Type eType,const char* sCmd)
void Command::runCommand(DoCmd_Type eType, const char* sCmd)
{
if (eType == Gui)
Gui::Application::Instance->macroManager()->addLine(MacroManager::Gui,sCmd);
@@ -473,6 +473,16 @@ void Command::runCommand(DoCmd_Type eType,const char* sCmd)
Base::Interpreter().runString(sCmd);
}
/// Run a App level Action
void Command::runCommand(DoCmd_Type eType, const QByteArray& sCmd)
{
if (eType == Gui)
Gui::Application::Instance->macroManager()->addLine(MacroManager::Gui,sCmd.constData());
else
Gui::Application::Instance->macroManager()->addLine(MacroManager::App,sCmd.constData());
Base::Interpreter().runString(sCmd.constData());
}
void Command::addModule(DoCmd_Type eType,const char* sModuleName)
{
if(alreadyLoadedModule.find(sModuleName) == alreadyLoadedModule.end()) {
@@ -931,7 +941,7 @@ void PythonCommand::activated(int iMsg)
}
}
else {
doCommand(Doc,Activation.c_str());
runCommand(Doc,Activation.c_str());
}
}