summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2018-08-26 18:28:06 +0200
committerArno <arno@disconnect.de>2018-08-26 18:28:06 +0200
commit1aebcdcc41d60f891a12b70584d3ceb833d5bfdc (patch)
tree94a80743652dac9781a9b0fde33c4ad814ee1327
parent9cbbbc0a69d13c65f14678c3187b796a374236ce (diff)
downloadSheMov-1aebcdcc41d60f891a12b70584d3ceb833d5bfdc.tar.gz
SheMov-1aebcdcc41d60f891a12b70584d3ceb833d5bfdc.tar.bz2
SheMov-1aebcdcc41d60f891a12b70584d3ceb833d5bfdc.zip
Use nullptr instead of literal 0 to avoid warnings
-rw-r--r--smglobals.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/smglobals.cpp b/smglobals.cpp
index 2aa6cbe..7a909b6 100644
--- a/smglobals.cpp
+++ b/smglobals.cpp
@@ -21,7 +21,7 @@
#include <X11/extensions/Xfixes.h>
-SmGlobals *SmGlobals::mInstance = 0;
+SmGlobals *SmGlobals::mInstance = nullptr;
SmGlobals::~SmGlobals(){
foreach(QAbstractItemModel *model, mModels.values()){
@@ -40,10 +40,10 @@ SmGlobals *SmGlobals::instance(){
db.setPassword(s.value("database/dbpass").toString());
db.setDatabaseName(s.value("database/dbname").toString());
if(!db.open()){
- QMessageBox::critical(0, tr("Error"), tr("Could not open database."));
+ QMessageBox::critical(nullptr, tr("Error"), tr("Could not open database."));
ConfigurationDialog configDlg;
configDlg.exec();
- QMessageBox::information(0, tr("Notice"), tr("I will exit now. Start me again!"));
+ QMessageBox::information(nullptr, tr("Notice"), tr("I will exit now. Start me again!"));
exit(EXIT_SUCCESS);
}
}
@@ -89,7 +89,7 @@ QAbstractItemModel *SmGlobals::model(const QString &which){
mModels.insert(which, model);
}
}
- return mModels.contains(which) ? mModels.value(which) : 0;
+ return mModels.contains(which) ? mModels.value(which) : nullptr;
}
PictureViewer2 *SmGlobals::pictureViewer() {
@@ -101,7 +101,7 @@ PictureViewer2 *SmGlobals::pictureViewer() {
QSize SmGlobals::cursorSize() {
if(!mCursorSize.isValid()){
- Display *dpy = XOpenDisplay(0);
+ Display *dpy = XOpenDisplay(nullptr);
XFixesCursorImage *curImage = XFixesGetCursorImage(dpy);
mCursorSize = QSize(curImage->width, curImage->height);
XFree(curImage);
@@ -117,7 +117,7 @@ QIcon SmGlobals::iconFor(const QString &type){
return retval;
}
-SmGlobals::SmGlobals() : mPictureViewer(0), mArchiveController(0){
+SmGlobals::SmGlobals() : mPictureViewer(nullptr), mArchiveController(nullptr){
mIcons.insert("Dildo", ":/dildo.png");
mIcons.insert("Dick to left", ":/back_dick.png");
mIcons.insert("Dick pointing up", ":/up_dick.png");