From 856119c5a43b4781b051b93a0713c152cfd99f85 Mon Sep 17 00:00:00 2001
From: Arno <arno@disconnect.de>
Date: Fri, 15 Apr 2022 13:27:34 +0200
Subject: Make it run with Qt6

This is a huge commit. Changes:
* Obviously, make it compile
* Make it run (only scarcely tested)
* get rid of most of clang's warnings

Let's see what surprises are in store...
---
 smglobals.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'smglobals.cpp')

diff --git a/smglobals.cpp b/smglobals.cpp
index 9577ebf..d0165a9 100644
--- a/smglobals.cpp
+++ b/smglobals.cpp
@@ -13,7 +13,6 @@
 #include "mappingtablemodel.h"
 #include "mappingtreemodel.h"
 #include "pictureviewer2.h"
-#include "videoviewer.h"
 #include "picfilesmodel.h"
 #include "configurationdialog.h"
 #include "archivebrowsermodel.h"
@@ -21,7 +20,7 @@
 SmGlobals *SmGlobals::mInstance = nullptr;
 
 SmGlobals::~SmGlobals(){
-    for(QAbstractItemModel *model : mModels.values()){
+    for(const auto &model : qAsConst(mModels)){
         model->deleteLater();
 	}
     for(QWidget *w : mWidgets){
@@ -99,14 +98,6 @@ PictureViewer2 *SmGlobals::pictureViewer() {
 	return mPictureViewer;
 }
 
-VideoViewer *SmGlobals::videoViewer() {
-    if(!mVideoViewer){
-        mVideoViewer = new VideoViewer;
-        mVideoViewer->setHidden(true);
-    }
-    return mVideoViewer;
-}
-
 QIcon SmGlobals::iconFor(const QString &type){
     QString settingsS = QString("ui/%1icon").arg(type);
     QSettings s;
-- 
cgit v1.2.3-70-g09d2