diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-11-07 19:34:52 +0300 |
commit | 9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch) | |
tree | c084bdf8afabc6220779645dcb5dbf71af6a151f /src/gui/widgets/window.cpp | |
parent | bc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff) | |
download | plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2 plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip |
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/gui/widgets/window.cpp')
-rw-r--r-- | src/gui/widgets/window.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index c52bf744e..273695a1a 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -49,9 +49,9 @@ int Window::mouseResize = 0; Window::Window(const std::string &caption, bool modal, Window *parent, std::string skin): gcn::Window(caption), - mGrip(0), + mGrip(nullptr), mParent(parent), - mLayout(NULL), + mLayout(nullptr), mWindowName("window"), mShowTitle(true), mModal(modal), @@ -91,7 +91,7 @@ Window::Window(const std::string &caption, bool modal, Window *parent, } else { - mSkin = 0; + mSkin = nullptr; } // Add this window to the window container @@ -118,7 +118,7 @@ Window::~Window() saveWindowState(); delete mLayout; - mLayout = 0; + mLayout = nullptr; while (!mWidgets.empty()) delete mWidgets.front(); @@ -127,7 +127,7 @@ Window::~Window() removeWidgetListener(this); delete mVertexes; - mVertexes = 0; + mVertexes = nullptr; instances--; @@ -135,7 +135,7 @@ Window::~Window() { if (Theme::instance()) Theme::instance()->unload(mSkin); - mSkin = 0; + mSkin = nullptr; } } @@ -348,7 +348,7 @@ void Window::setResizable(bool r) { remove(mGrip); delete mGrip; - mGrip = 0; + mGrip = nullptr; } } @@ -947,7 +947,7 @@ void Window::reflowLayout(int w, int h) mLayout->reflow(w, h); delete mLayout; - mLayout = 0; + mLayout = nullptr; setContentSize(w, h); } |