Fix clang warnings in pictureviewer2

Get the QGraphicsItems right (I hope), and use auto where applicable.
Let the compiler do the hard work.

Also use type-safe connect syntax, fix nullptr warnings and weed out
foreach.

2 files changed, 28 insertions, 28 deletions

diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index ed73150..ced59d7 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -58,12 +58,12 @@
 
 const QString PictureViewer2::mDefaultFile = ":/picgone.png";
 
-PictureViewer2::PictureViewer2(QWidget *parent) : QGraphicsView(parent), mCur(0), mCurPos(0), mFnItem(0), mMappingItem(0), mShowInfoItem(true), mShowMappingItem(true), mShowMarkItem(false) {
+PictureViewer2::PictureViewer2(QWidget *parent) : QGraphicsView(parent), mCur(nullptr), mCurPos(0), mFnItem(nullptr), mMappingItem(nullptr), mShowInfoItem(true), mShowMappingItem(true), mShowMarkItem(false) {
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setWindowState(Qt::WindowMaximized);
     mSlideDlg = new PictureViewerSlideDlg(this);
-    connect(mSlideDlg, SIGNAL(accepted()), this, SLOT(doSlide()));
+    connect(mSlideDlg, &PictureViewerSlideDlg::accepted, this, &PictureViewer2::doSlide);
 
     //initial file list
     PicData initialData;
@@ -75,7 +75,7 @@ PictureViewer2::PictureViewer2(QWidget *parent) : QGraphicsView(parent), mCur(0)
 
     //picture show
     mTimer = new QTimer(this);
-    connect(mTimer, SIGNAL(timeout()), this, SLOT(nextSlide()));
+    connect(mTimer, &QTimer::timeout, this, &PictureViewer2::nextSlide);
 
     //models + dialogs
     mPicFilesModel = static_cast<PicFilesModel*>(SmGlobals::instance()->model("PicFiles"));
@@ -100,7 +100,7 @@ void PictureViewer2::addFiles(const PicDataList &files, bool clear){
     if(clear){
         mFiles = files;
     }else{
-        foreach(const PicData &f, files){
+        for(const PicData &f : files){
             if(!mFiles.contains(f)){
                 mFiles.append(f);
             }
@@ -125,7 +125,7 @@ void PictureViewer2::addFiles(const QStringList &files, bool clear){
         return;
     }
     PicDataList pd;
-    foreach(QString f, files){
+    for(QString f : files){
         pd << picData(f);
     }
     addFiles(pd, clear);
@@ -139,7 +139,7 @@ void PictureViewer2::addFiles(const QString &dir, bool clear){
     PicDataList pd;
     QDir directory = QDir(dir);
     QFileInfoList files = directory.entryInfoList(QDir::Files, QDir::Name);
-    foreach(QFileInfo fi, files){
+    for(QFileInfo fi : files){
         pd << picData(fi.absoluteFilePath());
     }
     addFiles(pd, clear);
@@ -287,7 +287,7 @@ void PictureViewer2::deleteCurrent(){
 void PictureViewer2::showNewPicsDialog(){
     mNewPicsDlg->clearFiles();
     QStringList fileList;
-    foreach(QVariantList v, mMarkedFiles){
+    for(QVariantList v : mMarkedFiles){
         fileList << v.at(PicFilesModel::FullPath).toString();
     }
     mNewPicsDlg->addFiles(fileList);
@@ -329,12 +329,12 @@ void PictureViewer2::doSlide(){
     }
     mPicData = mPicFilesModel->allPics();
     if(mSlideDlg->shuffle()){
-        unsigned seed = std::chrono::system_clock::now().time_since_epoch().count();
+        auto seed = std::chrono::system_clock::now().time_since_epoch().count();
         std::shuffle(mPicData.begin(), mPicData.end(), std::default_random_engine(seed));
     }
     auto picDataOld = mPicData;
     mPicData.clear();
-    foreach(auto pd, picDataOld){
+    for(auto pd : picDataOld){
         QList<QVariant> tmp;
         tmp << Helper::createArchivePath(pd.value(0).toString(), pd.value(1).toString()) << pd.value(2);
         mPicData << tmp;
@@ -355,7 +355,7 @@ void PictureViewer2::wheelEvent(QWheelEvent *event){
 
 void PictureViewer2::contextMenuEvent(QContextMenuEvent *e){
     QMenu ctxMenu;
-    foreach(QAction *a, actions()){
+    for(QAction *a : actions()){
         ctxMenu.addAction(a);
     }
     ctxMenu.exec(e->globalPos());
@@ -471,7 +471,7 @@ void PictureViewer2::showFile(const PicData &file){
     if(mCur){
         mScene->removeItem(mCur);
         delete mCur;
-        mCur = 0;
+        mCur = nullptr;
     }
     mScene->setSceneRect(rect());
     mCur = new QGraphicsPixmapItem(pixmap);
@@ -486,7 +486,7 @@ void PictureViewer2::showFile(const PicData &file){
         if(mFnItem){
             mScene->removeItem(mFnItem);
             delete mFnItem;
-            mFnItem = 0;
+            mFnItem = nullptr;
         }
     }
     if(mConfigMapPos != ConfigurationDialog::NoDisplay && mShowMappingItem){
@@ -495,7 +495,7 @@ void PictureViewer2::showFile(const PicData &file){
         if(mMappingItem){
             mScene->removeItem(mMappingItem);
             delete mMappingItem;
-            mMappingItem = 0;
+            mMappingItem = nullptr;
         }
     }
 }
@@ -612,12 +612,12 @@ void PictureViewer2::treeToStringRecursive(const SmTreeItem *parent, QTextCursor
 
 QPointF PictureViewer2::getPos(QGraphicsItem *item, int pos, const QPointF &movPos){
     QSizeF curSize = size();
-    item->setFlags(0);
+    item->setFlags(item->flags() & (~QGraphicsItem::ItemIsSelectable) & (~QGraphicsItem::ItemIsMovable));
     if(pos == ConfigurationDialog::TopLeft){
         return QPointF(5, 5);
     }
-    int rightOffset = curSize.width() - 15 - item->boundingRect().width();
-    int bottomOffset = curSize.height() - 15 - item->boundingRect().height();
+    auto rightOffset = curSize.width() - 15 - item->boundingRect().width();
+    auto bottomOffset = curSize.height() - 15 - item->boundingRect().height();
     if(pos == ConfigurationDialog::TopRight){
         return QPointF(rightOffset, 5);
     }
@@ -652,13 +652,13 @@ QString PictureViewer2::constructWindowTitle() const {
 PictureViewerSlideDlg::PictureViewerSlideDlg(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f){
     QGroupBox *slideGb = new QGroupBox(tr("Slide"));
     mSlideAll = new QRadioButton(tr("Slide all"));
-    connect(mSlideAll, SIGNAL(toggled(bool)), this, SLOT(slideAllToggled(bool)));
+    connect(mSlideAll, &QRadioButton::toggled, this, &PictureViewerSlideDlg::slideAllToggled);
     mRecent = new QRadioButton(tr("Slide recent"));
-    connect(mRecent, SIGNAL(toggled(bool)), this, SLOT(recentToggled(bool)));
+    connect(mRecent, &QRadioButton::toggled, this, &PictureViewerSlideDlg::recentToggled);
     mSelection = new QRadioButton(tr("Slide selection"));
-    connect(mSelection, SIGNAL(toggled(bool)), this, SLOT(slideSelectionToggled(bool)));
+    connect(mSelection, &QRadioButton::toggled, this, &PictureViewerSlideDlg::slideSelectionToggled);
     mNoSlide = new QRadioButton(tr("Stop slide"));
-    connect(mNoSlide, SIGNAL(toggled(bool)), this, SLOT(noSlideToggled(bool)));
+    connect(mNoSlide, &QRadioButton::toggled, this, &PictureViewerSlideDlg::noSlideToggled);
     QVBoxLayout *slideL = new QVBoxLayout;
     slideL->addWidget(mSlideAll);
     slideL->addWidget(mRecent);
@@ -682,9 +682,9 @@ PictureViewerSlideDlg::PictureViewerSlideDlg(QWidget *parent, Qt::WindowFlags f)
     selectionL->addWidget(mMappingEditWidget);
     selectionGb->setLayout(selectionL);
     mOk = new QPushButton(tr("Ok"));
-    connect(mOk, SIGNAL(clicked()), this, SLOT(accept()));
+    connect(mOk, &QPushButton::clicked, this, &PictureViewerSlideDlg::accept);
     mCancel = new QPushButton(tr("Cancel"));
-    connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
+    connect(mCancel, &QPushButton::clicked, this, &PictureViewerSlideDlg::reject);
     QHBoxLayout *buttonL = new QHBoxLayout;
     buttonL->addStretch();
     buttonL->addWidget(mOk);
@@ -744,7 +744,7 @@ void PictureViewerSlideDlg::noSlideToggled(bool checked){
     }
 }
 
-PictureViewer2Item::PictureViewer2Item(const PicData &data, const int numSelected, int cur, const QSize &picSize, QGraphicsItem *parent) : QGraphicsItem(parent), mDoc(0){
+PictureViewer2Item::PictureViewer2Item(const PicData &data, const int numSelected, int cur, const QSize &picSize, QGraphicsItem *parent) : QGraphicsItem(parent), mDoc(nullptr){
     //prevent QStaticText from wrapping filesnames with spaces
     //we shouldn't allow this in the first place
     mTextList << data.at(PicFilesModel::FileName).toString().replace(' ', '_');
diff --git a/pictureviewer2.h b/pictureviewer2.h
index 270fd99..2525133 100644
--- a/pictureviewer2.h
+++ b/pictureviewer2.h
@@ -47,7 +47,7 @@ class PictureViewer2 : public QGraphicsView {
     Q_OBJECT
     public:
         enum AssocActions { HideAction, MarkAction, DeleteAction, SlideAction };
-        explicit PictureViewer2(QWidget *parent = 0);
+        explicit PictureViewer2(QWidget *parent = nullptr);
         void addFiles(const PicDataList &files, bool clear = true);
         void addFiles(const QString &dir, bool clear = true);
         void addFiles(const QStringList &files, bool clear = true);
@@ -134,7 +134,7 @@ class PictureViewerSlideDlg : public QDialog {
     Q_OBJECT
     public:
         enum SlideResult { SlideAll, SlideRecent, SlideSelection, NoSlide };
-        explicit PictureViewerSlideDlg(QWidget *parent = 0, Qt::WindowFlags f = 0);
+        explicit PictureViewerSlideDlg(QWidget *parent = nullptr, Qt::WindowFlags = Qt::Widget);
         int result() const { return mSlideResult; }
         void setResult(int result);
         int days() const { return mRecentDays->value(); }
@@ -165,8 +165,8 @@ class PictureViewerSlideDlg : public QDialog {
 
 class PictureViewer2Item : public QGraphicsItem {
     public:
-        explicit PictureViewer2Item(const PicData &data, const int numSelected, int cur, const QSize &picSize = QSize(), QGraphicsItem *parent = 0);
-        explicit PictureViewer2Item(QTextDocument *doc, QGraphicsItem *parent = 0);
+        explicit PictureViewer2Item(const PicData &data, const int numSelected, int cur, const QSize &picSize = QSize(), QGraphicsItem *parent = nullptr);
+        explicit PictureViewer2Item(QTextDocument *doc, QGraphicsItem *parent = nullptr);
         ~PictureViewer2Item();
         QRectF boundingRect() const;
         void appendText(const QString &text);
@@ -180,7 +180,7 @@ class PictureViewer2Item : public QGraphicsItem {
 class PictureViewerGraphicsScene : public QGraphicsScene {
     Q_OBJECT
     public:
-        explicit PictureViewerGraphicsScene(QObject *parent = 0) : QGraphicsScene(parent) {}
+        explicit PictureViewerGraphicsScene(QObject *parent = nullptr) : QGraphicsScene(parent) {}
         void setCursorOffset(int offset) { mCursorOffset = offset; }
 
     signals: