diff options
author | Sebastian Geerken <devnull@localhost> | 2015-10-03 19:50:22 +0200 |
---|---|---|
committer | Sebastian Geerken <devnull@localhost> | 2015-10-03 19:50:22 +0200 |
commit | 1392f2e22c584eaa1f26fb20babdf6eb4ddbc185 (patch) | |
tree | 6cae71ec81021de413eed21c174e773fe6a0064c /dw/ooffloatsmgr.hh | |
parent | 1191996538bd923b7f29016558a8154c51df3ffb (diff) |
SRDOP: Remove references to allocations in OOFFloatsMgr.
Diffstat (limited to 'dw/ooffloatsmgr.hh')
-rw-r--r-- | dw/ooffloatsmgr.hh | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/dw/ooffloatsmgr.hh b/dw/ooffloatsmgr.hh index 8e63eaab..b6571a86 100644 --- a/dw/ooffloatsmgr.hh +++ b/dw/ooffloatsmgr.hh @@ -81,15 +81,6 @@ private: Float (OOFFloatsMgr *oofm, core::Widget *widget, OOFAwareWidget *generatingBlock, int externalIndex); - inline bool isNowAllocated () { return getWidget()->wasAllocated (); } - inline int getNewXCB () { return getWidget()->getAllocation()->x - - getOOFFloatsMgr()->containerAllocation.x; } - inline int getNewYCB () { return getWidget()->getAllocation()->y - - getOOFFloatsMgr()->containerAllocation.y; } - inline int getNewWidth () { return getWidget()->getAllocation()->width; } - inline int getNewHeight () { return getWidget()->getAllocation()->ascent + - getWidget()->getAllocation()->descent; } - void intoStringBuffer(lout::misc::StringBuffer *sb); bool covers (int y, int h); @@ -162,21 +153,6 @@ private: TBInfo *parent, int parentExtIndex); ~TBInfo (); - inline bool isNowAllocated () { - return getOOFFloatsMgr()->wasAllocated (getOOFAwareWidget()); } - inline int getNewXCB () { - return getOOFFloatsMgr()->getAllocation (getOOFAwareWidget())->x - - getOOFFloatsMgr()->containerAllocation.x; } - inline int getNewYCB () { - return getOOFFloatsMgr()->getAllocation (getOOFAwareWidget())->y - - getOOFFloatsMgr()->containerAllocation.y; } - inline int getNewWidth () { - return getOOFFloatsMgr()->getAllocation (getOOFAwareWidget())->width; } - inline int getNewHeight () { - core::Allocation *allocation = - getOOFFloatsMgr()->getAllocation (getOOFAwareWidget ()); - return allocation->ascent + allocation->descent; } - inline OOFAwareWidget *getOOFAwareWidget () { return (OOFAwareWidget*)getWidget (); } }; @@ -192,22 +168,6 @@ private: int lastLeftTBIndex, lastRightTBIndex, leftFloatsMark, rightFloatsMark; - /** - * Variant of Widget::wasAllocated(), which can also be used within - * OOFM::sizeAllocateEnd(). - */ - inline bool wasAllocated (OOFAwareWidget *textblock) { - return getOOFAwareWidget(textblock)->wasAllocated; - } - - /** - * Variant of Widget::getAllocation(), which can also be used - * within OOFM::sizeAllocateEnd(). - */ - inline core::Allocation *getAllocation (OOFAwareWidget *textblock) { - return &(getOOFAwareWidget(textblock)->allocation); - } - void moveExternalIndices (lout::container::typed::Vector<Float> *list, int oldStartIndex, int diff); Float *findFloatByWidget (core::Widget *widget); |