diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-12-25 06:36:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-12-25 06:36:56 +0300 |
| commit | c0a4146dc70b252c84746c4ccfd9f1ca9af8421d (patch) | |
| tree | 45544cb653c5c84d9738a84b74596e6e48b08e11 | |
| parent | f55baadfeb6245899497cd472f65f23e905481b9 (diff) | |
| download | manaplus-c0a4146dc70b252c84746c4ccfd9f1ca9af8421d.tar.gz manaplus-c0a4146dc70b252c84746c4ccfd9f1ca9af8421d.tar.bz2 manaplus-c0a4146dc70b252c84746c4ccfd9f1ca9af8421d.tar.xz manaplus-c0a4146dc70b252c84746c4ccfd9f1ca9af8421d.zip | |
Remove default parameters from layoutcell.
| -rw-r--r-- | src/gui/widgets/layoutarray.h | 13 | ||||
| -rw-r--r-- | src/gui/widgets/layoutcell.cpp | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/gui/widgets/layoutarray.h b/src/gui/widgets/layoutarray.h index cca05e091..2cf2c0eda 100644 --- a/src/gui/widgets/layoutarray.h +++ b/src/gui/widgets/layoutarray.h @@ -47,8 +47,10 @@ class LayoutArray final /** * Returns a reference on the cell at given position. */ - LayoutCell &at(const int x, const int y, - const int w = 1, const int h = 1) A_WARN_UNUSED; + LayoutCell &at(const int x, + const int y, + const int w, + const int h) A_WARN_UNUSED; /** * Places a widget in a given cell. @@ -57,8 +59,11 @@ class LayoutArray final * @note When @a w is 1, the width of column @a x is reset to zero if * it was AUTO_DEF. Similarly for @a h. */ - LayoutCell &place(Widget *const widget, const int x, const int y, - const int w = 1, const int h = 1); + LayoutCell &place(Widget *const widget, + const int x, + const int y, + const int w, + const int h); /** * Sets the minimum width of a column. diff --git a/src/gui/widgets/layoutcell.cpp b/src/gui/widgets/layoutcell.cpp index 7db5d0783..b3c26b903 100644 --- a/src/gui/widgets/layoutcell.cpp +++ b/src/gui/widgets/layoutcell.cpp @@ -104,7 +104,7 @@ void LayoutCell::computeSizes() LayoutCell &LayoutCell::at(const int x, const int y) { - return getArray().at(x, y); + return getArray().at(x, y, 1, 1); } LayoutCell &LayoutCell::place(Widget *const wg, |