instanceOf now uses RTTI and checks its answer.
Some checks failed
CI / ubuntu-latest-html-tests (push) Has been cancelled
CI / ubuntu-latest-no-tls (push) Has been cancelled
CI / ubuntu-latest-mbedtls2 (push) Has been cancelled
CI / ubuntu-latest-openssl-3 (push) Has been cancelled
CI / ubuntu-latest-with-old-std (push) Has been cancelled
CI / ubuntu-20-04-openssl-1-1 (push) Has been cancelled
CI / alpine-mbedtls-3_6_0 (push) Has been cancelled
CI / macOS-13-openssl-1-1 (push) Has been cancelled
CI / macOS-13-openssl-3 (push) Has been cancelled
CI / freebsd-14-openssl-3 (push) Has been cancelled
CI / windows-mbedtls (push) Has been cancelled
Some checks failed
CI / ubuntu-latest-html-tests (push) Has been cancelled
CI / ubuntu-latest-no-tls (push) Has been cancelled
CI / ubuntu-latest-mbedtls2 (push) Has been cancelled
CI / ubuntu-latest-openssl-3 (push) Has been cancelled
CI / ubuntu-latest-with-old-std (push) Has been cancelled
CI / ubuntu-20-04-openssl-1-1 (push) Has been cancelled
CI / alpine-mbedtls-3_6_0 (push) Has been cancelled
CI / macOS-13-openssl-1-1 (push) Has been cancelled
CI / macOS-13-openssl-3 (push) Has been cancelled
CI / freebsd-14-openssl-3 (push) Has been cancelled
CI / windows-mbedtls (push) Has been cancelled
Next I'll just remove it, but this commit lets me have something in history such that I can fall back to check for bugs that might get introduced.
This commit is contained in:
@ -131,7 +131,7 @@ bool OOFAwareWidget::isOOFContainer (Widget *widget, int oofmIndex)
|
||||
|
||||
switch (oofmIndex) {
|
||||
case OOFM_FLOATS:
|
||||
return widget->instanceOf (OOFAwareWidget::CLASS_ID) &&
|
||||
return widget->instanceOf <OOFAwareWidget>() &&
|
||||
(// For floats, only some OOF aware widgets are considered as
|
||||
// containers.
|
||||
((OOFAwareWidget*)widget)->isPossibleOOFContainer (OOFM_FLOATS) &&
|
||||
@ -145,7 +145,7 @@ bool OOFAwareWidget::isOOFContainer (Widget *widget, int oofmIndex)
|
||||
// is also a text block, so possible float container)
|
||||
// within a table widget, which is not a suitable float
|
||||
// container parent).
|
||||
!(widget->getParent()->instanceOf (OOFAwareWidget::CLASS_ID) &&
|
||||
!(widget->getParent()->instanceOf <OOFAwareWidget>() &&
|
||||
((OOFAwareWidget*)widget->getParent())
|
||||
->isPossibleOOFContainerParent (OOFM_FLOATS)) ||
|
||||
// Inline blocks are containing blocks, too.
|
||||
@ -163,7 +163,7 @@ bool OOFAwareWidget::isOOFContainer (Widget *widget, int oofmIndex)
|
||||
|
||||
case OOFM_RELATIVE:
|
||||
case OOFM_ABSOLUTE:
|
||||
return widget->instanceOf (OOFAwareWidget::CLASS_ID) &&
|
||||
return widget->instanceOf <OOFAwareWidget>() &&
|
||||
(widget->getParent() == NULL ||
|
||||
OOFAwareWidget::testWidgetPositioned (widget));
|
||||
|
||||
@ -192,7 +192,7 @@ void OOFAwareWidget::notifySetParent ()
|
||||
widget != NULL && oofContainer[oofmIndex] == NULL;
|
||||
widget = widget->getParent ())
|
||||
if (isOOFContainer (widget, oofmIndex)) {
|
||||
assert (widget->instanceOf (OOFAwareWidget::CLASS_ID));
|
||||
assert (widget->instanceOf <OOFAwareWidget>());
|
||||
oofContainer[oofmIndex] = (OOFAwareWidget*)widget;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user