--- Vago/trunk/Vago/utilvago.cpp 2016/09/16 22:51:26 1047 +++ Vago/trunk/Vago/utilvago.cpp 2016/09/17 14:34:17 1053 @@ -66,17 +66,27 @@ QString getAppPath(){ return getOSIndependentAppPath(); } -QString getOniSplitExeAbsolutePath(){ +// Absolute paths +QString getOniSplitExecutableAbsolutePath(){ + return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString; +} + +QString getXmlToolsExecutableAbsolutePath(){ + return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::XmlToolsString; +} + +// Executables (includes mono if necessary) +QString getOniSplitExecutable(){ #ifdef Q_OS_MAC - return getMonoExecutablePath() + " " + getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString; + return getMonoExecutablePath() + " " + Util::insertQuotes(getOniSplitExecutableAbsolutePath()); #else - return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString; + return Util::insertQuotes(getOniSplitExecutableAbsolutePath()); #endif } -QString getXmlToolsExeAbsolutePath(){ - return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::XmlToolsString; +QString getXmlToolsExecutable(){ + return Util::insertQuotes(getXmlToolsExecutableAbsolutePath()); } #ifdef Q_OS_MAC