mirror of
https://github.com/OpenMW/openmw.git
synced 2026-05-06 07:56:40 -04:00
FIX: Remove mOrdered param and ordered constructor param since all it did was feed mOrdered.
This commit is contained in:
committed by
Alexei Kotov
parent
1fe948622b
commit
ffc012423e
@@ -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<std::pair<Stage*, int>>())
|
||||
, mCurrentStage(mStages.begin())
|
||||
, mCurrentStep(0)
|
||||
, mCurrentStepTotal(0)
|
||||
, mTotalSteps(0)
|
||||
, mOrdered(ordered)
|
||||
, mFinalAlways(finalAlways)
|
||||
, mError(false)
|
||||
, mPrepared(false)
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -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));
|
||||
|
||||
@@ -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<CSMWorld::UniversalId::Type> types = CSMWorld::UniversalId::listTypes(
|
||||
CSMWorld::UniversalId::Class_RecordList | CSMWorld::UniversalId::Class_ResourceList);
|
||||
|
||||
@@ -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<ESM::RefId> mandatoryRefIds;
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user