diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-01 20:04:35 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-01 20:04:35 +0300 |
| commit | b8cdabbd20690d57930dce9dda949fca21a6233a (patch) | |
| tree | ddd3d0a3bb4d83206b92ede95b330430e803e26b /src/gui/widgets/layout.cpp | |
| parent | ab1f66527863c7fcce6c3ccedda0d5560dc063c7 (diff) | |
| download | manaverse-b8cdabbd20690d57930dce9dda949fca21a6233a.tar.gz manaverse-b8cdabbd20690d57930dce9dda949fca21a6233a.tar.bz2 manaverse-b8cdabbd20690d57930dce9dda949fca21a6233a.tar.xz manaverse-b8cdabbd20690d57930dce9dda949fca21a6233a.zip | |
Eliminate asserts from most files.
Diffstat (limited to 'src/gui/widgets/layout.cpp')
| -rw-r--r-- | src/gui/widgets/layout.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp index 382d169dc..a14b416ce 100644 --- a/src/gui/widgets/layout.cpp +++ b/src/gui/widgets/layout.cpp @@ -68,7 +68,9 @@ LayoutArray &LayoutCell::getArray() void LayoutCell::reflow(int nx, int ny, int nw, int nh) { - assert(mType != NONE); + if (mType == NONE) + return; + nx += mHPadding; ny += mVPadding; nw -= 2 * mHPadding; @@ -81,7 +83,8 @@ void LayoutCell::reflow(int nx, int ny, int nw, int nh) void LayoutCell::computeSizes() { - assert(mType == ARRAY); + if (mType != ARRAY) + return; std::vector< std::vector< LayoutCell * > >::iterator i = mArray->mCells.begin(); |