summaryrefslogtreecommitdiffstats
path: root/smglobals.cpp
diff options
context:
space:
mode:
authorArno <arno@disconnect.de>2022-04-15 13:27:34 +0200
committerArno <arno@disconnect.de>2022-04-15 13:27:34 +0200
commit856119c5a43b4781b051b93a0713c152cfd99f85 (patch)
tree4e2fde4e7a76179cc243e0665091c6ad429ea640 /smglobals.cpp
parent62d3ca1482b202d2883eeb5e17e72300e8612477 (diff)
downloadSheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.gz
SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.tar.bz2
SheMov-856119c5a43b4781b051b93a0713c152cfd99f85.zip
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...
Diffstat (limited to 'smglobals.cpp')
-rw-r--r--smglobals.cpp11
1 files changed, 1 insertions, 10 deletions
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;