summaryrefslogtreecommitdiff
path: root/src/citra_qt/hotkeys.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-12-07 13:40:04 -0500
committerGravatar bunnei2014-12-07 13:40:04 -0500
commit2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c (patch)
tree4beadeb20c206faf4f85c25d15eee39c964857f6 /src/citra_qt/hotkeys.cpp
parentMerge pull request #252 from yuriks/patch-1 (diff)
parentChange NULLs to nullptrs. (diff)
downloadyuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.gz
yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.xz
yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.zip
Merge pull request #245 from rohit-n/null-nullptr
Change NULLs to nullptrs.
Diffstat (limited to 'src/citra_qt/hotkeys.cpp')
-rw-r--r--src/citra_qt/hotkeys.cpp4
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
6struct Hotkey 6struct 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}