diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2014-10-07 22:15:40 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2014-10-07 22:15:40 +0200 |
| commit | 5274acd624c3a5ad60592cee2ebc869b10a96fda (patch) | |
| tree | 04836157b8c3aa9553d5e67e8ed248220ff1661a /src/ui/window.cpp | |
| parent | 3ef2f976df56817d2a23d4fe88a1917798beaacd (diff) | |
| parent | 2770ee8927cb91419b1918f46228435026790cf6 (diff) | |
| download | colobot-5274acd624c3a5ad60592cee2ebc869b10a96fda.tar.gz colobot-5274acd624c3a5ad60592cee2ebc869b10a96fda.tar.bz2 colobot-5274acd624c3a5ad60592cee2ebc869b10a96fda.zip | |
Merge with dev
Diffstat (limited to 'src/ui/window.cpp')
| -rw-r--r-- | src/ui/window.cpp | 53 |
1 files changed, 15 insertions, 38 deletions
diff --git a/src/ui/window.cpp b/src/ui/window.cpp index 204acf9..61ea904 100644 --- a/src/ui/window.cpp +++ b/src/ui/window.cpp @@ -64,34 +64,20 @@ CWindow::~CWindow() void CWindow::Flush() { - int i; - - for ( i=0 ; i<MAXWINDOW ; i++ ) + for (int i = 0 ; i < MAXWINDOW; i++) { - if ( m_table[i] != 0 ) - { - delete m_table[i]; - m_table[i] = 0; - } + delete m_table[i]; + m_table[i] = nullptr; } - if ( m_buttonReduce != 0 ) - { - delete m_buttonReduce; - m_buttonReduce = 0; - } + delete m_buttonReduce; + m_buttonReduce = nullptr; - if ( m_buttonFull != 0 ) - { - delete m_buttonFull; - m_buttonFull = 0; - } + delete m_buttonFull; + m_buttonFull = nullptr; - if ( m_buttonClose != 0 ) - { - delete m_buttonClose; - m_buttonClose = 0; - } + delete m_buttonClose; + m_buttonClose = nullptr; } @@ -583,23 +569,14 @@ void CWindow::SetName(std::string name, bool tooltip) CControl::SetName(name, tooltip); - if ( m_buttonReduce != 0 ) - { - delete m_buttonReduce; - m_buttonReduce = 0; - } + delete m_buttonReduce; + m_buttonReduce = nullptr; - if ( m_buttonFull != 0 ) - { - delete m_buttonFull; - m_buttonFull = 0; - } + delete m_buttonFull; + m_buttonFull = nullptr; - if ( m_buttonClose != 0 ) - { - delete m_buttonClose; - m_buttonClose = 0; - } + delete m_buttonClose; + m_buttonClose = nullptr; bAdjust = false; |