From 1e31fe896524513577911e382897b841e40a4814 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Sat, 7 Sep 2019 22:08:54 +0000 Subject: removed foreach macro git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@9067 90c681e8-e032-0410-971d-27865f9a5e38 --- src/app/builtincommandlineoption.cpp | 4 ++-- src/app/qmmpstarter.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/app') diff --git a/src/app/builtincommandlineoption.cpp b/src/app/builtincommandlineoption.cpp index 86751f5df..5cbd90f66 100644 --- a/src/app/builtincommandlineoption.cpp +++ b/src/app/builtincommandlineoption.cpp @@ -101,7 +101,7 @@ QString BuiltinCommandLineOption::executeCommand(const QString &option_string, c if(args.isEmpty()) return out; QStringList full_path_list, remote_pls_list; - foreach(QString s, args) + for(const QString &s : qAsConst(args)) { #ifdef Q_OS_WIN s.replace("\\","/"); @@ -232,7 +232,7 @@ QHash BuiltinCommandLineOption::splitArgs(const QStringLi { QHash commands; QString lastCmd; - foreach(QString arg, args) + for(const QString &arg : qAsConst(args)) { QString cmd = arg.trimmed(); if(cmd.startsWith("-") || cmd.startsWith("--")) diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp index 76967b34f..e3a8c8139 100644 --- a/src/app/qmmpstarter.cpp +++ b/src/app/qmmpstarter.cpp @@ -97,7 +97,7 @@ QMMPStarter::QMMPStarter() : QObject() if(!commands.isEmpty()) { - foreach(QString key, commands.keys()) + for(const QString &key : commands.keys()) { CommandLineHandler::OptionFlags flags; if(!m_option_manager->identify(key) && @@ -368,7 +368,7 @@ QString QMMPStarter::processCommandArgs(const QStringList &slist, const QString& if(slist.isEmpty()) return QString(); QStringList paths; - foreach(QString arg, slist) //detect file/directory paths + for(const QString &arg : qAsConst(slist)) //detect file/directory paths { if(arg.startsWith("-")) break; @@ -383,7 +383,7 @@ QString QMMPStarter::processCommandArgs(const QStringList &slist, const QString& return QString(); QString out; - foreach(QString key, commands.keys()) + for(const QString &key : commands.keys()) { if(key == "--no-start" || key == "--ui") continue; @@ -408,7 +408,7 @@ void QMMPStarter::printUsage() cout << qPrintable(tr("Usage: qmmp [options] [files]")) << endl; cout << qPrintable(tr("Options:")) << endl; cout << "--------" << endl; - foreach (QString line, m_option_manager->helpString()) + for(const QString &line : m_option_manager->helpString()) cout << qPrintable(CommandLineManager::formatHelpString(line) ) << endl; CommandLineManager::printUsage(); QStringList extraHelp; @@ -421,7 +421,7 @@ void QMMPStarter::printUsage() extraHelp << tr("Home page: %1").arg("http://qmmp.ylsoftware.com"); extraHelp << tr("Development page: %1").arg("https://sourceforge.net/p/qmmp-dev"); extraHelp << tr("Bug tracker: %1").arg("https://sourceforge.net/p/qmmp-dev/tickets"); - foreach (QString line, extraHelp) + for(const QString &line : qAsConst(extraHelp)) cout << qPrintable(CommandLineManager::formatHelpString(line)) << endl; #ifdef Q_OS_WIN string text = tmp_stream.str(); @@ -456,7 +456,7 @@ void QMMPStarter::printUserInterfaces() tmp_stream.copyfmt(cout); streambuf* old_stream = cout.rdbuf(tmp_stream.rdbuf()); #endif - foreach (QString name, UiLoader::names()) + for(const QString &name : UiLoader::names()) cout << qPrintable(name) << endl; #ifdef Q_OS_WIN string text = tmp_stream.str(); -- cgit v1.2.3-13-gbd6f