diff --git a/doomsday/client/src/ui/widgets/guiwidget.cpp b/doomsday/client/src/ui/widgets/guiwidget.cpp index edc391d74d..45bc72b839 100644 --- a/doomsday/client/src/ui/widgets/guiwidget.cpp +++ b/doomsday/client/src/ui/widgets/guiwidget.cpp @@ -70,10 +70,10 @@ DENG2_PIMPL(GuiWidget) marginId("gap"), blurInited(false), uBlurMvpMatrix("uMvpMatrix", GLUniform::Mat4), - uBlurColor("uColor", GLUniform::Vec4), - uBlurTex("uTex", GLUniform::Sampler2D), - uBlurStep("uBlurStep", GLUniform::Vec2), - uBlurWindow("uWindow", GLUniform::Vec4) + uBlurColor ("uColor", GLUniform::Vec4), + uBlurTex ("uTex", GLUniform::Sampler2D), + uBlurStep ("uBlurStep", GLUniform::Vec2), + uBlurWindow ("uWindow", GLUniform::Vec4) { #ifdef DENG2_DEBUG self.audienceForParentChange += this; diff --git a/doomsday/client/src/ui/widgets/menuwidget.cpp b/doomsday/client/src/ui/widgets/menuwidget.cpp index 57d3b318d0..8bc77db53f 100644 --- a/doomsday/client/src/ui/widgets/menuwidget.cpp +++ b/doomsday/client/src/ui/widgets/menuwidget.cpp @@ -147,9 +147,7 @@ DENG2_PIMPL(MenuWidget) } else { - Rule const *old = total; - total = holdRef(OperatorRule::maximum(*total, item->rule().width())); - releaseRef(old); + changeRef(total, OperatorRule::maximum(*total, item->rule().width())); } } if(!total) return new ConstantRule(0); @@ -172,9 +170,7 @@ DENG2_PIMPL(MenuWidget) } else { - Rule const *old = total; - total = holdRef(OperatorRule::maximum(*total, item->rule().height())); - releaseRef(old); + changeRef(total, OperatorRule::maximum(*total, item->rule().height())); } } if(!total) return new ConstantRule(0); @@ -194,9 +190,7 @@ DENG2_PIMPL(MenuWidget) } else { - Rule const *old = total; - total = holdRef(*total + *fullColumnWidth(i)); - releaseRef(old); + changeRef(total, *total + *fullColumnWidth(i)); } } if(!total) return new ConstantRule(0); @@ -216,9 +210,7 @@ DENG2_PIMPL(MenuWidget) } else { - Rule const *old = total; - total = holdRef(*total + *fullRowHeight(i)); - releaseRef(old); + changeRef(total, *total + *fullRowHeight(i)); } } if(!total) return new ConstantRule(0); @@ -332,9 +324,7 @@ void MenuWidget::updateLayout() } else { - Rule const *old = rowBottom; - rowBottom = new OperatorRule(OperatorRule::Maximum, widget->rule().bottom(), *old); - releaseRef(old); + changeRef(rowBottom, OperatorRule::maximum(widget->rule().bottom(), *rowBottom)); } previous = widget;