From 6cf6bc2f667ea229d3864a8767982bdecab7b146 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Thu, 13 Aug 2020 10:46:51 +0000 Subject: coding style fixes git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9472 90c681e8-e032-0410-971d-27865f9a5e38 --- src/qmmpui/filedialog.cpp | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) (limited to 'src/qmmpui/filedialog.cpp') diff --git a/src/qmmpui/filedialog.cpp b/src/qmmpui/filedialog.cpp index 5d2915b6e..ab67d6889 100644 --- a/src/qmmpui/filedialog.cpp +++ b/src/qmmpui/filedialog.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include "qmmpuiplugincache_p.h" #include "filedialog.h" @@ -85,12 +86,9 @@ bool FileDialog::isEnabled(const FileDialogFactory *factory) QString FileDialog::file(const FileDialogFactory *factory) { loadPlugins(); - for(const QmmpUiPluginCache *item : qAsConst(*m_cache)) - { - if(item->shortName() == factory->properties().shortName) - return item->file(); - } - return QString(); + auto it = std::find_if(m_cache->cbegin(), m_cache->cend(), + [factory] (QmmpUiPluginCache *item){ return item->shortName() == factory->properties().shortName; } ); + return it == m_cache->cend() ? QString() : (*it)->file(); } QString FileDialog::getExistingDirectory(QWidget *parent, @@ -167,14 +165,11 @@ FileDialog* FileDialog::instance() QSettings settings (Qmmp::configFile(), QSettings::IniFormat); QString name = settings.value("FileDialog", "qt_dialog").toString(); - for(QmmpUiPluginCache *item : qAsConst(*m_cache)) - { - if(item->shortName() == name) - { - selected = item->fileDialogFactory(); - break; - } - } + + auto it = std::find_if(m_cache->cbegin(), m_cache->cend(), + [name] (QmmpUiPluginCache *item){ return item->shortName() == name; } ); + if(it != m_cache->cend()) + selected = (*it)->fileDialogFactory(); if(!selected) selected = m_cache->at(0)->fileDialogFactory(); -- cgit v1.2.3-13-gbd6f