From 81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 8 May 2017 17:10:02 +0300 Subject: Unshadow variable mParent between Window and Widget. --- src/gui/widgets/window.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui/widgets/window.cpp') diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 5abe278c9..86c2188d1 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -129,7 +129,7 @@ Window::Window(const std::string &caption, mShowTitle(true), mLastRedraw(true), mGrip(nullptr), - mParent(parent), + mParentWindow(parent), mLayout(nullptr), mCloseRect(), mStickyRect(), -- cgit v1.2.3-60-g2f50