Skip to content

Commit 6aae924

Browse files
committed
update
1 parent 995fdcc commit 6aae924

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

agrolib/project/project.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1496,7 +1496,7 @@ bool Project::loadAggregationDB(QString dbName)
14961496

14971497
aggregationDbHandler = new Crit3DAggregationsDbHandler(dbName);
14981498

1499-
if (! aggregationDbHandler->isError())
1499+
if (aggregationDbHandler->isError())
15001500
{
15011501
errorString = aggregationDbHandler->error();
15021502
return false;

agrolib/project/shell.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ int cmdOpenAggregationDB(Project* myProject, QList<QString> argumentList)
285285

286286
if (! myProject->loadAggregationDB(filename))
287287
{
288-
myProject->logError();
289288
return ERROR_DBAGGREGATION;
290289
}
291290

src/pragaProject/pragaProject.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,13 +436,13 @@ int PragaProject::executeCommand(const QList<QString> &argumentList)
436436

437437
bool isCommandFound;
438438

439-
int isExecuted = executeSharedCommand(this, argumentList, &isCommandFound);
439+
int result = executeSharedCommand(this, argumentList, &isCommandFound);
440440
if (isCommandFound)
441-
return isExecuted;
441+
return result;
442442

443-
isExecuted = executePragaCommand(argumentList, &isCommandFound);
443+
result = executePragaCommand(argumentList, &isCommandFound);
444444
if (isCommandFound)
445-
return isExecuted;
445+
return result;
446446

447447
errorString = "This is not a valid PRAGA command: " + argumentList[0];
448448
return PRAGA_INVALID_COMMAND;

0 commit comments

Comments
 (0)