diff options
| -rw-r--r-- | smglobals.cpp | 12 |
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"); |