diff options
| author |  Rohit Nirmal | 2014-12-03 12:57:57 -0600 |
|---|---|---|
| committer | Rohit Nirmal | 2014-12-03 12:57:57 -0600 |
| commit | 8a624239703c046d89ebeaf3ea13c87af75b550f (patch) | |
| tree | 19546d2b06c71add6140f322a8aab0c918bbd9ca /src/citra_qt/hotkeys.cpp | |
| parent | Merge pull request #236 from rohit-n/sign-compare (diff) | |
| download | yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.gz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.xz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.zip | |
Change NULLs to nullptrs.
Diffstat (limited to 'src/citra_qt/hotkeys.cpp')
| -rw-r--r-- | src/citra_qt/hotkeys.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp index bbaa4a8dc..5d0b52e4f 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/citra_qt/hotkeys.cpp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | struct Hotkey | 6 | struct Hotkey |
| 7 | { | 7 | { |
| 8 | Hotkey() : shortcut(NULL), context(Qt::WindowShortcut) {} | 8 | Hotkey() : shortcut(nullptr), context(Qt::WindowShortcut) {} |
| 9 | 9 | ||
| 10 | QKeySequence keyseq; | 10 | QKeySequence keyseq; |
| 11 | QShortcut* shortcut; | 11 | QShortcut* shortcut; |
| @@ -81,7 +81,7 @@ QShortcut* GetHotkey(const QString& group, const QString& action, QWidget* widge | |||
| 81 | Hotkey& hk = hotkey_groups[group][action]; | 81 | Hotkey& hk = hotkey_groups[group][action]; |
| 82 | 82 | ||
| 83 | if (!hk.shortcut) | 83 | if (!hk.shortcut) |
| 84 | hk.shortcut = new QShortcut(hk.keyseq, widget, NULL, NULL, hk.context); | 84 | hk.shortcut = new QShortcut(hk.keyseq, widget, nullptr, nullptr, hk.context); |
| 85 | 85 | ||
| 86 | return hk.shortcut; | 86 | return hk.shortcut; |
| 87 | } | 87 | } |