From 55e4dceb064d00a28d6ee43f47de1f8d7d7db7b0 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 23 Apr 2020 15:26:24 +0300 Subject: [PATCH] Refactoring. Follow code style. --- src/app/puzzle/puzzlemainwindow.cpp | 2 +- src/app/puzzle/vpuzzlelayout.cpp | 2 +- src/app/puzzle/vpuzzlelayout.h | 2 +- src/app/puzzle/xml/vpuzzlelayoutfilewriter.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/puzzle/puzzlemainwindow.cpp b/src/app/puzzle/puzzlemainwindow.cpp index 825700fb5..1ccf11782 100644 --- a/src/app/puzzle/puzzlemainwindow.cpp +++ b/src/app/puzzle/puzzlemainwindow.cpp @@ -337,7 +337,7 @@ void PuzzleMainWindow::SetPropertyTabCurrentPieceData() void PuzzleMainWindow::SetPropertyTabLayoutData() { // set Unit - int index = ui->comboBoxLayoutUnit->findData(QVariant(UnitsToStr(m_layout->getUnit()))); + int index = ui->comboBoxLayoutUnit->findData(QVariant(UnitsToStr(m_layout->GetUnit()))); if(index != -1) { ui->comboBoxLayoutUnit->blockSignals(true); // FIXME: is there a better way to block the signals? diff --git a/src/app/puzzle/vpuzzlelayout.cpp b/src/app/puzzle/vpuzzlelayout.cpp index cebf0bf7f..19044cf7b 100644 --- a/src/app/puzzle/vpuzzlelayout.cpp +++ b/src/app/puzzle/vpuzzlelayout.cpp @@ -75,7 +75,7 @@ void VPuzzleLayout::SetUnit(Unit unit) } //--------------------------------------------------------------------------------------------------------------------- -Unit VPuzzleLayout::getUnit() const +Unit VPuzzleLayout::GetUnit() const { return m_unit; } diff --git a/src/app/puzzle/vpuzzlelayout.h b/src/app/puzzle/vpuzzlelayout.h index 04caf479b..ea55ee170 100644 --- a/src/app/puzzle/vpuzzlelayout.h +++ b/src/app/puzzle/vpuzzlelayout.h @@ -53,7 +53,7 @@ public: QList GetLayers(); void SetUnit(Unit unit); - Unit getUnit() const; + Unit GetUnit() const; /** * @brief SetLayoutSize sets the size of the layout, the values have to be in Unit::Px diff --git a/src/app/puzzle/xml/vpuzzlelayoutfilewriter.cpp b/src/app/puzzle/xml/vpuzzlelayoutfilewriter.cpp index cfed06eca..23549dc55 100644 --- a/src/app/puzzle/xml/vpuzzlelayoutfilewriter.cpp +++ b/src/app/puzzle/xml/vpuzzlelayoutfilewriter.cpp @@ -74,7 +74,7 @@ void VPuzzleLayoutFileWriter::WriteProperties(VPuzzleLayout *layout) { writeStartElement("properties"); - writeTextElement("unit", UnitsToStr(layout->getUnit())); + writeTextElement("unit", UnitsToStr(layout->GetUnit())); writeTextElement("description", ""); // TODO : define the value in layout