diff options
author | Rohit Nirmal <rohitnirmal9@gmail.com> | 2014-12-03 19:57:57 +0100 |
---|---|---|
committer | Rohit Nirmal <rohitnirmal9@gmail.com> | 2014-12-03 19:57:57 +0100 |
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 yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.gz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.bz2 yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.lz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.xz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.zst yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.zip |
Diffstat (limited to '')
-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 @@ struct Hotkey { - Hotkey() : shortcut(NULL), context(Qt::WindowShortcut) {} + Hotkey() : shortcut(nullptr), context(Qt::WindowShortcut) {} QKeySequence keyseq; QShortcut* shortcut; @@ -81,7 +81,7 @@ QShortcut* GetHotkey(const QString& group, const QString& action, QWidget* widge Hotkey& hk = hotkey_groups[group][action]; if (!hk.shortcut) - hk.shortcut = new QShortcut(hk.keyseq, widget, NULL, NULL, hk.context); + hk.shortcut = new QShortcut(hk.keyseq, widget, nullptr, nullptr, hk.context); return hk.shortcut; } |