diff --git a/src/libs/vlayout/vbank.cpp b/src/libs/vlayout/vbank.cpp index 2789697d3..a4230f870 100644 --- a/src/libs/vlayout/vbank.cpp +++ b/src/libs/vlayout/vbank.cpp @@ -53,9 +53,15 @@ QT_WARNING_POP //--------------------------------------------------------------------------------------------------------------------- VBank::VBank() - :details(QVector()), unsorted(QHash()), big(QHash()), - middle(QHash()), small(QHash()), layoutWidth(0), caseType(Cases::CaseDesc), - prepare(false), diagonal(0) + : details(), + unsorted(), + big(), + middle(), + small(), + layoutWidth(0), + caseType(Cases::CaseDesc), + prepare(false), + diagonal(0) {} //--------------------------------------------------------------------------------------------------------------------- @@ -65,7 +71,7 @@ qreal VBank::GetLayoutWidth() const } //--------------------------------------------------------------------------------------------------------------------- -void VBank::SetLayoutWidth(const qreal &value) +void VBank::SetLayoutWidth(qreal value) { layoutWidth = value; Reset(); @@ -79,14 +85,14 @@ void VBank::SetDetails(const QVector &details) } //--------------------------------------------------------------------------------------------------------------------- -int VBank::GetTiket() +int VBank::GetNext() { if (prepare == false) { return -1; } - if (LeftArrange() == 0) + if (LeftToArrange() == 0) { if (unsorted.isEmpty()) { @@ -245,7 +251,7 @@ int VBank::AllDetailsCount() const } //--------------------------------------------------------------------------------------------------------------------- -int VBank::LeftArrange() const +int VBank::LeftToArrange() const { return big.count() + middle.count() + small.count(); } diff --git a/src/libs/vlayout/vbank.h b/src/libs/vlayout/vbank.h index 378e03002..85853770d 100644 --- a/src/libs/vlayout/vbank.h +++ b/src/libs/vlayout/vbank.h @@ -52,10 +52,10 @@ public: VBank(); qreal GetLayoutWidth() const; - void SetLayoutWidth(const qreal &value); + void SetLayoutWidth(qreal value); void SetDetails(const QVector &details); - int GetTiket(); + int GetNext(); VLayoutPiece GetDetail(int i) const; void Arranged(int i); @@ -66,7 +66,7 @@ public: void SetCaseType(Cases caseType); int AllDetailsCount() const; - int LeftArrange() const; + int LeftToArrange() const; int ArrangedCount() const; qreal GetBiggestDiagonal() const; diff --git a/src/libs/vlayout/vlayoutgenerator.cpp b/src/libs/vlayout/vlayoutgenerator.cpp index 736d47624..7d97fe3d9 100644 --- a/src/libs/vlayout/vlayoutgenerator.cpp +++ b/src/libs/vlayout/vlayoutgenerator.cpp @@ -151,7 +151,7 @@ void VLayoutGenerator::Generate() paper.SetSaveLength(saveLength); do { - const int index = bank->GetTiket(); + const int index = bank->GetNext(); if (paper.ArrangeDetail(bank->GetDetail(index), stopGeneration)) { bank->Arranged(index); @@ -166,7 +166,7 @@ void VLayoutGenerator::Generate() { break; } - } while(bank->LeftArrange() > 0); + } while(bank->LeftToArrange() > 0); if (stopGeneration.load()) {