diff options
| -rw-r--r-- | pictureviewer2.cpp | 8 | ||||
| -rw-r--r-- | smglobals.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp index 1e49bdf..e482e45 100644 --- a/pictureviewer2.cpp +++ b/pictureviewer2.cpp @@ -41,7 +41,6 @@ #include <QRandomGenerator> #include <random> -#include <chrono> #include "pictureviewer2.h" #include "picfilesmodel.h" @@ -139,7 +138,7 @@ void PictureViewer2::addFiles(const QString &dir, bool clear){ PicDataList pd; QDir directory = QDir(dir); QFileInfoList files = directory.entryInfoList(QDir::Files, QDir::Name); - for(const auto &fi : files){ + for(const auto &fi : std::as_const(files)){ pd << picData(fi.absoluteFilePath()); } addFiles(pd, clear); @@ -287,7 +286,7 @@ void PictureViewer2::deleteCurrent(){ void PictureViewer2::showNewPicsDialog(){ mNewPicsDlg->clearFiles(); QStringList fileList; - for(const auto &v : mMarkedFiles){ + for(const auto &v : std::as_const(mMarkedFiles)){ fileList << v.at(PicFilesModel::FullPath).toString(); } mNewPicsDlg->addFiles(fileList); @@ -355,7 +354,8 @@ void PictureViewer2::wheelEvent(QWheelEvent *event){ void PictureViewer2::contextMenuEvent(QContextMenuEvent *e){ QMenu ctxMenu; - for(QAction *a : actions()){ + auto aList = actions(); + for(auto a : std::as_const(aList)){ ctxMenu.addAction(a); } ctxMenu.exec(e->globalPos()); diff --git a/smglobals.cpp b/smglobals.cpp index d0165a9..0612b13 100644 --- a/smglobals.cpp +++ b/smglobals.cpp @@ -20,10 +20,10 @@ SmGlobals *SmGlobals::mInstance = nullptr; SmGlobals::~SmGlobals(){ - for(const auto &model : qAsConst(mModels)){ + for(const auto &model : std::as_const(mModels)){ model->deleteLater(); } - for(QWidget *w : mWidgets){ + for(auto w : std::as_const(mWidgets)){ w->close(); } } |