diff --git a/headers/libs/alm/Area.h b/headers/libs/alm/Area.h index 9a48087a86..fc0245fff5 100644 --- a/headers/libs/alm/Area.h +++ b/headers/libs/alm/Area.h @@ -95,27 +95,11 @@ private: private: BLayoutItem* fLayoutItem; LinearSpec* fLS; - BList fConstraints; XTab* fLeft; XTab* fRight; YTab* fTop; YTab* fBottom; - Constraint* fLeftConstraint; - Constraint* fTopConstraint; - Constraint* fRightConstraint; - Constraint* fBottomConstraint; - - Constraint* fMinContentWidth; - Constraint* fMaxContentWidth; - Constraint* fMinContentHeight; - Constraint* fMaxContentHeight; - bool fAutoPreferredContentSize; - Constraint* fPreferredContentWidth; - Constraint* fPreferredContentHeight; - - double fContentAspectRatio; - Constraint* fContentAspectRatioC; Row* fRow; Column* fColumn; @@ -128,6 +112,17 @@ private: int32 fRightInset; int32 fBottomInset; + BList fConstraints; + Constraint* fMinContentWidth; + Constraint* fMaxContentWidth; + Constraint* fMinContentHeight; + Constraint* fMaxContentHeight; + bool fAutoPreferredContentSize; + Constraint* fPreferredContentWidth; + Constraint* fPreferredContentHeight; + double fContentAspectRatio; + Constraint* fContentAspectRatioC; + public: friend class BALMLayout; diff --git a/src/libs/alm/Area.cpp b/src/libs/alm/Area.cpp index 6e170ad7f1..75facdc40c 100644 --- a/src/libs/alm/Area.cpp +++ b/src/libs/alm/Area.cpp @@ -538,11 +538,6 @@ Area::_Init(LinearSpec* ls, XTab* left, YTab* top, fRightInset = 0; fBottomInset = 0; - fLeftConstraint = NULL; - fTopConstraint = NULL; - fRightConstraint = NULL; - fBottomConstraint = NULL; - fLS = ls; fLeft = left; fRight = right;