Skip to content

Commit

Permalink
Fix compiler warning with clang due to PR 120
Browse files Browse the repository at this point in the history
Warning was:

GUIDialogSelect.cpp:30:5: warning: field 'm_buttonLabel' will be initialized after field 'm_selectedItem' [-Wreorder]
     m_buttonLabel(-1),
     ^
  • Loading branch information
garbear committed Aug 31, 2020
1 parent 067ad1a commit 7c5ab08
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 12 deletions.
7 changes: 0 additions & 7 deletions xbmc/dialogs/GUIDialogSelect.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,6 @@ CGUIDialogSelect::CGUIDialogSelect() : CGUIDialogSelect(WINDOW_DIALOG_SELECT) {}

CGUIDialogSelect::CGUIDialogSelect(int windowId)
: CGUIDialogBoxBase(windowId, "DialogSelect.xml"),
m_bButtonEnabled(false),
m_bButtonPressed(false),
m_buttonLabel(-1),
m_selectedItem(nullptr),
m_useDetails(false),
m_multiSelection(false),
m_selectedItems(),
m_vecList(new CFileItemList())
{
m_bConfirmed = false;
Expand Down
10 changes: 5 additions & 5 deletions xbmc/dialogs/GUIDialogSelect.h
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ class CGUIDialogSelect : public CGUIDialogBoxBase
CFileItemPtr m_selectedItem;

private:
bool m_bButtonEnabled;
bool m_bButtonPressed;
int m_buttonLabel;
bool m_useDetails;
bool m_multiSelection;
bool m_bButtonEnabled = false;
bool m_bButtonPressed = false;
int m_buttonLabel = -1;
bool m_useDetails = false;
bool m_multiSelection = false;
bool m_focusToButton{};

std::vector<int> m_selectedItems;
Expand Down

0 comments on commit 7c5ab08

Please sign in to comment.