diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-28 15:46:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-28 16:41:19 +0300 |
| commit | f146cd42ce84a08879eb286ecd2ed2aa8ad82300 (patch) | |
| tree | f689f832f54f361be8cff61deb47c0e32febd486 /src/gui/models | |
| parent | 409cee51fe11e2495a2741226432666a8702dceb (diff) | |
| download | manaplus-f146cd42ce84a08879eb286ecd2ed2aa8ad82300.tar.gz manaplus-f146cd42ce84a08879eb286ecd2ed2aa8ad82300.tar.bz2 manaplus-f146cd42ce84a08879eb286ecd2ed2aa8ad82300.tar.xz manaplus-f146cd42ce84a08879eb286ecd2ed2aa8ad82300.zip | |
fix code style.
Diffstat (limited to 'src/gui/models')
| -rw-r--r-- | src/gui/models/ignorechoiceslistmodel.h | 4 | ||||
| -rw-r--r-- | src/gui/models/playerrelationlistmodel.h | 2 | ||||
| -rw-r--r-- | src/gui/models/soundsmodel.h | 5 | ||||
| -rw-r--r-- | src/gui/models/tablemodel.h | 3 | ||||
| -rw-r--r-- | src/gui/models/touchactionmodel.cpp | 9 |
5 files changed, 9 insertions, 14 deletions
diff --git a/src/gui/models/ignorechoiceslistmodel.h b/src/gui/models/ignorechoiceslistmodel.h index 7234b57f2..8ba3eadb1 100644 --- a/src/gui/models/ignorechoiceslistmodel.h +++ b/src/gui/models/ignorechoiceslistmodel.h @@ -38,8 +38,8 @@ class IgnoreChoicesListModel final : public ListModel int getNumberOfElements() override final { - return static_cast<int>(player_relations.getPlayerIgnoreStrategies( - )->size()); + return static_cast<int>(player_relations. + getPlayerIgnoreStrategies()->size()); } std::string getElementAt(int i) override final diff --git a/src/gui/models/playerrelationlistmodel.h b/src/gui/models/playerrelationlistmodel.h index 9251631f7..bc343de02 100644 --- a/src/gui/models/playerrelationlistmodel.h +++ b/src/gui/models/playerrelationlistmodel.h @@ -64,4 +64,4 @@ class PlayerRelationListModel final : public ListModel } }; -#endif +#endif // GUI_MODELS_PLAYERRELATIONLISTMODEL_H diff --git a/src/gui/models/soundsmodel.h b/src/gui/models/soundsmodel.h index 2f645e666..3ac679d37 100644 --- a/src/gui/models/soundsmodel.h +++ b/src/gui/models/soundsmodel.h @@ -19,6 +19,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ +#ifndef GUI_MODELS_SOUNDSMODEL_H +#define GUI_MODELS_SOUNDSMODEL_H + #include "gui/theme.h" #include "gui/models/namesmodel.h" @@ -40,3 +43,5 @@ class SoundsModel final : public NamesModel ~SoundsModel() { } }; + +#endif // GUI_MODELS_SOUNDSMODEL_H diff --git a/src/gui/models/tablemodel.h b/src/gui/models/tablemodel.h index ff752e6f1..032facadd 100644 --- a/src/gui/models/tablemodel.h +++ b/src/gui/models/tablemodel.h @@ -151,8 +151,7 @@ public: int getHeight() const A_WARN_UNUSED; int getColumnWidth(const int index) const override final A_WARN_UNUSED; Widget *getElementAt(const int row, - const int column) const - override final A_WARN_UNUSED; + const int column) const override final A_WARN_UNUSED; protected: int mRows, mColumns; diff --git a/src/gui/models/touchactionmodel.cpp b/src/gui/models/touchactionmodel.cpp index e6cc4d046..b32d1479f 100644 --- a/src/gui/models/touchactionmodel.cpp +++ b/src/gui/models/touchactionmodel.cpp @@ -18,19 +18,10 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "gui/widgets/setuptouchitem.h" - #include "gui/setupactiondata.h" #include "gui/models/touchactionmodel.h" -#include "gui/widgets/dropdown.h" -#include "gui/widgets/horizontcontainer.h" -#include "gui/widgets/label.h" -#include "gui/widgets/vertcontainer.h" - -#include "gui/widgets/tabs/setuptabscroll.h" - #include <algorithm> #include "debug.h" |