1 files changed, 19 insertions, 15 deletions

diff --git a/smglobals.cpp b/smglobals.cpp
index 2aa6cbe..278772e 100644
--- a/smglobals.cpp
+++ b/smglobals.cpp
@@ -13,6 +13,7 @@
 #include "mappingtablemodel.h"
 #include "mappingtreemodel.h"
 #include "pictureviewer2.h"
+#include "videoviewer.h"
 #include "picfilesmodel.h"
 #include "configurationdialog.h"
 #include "archivebrowsermodel.h"
@@ -21,12 +22,15 @@
 #include <X11/extensions/Xfixes.h>
 
 
-SmGlobals *SmGlobals::mInstance = 0;
+SmGlobals *SmGlobals::mInstance = nullptr;
 
 SmGlobals::~SmGlobals(){
-	foreach(QAbstractItemModel *model, mModels.values()){
+    for(QAbstractItemModel *model : mModels.values()){
         model->deleteLater();
 	}
+    for(QWidget *w : mWidgets){
+        w->close();
+    }
 }
 
 SmGlobals *SmGlobals::instance(){
@@ -40,10 +44,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 +93,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() {
@@ -99,9 +103,17 @@ PictureViewer2 *SmGlobals::pictureViewer() {
 	return mPictureViewer;
 }
 
+VideoViewer *SmGlobals::videoViewer() {
+    if(!mVideoViewer){
+        mVideoViewer = new VideoViewer;
+        mVideoViewer->setHidden(true);
+    }
+    return mVideoViewer;
+}
+
 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 +129,7 @@ QIcon SmGlobals::iconFor(const QString &type){
     return retval;
 }
 
-SmGlobals::SmGlobals() : mPictureViewer(0), mArchiveController(0){
+SmGlobals::SmGlobals() : mPictureViewer(nullptr), mVideoViewer(nullptr), mArchiveController(nullptr){
 	mIcons.insert("Dildo", ":/dildo.png");
 	mIcons.insert("Dick to left", ":/back_dick.png");
 	mIcons.insert("Dick pointing up", ":/up_dick.png");
@@ -158,14 +170,6 @@ SmGlobals::SmGlobals() : mPictureViewer(0), mArchiveController(0){
     mReencReasons = s.value("ui/reasons").toStringList();
 }
 
-void SmGlobals::registerWidget(const QString &name, QWidget *w){
-    mWidgets.insert(name, w);
-}
-
-QWidget *SmGlobals::getRegisteredWidget(const QString &name){
-    return mWidgets.value(name);
-}
-
 void SmGlobals::setReencReasons(const QStringList reasons){
     mReencReasons = reasons;
     std::sort(mReencReasons.begin(), mReencReasons.end());