OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4285 Octave : Rename to absoluteFileName

Browse Source
This commit is contained in:
Magne Sjaastad
2019-04-04 21:18:20 +02:00
parent b8ff8a2de8
commit fd774bec39
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/OctaveScriptCommands/RicEditScriptFeature.cpp
View File

@@ -58,7 +58,7 @@ void RicEditScriptFeature::onActionTriggered(bool isChecked)
if (!scriptEditor.isEmpty())
{
QStringList arguments;
arguments << calcScript->absolutePath;
arguments << calcScript->absoluteFileName;
QProcess* myProcess = new QProcess(this);
myProcess->start(scriptEditor, arguments);

4
ApplicationCode/Commands/OctaveScriptCommands/RicExecuteScriptFeature.cpp
View File

@@ -61,13 +61,13 @@ void RicExecuteScriptFeature::onActionTriggered(bool isChecked)
{
// TODO: Must rename RimCalcScript::absolutePath to absoluteFileName, as the code below is confusing
// absolutePath() is a function in QFileInfo
QFileInfo fi(calcScript->absolutePath());
QFileInfo fi(calcScript->absoluteFileName());
QString octaveFunctionSearchPath = fi.absolutePath();
QStringList arguments = app->octaveArguments();
arguments.append("--path");
arguments << octaveFunctionSearchPath;
arguments << calcScript->absolutePath();
arguments << calcScript->absoluteFileName();
RiaApplication::instance()->launchProcess(octavePath, arguments);
}

2
ApplicationCode/Commands/OctaveScriptCommands/RicNewScriptFeature.cpp
View File

@@ -63,7 +63,7 @@ void RicNewScriptFeature::onActionTriggered(bool isChecked)
if (calcScript)
{
QFileInfo existingScriptFileInfo(calcScript->absolutePath());
QFileInfo existingScriptFileInfo(calcScript->absoluteFileName());
fullPathNewScript = existingScriptFileInfo.absolutePath();
}
else if (scriptColl)