diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
| commit | d802d392811be44d34ae9cd23f616db93e54c50f (patch) | |
| tree | f9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/DolphinWX/InputConfigDiag.cpp | |
| parent | f28116b7da6aac6069084596dc4dbf866bdebfd8 (diff) | |
clang-modernize -use-nullptr
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
Diffstat (limited to 'Source/Core/DolphinWX/InputConfigDiag.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/InputConfigDiag.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/Core/DolphinWX/InputConfigDiag.cpp b/Source/Core/DolphinWX/InputConfigDiag.cpp index fff544d2dd..6cac0e4d25 100644 --- a/Source/Core/DolphinWX/InputConfigDiag.cpp +++ b/Source/Core/DolphinWX/InputConfigDiag.cpp @@ -381,8 +381,8 @@ inline bool IsAlphabetic(wxString &str) inline void GetExpressionForControl(wxString &expr, wxString &control_name, - DeviceQualifier *control_device = NULL, - DeviceQualifier *default_device = NULL) + DeviceQualifier *control_device = nullptr, + DeviceQualifier *default_device = nullptr) { expr = ""; @@ -748,7 +748,7 @@ ControlGroupBox::ControlGroupBox(ControllerEmu::ControlGroup* const group, wxWin : wxBoxSizer(wxVERTICAL) , control_group(group) { - static_bitmap = NULL; + static_bitmap = nullptr; wxFont m_SmallFont(7, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL); for (auto& control : group->controls) @@ -915,7 +915,7 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow { size_t col_size = 0; - wxBoxSizer* stacked_groups = NULL; + wxBoxSizer* stacked_groups = nullptr; for (auto& group : controller->groups) { ControlGroupBox* control_group_box = new ControlGroupBox(group.get(), parent, eventsink); @@ -925,7 +925,7 @@ ControlGroupsSizer::ControlGroupsSizer(ControllerEmu* const controller, wxWindow const size_t grp_size = group->controls.size() + group->settings.size(); col_size += grp_size; - if (col_size > 8 || NULL == stacked_groups) + if (col_size > 8 || nullptr == stacked_groups) { if (stacked_groups) Add(stacked_groups, 0, /*wxEXPAND|*/wxBOTTOM|wxRIGHT, 5); |