summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-08 17:10:02 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-08 17:10:02 +0300
commit81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5 (patch)
tree6b9c341df4a882596f4f6d7abe444a7bffe69ae9
parent28f571be9dbbb77ef32436fe060f8df5b55576cb (diff)
downloadplus-81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5.tar.gz
plus-81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5.tar.bz2
plus-81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5.tar.xz
plus-81e2fb5eeeae47d04ff9b7e9a0ecacb6b9ca64e5.zip
Unshadow variable mParent between Window and Widget.
-rw-r--r--src/gui/widgets/window.cpp2
-rw-r--r--src/gui/widgets/window.h4
2 files changed, 3 insertions, 3 deletions
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 */