summaryrefslogtreecommitdiff
path: root/src/citra_qt/bootmanager.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/bootmanager.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 '')
-rw-r--r--src/citra_qt/bootmanager.cpp2
1 files changed, 1 insertions, 1 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;