From 81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 8 May 2017 17:10:02 +0300
Subject: Unshadow variable mParent between Window and Widget.

---
 src/gui/widgets/window.cpp | 2 +-
 src/gui/widgets/window.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/gui')

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(),
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 173c8d780..e371de36f 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -307,7 +307,7 @@ class Window notfinal : public BasicContainer2,
          * @return The parent window or <code>NULL</code> if there is none.
          */
         Window *getParentWindow() const
-        { return mParent; }
+        { return mParentWindow; }
 
         /**
          * Schedule this window for deletion. It will be deleted at the start
@@ -678,7 +678,7 @@ class Window notfinal : public BasicContainer2,
         int getResizeHandles(const MouseEvent &event) A_WARN_UNUSED;
 
         Image *mGrip;                 /**< Resize grip */
-        Window *mParent;              /**< The parent window */
+        Window *mParentWindow;        /**< The parent window */
         Layout *mLayout;              /**< Layout handler */
         Rect mCloseRect;    /**< Close button rectangle */
         Rect mStickyRect;   /**< Sticky button rectangle */
-- 
cgit v1.2.3-70-g09d2