From ffc012423e8c8a8aabaeda641859968bd5a5e10b Mon Sep 17 00:00:00 2001 From: sophielovesmorrowind Date: Sun, 5 Apr 2026 17:37:39 -0600 Subject: [PATCH] FIX: Remove mOrdered param and ordered constructor param since all it did was feed mOrdered. --- apps/opencs/model/doc/operation.cpp | 3 +-- apps/opencs/model/doc/operation.hpp | 4 +--- apps/opencs/model/doc/saving.cpp | 2 +- apps/opencs/model/tools/mergeoperation.cpp | 2 +- apps/opencs/model/tools/searchoperation.cpp | 2 +- apps/opencs/model/tools/tools.cpp | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/apps/opencs/model/doc/operation.cpp b/apps/opencs/model/doc/operation.cpp index 102156a777..0221484c62 100644 --- a/apps/opencs/model/doc/operation.cpp +++ b/apps/opencs/model/doc/operation.cpp @@ -55,14 +55,13 @@ void CSMDoc::Operation::prepareStages() } } -CSMDoc::Operation::Operation(State type, bool ordered, bool finalAlways) +CSMDoc::Operation::Operation(State type, bool finalAlways) : mType(type) , mStages(std::vector>()) , mCurrentStage(mStages.begin()) , mCurrentStep(0) , mCurrentStepTotal(0) , mTotalSteps(0) - , mOrdered(ordered) , mFinalAlways(finalAlways) , mError(false) , mPrepared(false) diff --git a/apps/opencs/model/doc/operation.hpp b/apps/opencs/model/doc/operation.hpp index 12e3325e76..dd7855d917 100644 --- a/apps/opencs/model/doc/operation.hpp +++ b/apps/opencs/model/doc/operation.hpp @@ -25,7 +25,6 @@ namespace CSMDoc int mCurrentStep; int mCurrentStepTotal; int mTotalSteps; - int mOrdered; bool mFinalAlways; bool mError; bool mPrepared; @@ -35,8 +34,7 @@ namespace CSMDoc void prepareStages(); public: - Operation(State type, bool ordered, bool finalAlways = false); - ///< \param ordered Stages must be executed in the given order. + Operation(State type, bool finalAlways = false); /// \param finalAlways Execute last stage even if an error occurred during earlier stages. virtual ~Operation(); diff --git a/apps/opencs/model/doc/saving.cpp b/apps/opencs/model/doc/saving.cpp index 868429f96c..fb3f74c254 100644 --- a/apps/opencs/model/doc/saving.cpp +++ b/apps/opencs/model/doc/saving.cpp @@ -35,7 +35,7 @@ #include "state.hpp" CSMDoc::Saving::Saving(Document& document, const std::filesystem::path& projectPath, ToUTF8::FromType encoding) - : Operation(State_Saving, true, true) + : Operation(State_Saving, true) , mDocument(document) , mState(*this, projectPath, encoding) { diff --git a/apps/opencs/model/tools/mergeoperation.cpp b/apps/opencs/model/tools/mergeoperation.cpp index 2c7a8bbc4e..971be75090 100644 --- a/apps/opencs/model/tools/mergeoperation.cpp +++ b/apps/opencs/model/tools/mergeoperation.cpp @@ -39,7 +39,7 @@ #include "mergestages.hpp" CSMTools::MergeOperation::MergeOperation(CSMDoc::Document& document, ToUTF8::FromType encoding) - : CSMDoc::Operation(CSMDoc::State_Merging, true) + : CSMDoc::Operation(CSMDoc::State_Merging) , mState(document) { appendStage(new StartMergeStage(mState)); diff --git a/apps/opencs/model/tools/searchoperation.cpp b/apps/opencs/model/tools/searchoperation.cpp index d7e5dd419d..787eddfb49 100644 --- a/apps/opencs/model/tools/searchoperation.cpp +++ b/apps/opencs/model/tools/searchoperation.cpp @@ -16,7 +16,7 @@ #include "searchstage.hpp" CSMTools::SearchOperation::SearchOperation(CSMDoc::Document& document) - : CSMDoc::Operation(CSMDoc::State_Searching, false) + : CSMDoc::Operation(CSMDoc::State_Searching) { std::vector types = CSMWorld::UniversalId::listTypes( CSMWorld::UniversalId::Class_RecordList | CSMWorld::UniversalId::Class_ResourceList); diff --git a/apps/opencs/model/tools/tools.cpp b/apps/opencs/model/tools/tools.cpp index 3dca367d5a..3161cd818f 100644 --- a/apps/opencs/model/tools/tools.cpp +++ b/apps/opencs/model/tools/tools.cpp @@ -66,7 +66,7 @@ CSMDoc::OperationHolder* CSMTools::Tools::getVerifier() { if (!mVerifier) { - mVerifierOperation = new CSMDoc::Operation(CSMDoc::State_Verifying, false); + mVerifierOperation = new CSMDoc::Operation(CSMDoc::State_Verifying); std::vector mandatoryRefIds; {