diff options
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/hotkeys.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/main.cpp | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index 9bf079919..9a29f974b 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -230,7 +230,7 @@ QByteArray GRenderWindow::saveGeometry() | |||
| 230 | { | 230 | { |
| 231 | // If we are a top-level widget, store the current geometry | 231 | // If we are a top-level widget, store the current geometry |
| 232 | // otherwise, store the last backup | 232 | // otherwise, store the last backup |
| 233 | if (parent() == NULL) | 233 | if (parent() == nullptr) |
| 234 | return ((QGLWidget*)this)->saveGeometry(); | 234 | return ((QGLWidget*)this)->saveGeometry(); |
| 235 | else | 235 | else |
| 236 | return geometry; | 236 | return geometry; |
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 | } |
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index d5554d917..430a4ece4 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -131,7 +131,7 @@ GMainWindow::GMainWindow() | |||
| 131 | GMainWindow::~GMainWindow() | 131 | GMainWindow::~GMainWindow() |
| 132 | { | 132 | { |
| 133 | // will get automatically deleted otherwise | 133 | // will get automatically deleted otherwise |
| 134 | if (render_window->parent() == NULL) | 134 | if (render_window->parent() == nullptr) |
| 135 | delete render_window; | 135 | delete render_window; |
| 136 | } | 136 | } |
| 137 | 137 | ||
| @@ -213,14 +213,14 @@ void GMainWindow::OnOpenHotkeysDialog() | |||
| 213 | void GMainWindow::ToggleWindowMode() | 213 | void GMainWindow::ToggleWindowMode() |
| 214 | { | 214 | { |
| 215 | bool enable = ui.action_Popout_Window_Mode->isChecked(); | 215 | bool enable = ui.action_Popout_Window_Mode->isChecked(); |
| 216 | if (enable && render_window->parent() != NULL) | 216 | if (enable && render_window->parent() != nullptr) |
| 217 | { | 217 | { |
| 218 | ui.horizontalLayout->removeWidget(render_window); | 218 | ui.horizontalLayout->removeWidget(render_window); |
| 219 | render_window->setParent(NULL); | 219 | render_window->setParent(nullptr); |
| 220 | render_window->setVisible(true); | 220 | render_window->setVisible(true); |
| 221 | render_window->RestoreGeometry(); | 221 | render_window->RestoreGeometry(); |
| 222 | } | 222 | } |
| 223 | else if (!enable && render_window->parent() == NULL) | 223 | else if (!enable && render_window->parent() == nullptr) |
| 224 | { | 224 | { |
| 225 | render_window->BackupGeometry(); | 225 | render_window->BackupGeometry(); |
| 226 | ui.horizontalLayout->addWidget(render_window); | 226 | ui.horizontalLayout->addWidget(render_window); |