From 9e83411f7e4147d09af5a5006888dcc187ea0ef8 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 7 Nov 2011 19:34:52 +0300 Subject: Fix some warnings under gcc 4.7. --- src/guichan/widgets/listbox.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/guichan/widgets/listbox.cpp') diff --git a/src/guichan/widgets/listbox.cpp b/src/guichan/widgets/listbox.cpp index 95f04fc68..80989cc72 100644 --- a/src/guichan/widgets/listbox.cpp +++ b/src/guichan/widgets/listbox.cpp @@ -61,7 +61,7 @@ namespace gcn { ListBox::ListBox() : mSelected(-1), - mListModel(NULL), + mListModel(nullptr), mWrappingEnabled(false) { setWidth(100); @@ -88,7 +88,7 @@ namespace gcn graphics->setColor(getBackgroundColor()); graphics->fillRectangle(Rectangle(0, 0, getWidth(), getHeight())); - if (mListModel == NULL) + if (!mListModel) return; graphics->setColor(getForegroundColor()); @@ -161,7 +161,7 @@ namespace gcn void ListBox::setSelected(int selected) { - if (mListModel == NULL) + if (!mListModel) { mSelected = -1; } @@ -286,7 +286,7 @@ namespace gcn void ListBox::adjustSize() { - if (mListModel != NULL) + if (mListModel) setHeight(getRowHeight() * mListModel->getNumberOfElements()); } -- cgit v1.2.3-70-g09d2