diff options
| -rw-r--r-- | dw/oofawarewidget.cc | 8 | ||||
| -rw-r--r-- | dw/oofawarewidget.hh | 4 | ||||
| -rw-r--r-- | dw/textblock.cc | 4 | ||||
| -rw-r--r-- | dw/textblock.hh | 4 |
4 files changed, 10 insertions, 10 deletions
diff --git a/dw/oofawarewidget.cc b/dw/oofawarewidget.cc index a90fbfb9..3d480535 100644 --- a/dw/oofawarewidget.cc +++ b/dw/oofawarewidget.cc @@ -134,7 +134,7 @@ bool OOFAwareWidget::isOOFContainer (Widget *widget, int oofmIndex) return widget->instanceOf (OOFAwareWidget::CLASS_ID) && (// For floats, only some OOF aware widgets are considered as // containers. - ((OOFAwareWidget*)widget)->isPossibleContainer (OOFM_FLOATS) && + ((OOFAwareWidget*)widget)->isPossibleOOFContainer (OOFM_FLOATS) && // The second condition: that this block is "out of flow", in a // wider sense. (// The toplevel widget is "out of flow", since there is no @@ -147,7 +147,7 @@ bool OOFAwareWidget::isOOFContainer (Widget *widget, int oofmIndex) // container parent). !(widget->getParent()->instanceOf (OOFAwareWidget::CLASS_ID) && ((OOFAwareWidget*)widget->getParent()) - ->isPossibleContainerParent (OOFM_FLOATS)) || + ->isPossibleOOFContainerParent (OOFM_FLOATS)) || // Inline blocks are containing blocks, too. widget->getStyle()->display == DISPLAY_INLINE_BLOCK || // Same for blocks with 'overview' set to another value than @@ -597,12 +597,12 @@ bool OOFAwareWidget::usesMaxGeneratorWidth () return false; } -bool OOFAwareWidget::isPossibleContainer (int oofmIndex) +bool OOFAwareWidget::isPossibleOOFContainer (int oofmIndex) { return oofmIndex != OOFM_FLOATS; } -bool OOFAwareWidget::isPossibleContainerParent (int oofmIndex) +bool OOFAwareWidget::isPossibleOOFContainerParent (int oofmIndex) { return oofmIndex != OOFM_FLOATS; } diff --git a/dw/oofawarewidget.hh b/dw/oofawarewidget.hh index 9486e153..2c33d386 100644 --- a/dw/oofawarewidget.hh +++ b/dw/oofawarewidget.hh @@ -300,9 +300,9 @@ public: virtual bool usesMaxGeneratorWidth (); - virtual bool isPossibleContainer (int oofmIndex); + virtual bool isPossibleOOFContainer (int oofmIndex); - virtual bool isPossibleContainerParent (int oofmIndex); + virtual bool isPossibleOOFContainerParent (int oofmIndex); }; } // namespace oof diff --git a/dw/textblock.cc b/dw/textblock.cc index 95b4f0c9..9d64c2c9 100644 --- a/dw/textblock.cc +++ b/dw/textblock.cc @@ -3231,12 +3231,12 @@ bool Textblock::usesMaxGeneratorWidth () return result; } -bool Textblock::isPossibleContainer (int oofmIndex) +bool Textblock::isPossibleOOFContainer (int oofmIndex) { return true; } -bool Textblock::isPossibleContainerParent (int oofmIndex) +bool Textblock::isPossibleOOFContainerParent (int oofmIndex) { return true; } diff --git a/dw/textblock.hh b/dw/textblock.hh index c5e790ba..3120b59e 100644 --- a/dw/textblock.hh +++ b/dw/textblock.hh @@ -908,8 +908,8 @@ public: int getGeneratorWidth (); int getMaxGeneratorWidth (); bool usesMaxGeneratorWidth (); - bool isPossibleContainer (int oofmIndex); - bool isPossibleContainerParent (int oofmIndex); + bool isPossibleOOFContainer (int oofmIndex); + bool isPossibleOOFContainerParent (int oofmIndex); }; #define DBG_SET_WORD_PENALTY(n, i, is) \ |