napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #255 from stikonas/master

Browse Source 
Port away from most cases of Q_FOREACH to C++11 ranged for loop.
This commit is contained in:
Teo Mrnjavac 2016-09-02 15:14:25 +02:00 committed by GitHub
commit cbb2162ee9
35 changed files with 105 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calamares/progresstree/ProgressTreeModel.cpp
View File

@ -132,7 +132,8 @@ ProgressTreeModel::setupModelData()
m_rootItem = new ProgressTreeRoot();
const Calamares::ViewManager* vm = Calamares::ViewManager::instance();
foreach ( const Calamares::ViewStep* step, vm->viewSteps() )
const auto steps = vm->viewSteps();
for ( const Calamares::ViewStep* step : steps )
{
m_rootItem->appendChild( new ViewStepItem( step, m_rootItem ) );
}

3
src/libcalamares/GlobalStorage.cpp
View File

@ -118,7 +118,8 @@ bp::list
GlobalStoragePythonWrapper::keys() const
{
bp::list pyList;
foreach( const QString& key, m_gs->keys() )
const auto keys = m_gs->keys();
for ( const QString& key : keys )
pyList.append( key.toStdString() );
return pyList;
}

2
src/libcalamares/PythonHelper.cpp
View File

@ -97,7 +97,7 @@ boost::python::list
variantListToPyList( const QVariantList& variantList )
{
bp::list pyList;
foreach ( const QVariant& variant, variantList )
for ( const QVariant& variant : variantList )
pyList.append( variantToPyObject( variant ) );
return pyList;
}

4
src/libcalamares/kdsingleapplicationguard/kdsingleapplicationguard.cpp
View File

@ -390,7 +390,7 @@ void ProcessInfo::setArguments( const QStringList & arguments )
return;
size_t totalsize = MarkerSize;
Q_FOREACH( const QString& arg, arguments )
for ( const QString& arg : arguments )
{
const QByteArray utf8 = arg.toUtf8();
totalsize += utf8.size() + MarkerSize;
@ -406,7 +406,7 @@ void ProcessInfo::setArguments( const QStringList & arguments )
char* const commandline = this->commandline + reinterpret_cast<qptrdiff>(reg->commandLines);
int argpos = 0;
Q_FOREACH( const QString & arg, arguments )
for ( const QString & arg : arguments )
{
const QByteArray utf8 = arg.toUtf8();
const int required = MarkerSize + utf8.size() + MarkerSize ;

2
src/libcalamares/utils/CalamaresUtils.cpp
View File

@ -273,7 +273,7 @@ removeDiacritics( const QString& string )
};
QString output;
foreach ( QChar c, string )
for ( const QChar &c : string )
{
int i = diacriticLetters.indexOf( c );
if ( i < 0 )

2
src/libcalamares/utils/Retranslator.cpp
View File

@ -29,7 +29,7 @@ Retranslator::attachRetranslator( QObject* parent,
std::function< void ( void ) > retranslateFunc )
{
Retranslator* r = nullptr;
foreach ( QObject* child, parent->children() )
for ( QObject* child : parent->children() )
{
r = qobject_cast< Retranslator* >( child );
if ( r )

8
src/libcalamaresui/Branding.cpp
View File

@ -44,7 +44,7 @@ Branding::instance()
}
QStringList Branding::s_stringEntryStrings =
const QStringList Branding::s_stringEntryStrings =
{
"productName",
"version",
@ -60,14 +60,14 @@ QStringList Branding::s_stringEntryStrings =
};
QStringList Branding::s_imageEntryStrings =
const QStringList Branding::s_imageEntryStrings =
{
"productLogo",
"productIcon",
"productWelcome"
};
QStringList Branding::s_styleEntryStrings =
const QStringList Branding::s_styleEntryStrings =
{
"sidebarBackground",
"sidebarText",
@ -268,7 +268,7 @@ void
Branding::setGlobals( GlobalStorage* globalStorage ) const
{
QVariantMap brandingMap;
foreach ( const QString& key, s_stringEntryStrings )
for ( const QString& key : s_stringEntryStrings )
brandingMap.insert( key, m_strings.value( key ) );
globalStorage->insert( "branding", brandingMap );
}

6
src/libcalamaresui/Branding.h
View File

@ -91,9 +91,9 @@ public:
private:
static Branding* s_instance;
static QStringList s_stringEntryStrings;
static QStringList s_imageEntryStrings;
static QStringList s_styleEntryStrings;
static const QStringList s_stringEntryStrings;
static const QStringList s_imageEntryStrings;
static const QStringList s_styleEntryStrings;
void bail( const QString& message );

6
src/libcalamaresui/Settings.cpp
View File

@ -98,7 +98,8 @@ Settings::Settings( const QString& settingsFilePath,
= CalamaresUtils::yamlToVariant( config[ "instances" ] ).toList();
if ( instancesV.type() == QVariant::List )
{
foreach ( const QVariant& instancesVListItem, instancesV.toList() )
const auto instances = instancesV.toList();
for ( const QVariant& instancesVListItem : instances )
{
if ( instancesVListItem.type() != QVariant::Map )
continue;
@ -123,7 +124,8 @@ Settings::Settings( const QString& settingsFilePath,
QVariant sequenceV
= CalamaresUtils::yamlToVariant( config[ "sequence" ] );
Q_ASSERT( sequenceV.type() == QVariant::List );
foreach ( const QVariant& sequenceVListItem, sequenceV.toList() )
const auto sequence = sequenceV.toList();
for ( const QVariant& sequenceVListItem : sequence )
{
if ( sequenceVListItem.type() != QVariant::Map )
continue;

10
src/libcalamaresui/modulesystem/ModuleManager.cpp
View File

@ -77,13 +77,13 @@ ModuleManager::doInit()
// the module name, and must contain a settings file named module.desc.
// If at any time the module loading procedure finds something unexpected, it
// silently skips to the next module or search path. --Teo 6/2014
foreach ( const QString& path, m_paths )
for ( const QString& path : m_paths )
{
QDir currentDir( path );
if ( currentDir.exists() && currentDir.isReadable() )
{
QStringList subdirs = currentDir.entryList( QDir::AllDirs | QDir::NoDotAndDotDot );
foreach ( const QString& subdir, subdirs )
const QStringList subdirs = currentDir.entryList( QDir::AllDirs | QDir::NoDotAndDotDot );
for ( const QString& subdir : subdirs )
{
currentDir.setPath( path );
bool success = currentDir.cd( subdir );
@ -179,8 +179,8 @@ ModuleManager::loadModules()
QList< QMap< QString, QString > > customInstances =
Settings::instance()->customModuleInstances();
for ( const QPair< ModuleAction, QStringList >& modulePhase :
Settings::instance()->modulesSequence() )
const auto modulesSequence = Settings::instance()->modulesSequence();
for ( const auto &modulePhase : modulesSequence )
{
ModuleAction currentAction = modulePhase.first;

2
src/libcalamaresui/modulesystem/ModuleManager.h
View File

@ -66,7 +66,7 @@ private:
QMap< QString, QVariantMap > m_availableDescriptorsByModuleName;
QMap< QString, QString > m_moduleDirectoriesByModuleName;
QMap< QString, Module* > m_loadedModulesByInstanceKey;
QStringList m_paths;
const QStringList m_paths;
static ModuleManager* s_instance;
};

4
src/libcalamaresui/modulesystem/ViewModule.cpp
View File

@ -95,10 +95,10 @@ ViewModule::initFrom( const QVariantMap& moduleDescriptor )
// If a load path is not specified, we look for a plugin to load in the directory.
if ( load.isEmpty() || !QLibrary::isLibrary( load ) )
{
QStringList ls = directory.entryList( QStringList{ "*.so" } );
const QStringList ls = directory.entryList( QStringList{ "*.so" } );
if ( !ls.isEmpty() )
{
foreach ( QString entry, ls )
for ( QString entry : ls )
{
entry = directory.absoluteFilePath( entry );
if ( QLibrary::isLibrary( entry ) )

2
src/libcalamaresui/utils/DebugWindow.cpp
View File

@ -59,7 +59,7 @@ DebugWindow::DebugWindow()
this, [ this ]( const QList< Calamares::job_ptr >& jobs )
{
QStringList text;
foreach( auto job, jobs )
for ( const auto &job : jobs )
{
text.append( job->prettyName() );
}

8
src/libcalamaresui/utils/PluginFactory.cpp
View File

@ -66,10 +66,10 @@ void PluginFactory::doRegisterPlugin(const QString &keyword, const QMetaObject *
}
d->createInstanceHash.insert(keyword, PluginFactoryPrivate::Plugin(metaObject, instanceFunction));
} else {
QList<PluginFactoryPrivate::Plugin> clashes(d->createInstanceHash.values(keyword));
const QList<PluginFactoryPrivate::Plugin> clashes(d->createInstanceHash.values(keyword));
const QMetaObject *superClass = metaObject->superClass();
if (superClass) {
foreach (const PluginFactoryPrivate::Plugin &plugin, clashes) {
for (const PluginFactoryPrivate::Plugin &plugin : clashes) {
for (const QMetaObject *otherSuper = plugin.first->superClass(); otherSuper;
otherSuper = otherSuper->superClass()) {
if (superClass == otherSuper) {
@ -78,7 +78,7 @@ void PluginFactory::doRegisterPlugin(const QString &keyword, const QMetaObject *
}
}
}
foreach (const PluginFactoryPrivate::Plugin &plugin, clashes) {
for (const PluginFactoryPrivate::Plugin &plugin : clashes) {
superClass = plugin.first->superClass();
if (superClass) {
for (const QMetaObject *otherSuper = metaObject->superClass(); otherSuper;
@ -102,7 +102,7 @@ QObject *PluginFactory::create(const char *iface, QWidget *parentWidget, QObject
const QList<PluginFactoryPrivate::Plugin> candidates(d->createInstanceHash.values(keyword));
// for !keyword.isEmpty() candidates.count() is 0 or 1
foreach (const PluginFactoryPrivate::Plugin &plugin, candidates) {
for (const PluginFactoryPrivate::Plugin &plugin : candidates) {
for (const QMetaObject *current = plugin.first; current; current = current->superClass()) {
if (0 == qstrcmp(iface, current->className())) {
if (obj) {

6
src/libcalamaresui/utils/qjsonitem.cpp
View File

@ -104,7 +104,8 @@ QJsonTreeItem* QJsonTreeItem::load(const QJsonValue& value, QJsonTreeItem* paren
{
//Get all QJsonValue childs
foreach (QString key , value.toObject().keys()){
const auto keys = value.toObject().keys();
for (const QString &key : keys){
QJsonValue v = value.toObject().value(key);
QJsonTreeItem * child = load(v,rootItem);
child->setKey(key);
@ -119,7 +120,8 @@ QJsonTreeItem* QJsonTreeItem::load(const QJsonValue& value, QJsonTreeItem* paren
{
//Get all QJsonValue childs
int index = 0;
foreach (QJsonValue v , value.toArray()){
const auto valueArray = value.toArray();
for (const QJsonValue &v : valueArray) {
QJsonTreeItem * child = load(v,rootItem);
child->setKey(QString::number(index));

4
src/modules/keyboard/KeyboardPage.cpp
View File

@ -92,10 +92,10 @@ KeyboardPage::init()
if ( process.waitForFinished() )
{
QStringList list = QString( process.readAll() )
const QStringList list = QString( process.readAll() )
.split( "\n", QString::SkipEmptyParts );
foreach( QString line, list )
for ( QString line : list )
{
line = line.trimmed();
if ( !line.startsWith( "xkb_symbols" ) )

6
src/modules/keyboard/keyboardwidget/keyboardpreview.cpp
View File

@ -122,9 +122,9 @@ bool KeyBoardPreview::loadCodes() {
// Clear codes
codes.clear();
QStringList list = QString(process.readAll()).split("\n", QString::SkipEmptyParts);
const QStringList list = QString(process.readAll()).split("\n", QString::SkipEmptyParts);
foreach(QString line, list) {
for (const QString &line : list) {
if (!line.startsWith("keycode") || !line.contains('='))
continue;
@ -253,7 +253,7 @@ void KeyBoardPreview::paintEvent(QPaintEvent* event) {
int rw=usable_width-x;
int ii=0;
foreach (int k, kb->keys.at(i)) {
for (int k : kb->keys.at(i)) {
QRectF rect = QRectF(x, y, key_w, key_w);
if (ii == kb->keys.at(i).size()-1 && last_end)

4
src/modules/license/LicensePage.cpp
View File

@ -97,7 +97,7 @@ LicensePage::setEntries( const QList< LicenseEntry >& entriesList )
CalamaresUtils::clearLayout( ui->licenseEntriesLayout );
bool required = false;
foreach ( const LicenseEntry& entry, entriesList )
for ( const LicenseEntry& entry : entriesList )
{
if ( entry.required )
{
@ -134,7 +134,7 @@ LicensePage::setEntries( const QList< LicenseEntry >& entriesList )
ui->retranslateUi( this );
)
foreach ( const LicenseEntry& entry, entriesList )
for ( const LicenseEntry& entry : entriesList )
{
QWidget* widget = new QWidget( this );
QPalette pal( palette() );

3
src/modules/license/LicenseViewStep.cpp
View File

@ -112,7 +112,8 @@ LicenseViewStep::setConfigurationMap( const QVariantMap& configurationMap )
if ( configurationMap.contains( "entries" ) &&
configurationMap.value( "entries" ).type() == QVariant::List )
{
foreach ( const QVariant& entryV, configurationMap.value( "entries" ).toList() )
const auto entries = configurationMap.value( "entries" ).toList();
for ( const QVariant& entryV : entries )
{
if ( entryV.type() != QVariant::Map )
continue;

10
src/modules/locale/LocaleConfiguration.cpp
View File

@ -43,7 +43,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
QString language = languageLocale.split( '_' ).first();
QStringList linesForLanguage;
foreach ( QString line, availableLocales )
for ( const QString &line : availableLocales )
{
if ( line.startsWith( language ) )
linesForLanguage.append( line );
@ -95,7 +95,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
// language locale and pick the first result, if any.
if ( lang.isEmpty() )
{
foreach ( QString line, availableLocales )
for ( const QString &line : availableLocales )
{
if ( line.startsWith( languageLocale ) )
{
@ -161,7 +161,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
QString combined = QString( "%1_%2" ).arg( language )
.arg( countryCode );
// We look up if it's a supported locale.
foreach ( QString line, availableLocales )
for ( const QString &line : availableLocales )
{
if ( line.startsWith( combined ) )
{
@ -174,7 +174,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
if ( lc_formats.isEmpty() )
{
QStringList available;
foreach ( QString line, availableLocales )
for ( const QString &line : availableLocales )
{
if ( line.contains( QString( "_%1" ).arg( countryCode ) ) )
{
@ -239,7 +239,7 @@ LocaleConfiguration::fromLanguageAndLocation( const QString& languageLocale,
QString( "%1_%2" ).arg( countryToDefaultLanguage.value( countryCode ) )
.arg( countryCode );
foreach ( QString line, availableLocales )
for ( const QString &line : availableLocales )
{
if ( line.startsWith( combinedLocale ) )
{

12
src/modules/locale/LocalePage.cpp
View File

@ -108,8 +108,8 @@ LocalePage::LocalePage( QWidget* parent )
m_zoneCombo->clear();
QList< LocaleGlobal::Location > zones = regions.value( m_regionCombo->currentData().toString() );
foreach ( const LocaleGlobal::Location& zone, zones )
const QList< LocaleGlobal::Location > zones = regions.value( m_regionCombo->currentData().toString() );
for ( const LocaleGlobal::Location& zone : zones )
{
m_zoneCombo->addItem( LocaleGlobal::Location::pretty( zone.zone ), zone.zone );
}
@ -270,7 +270,7 @@ LocalePage::init( const QString& initialRegion,
auto containsLocation = []( const QList< LocaleGlobal::Location >& locations,
const QString& zone ) -> bool
{
foreach ( const LocaleGlobal::Location& location, locations )
for ( const LocaleGlobal::Location& location : locations )
{
if ( location.zone == zone )
return true;
@ -303,7 +303,8 @@ LocalePage::init( const QString& initialRegion,
ba = supported.readAll();
supported.close();
foreach ( QByteArray line, ba.split( '\n' ) )
const auto lines = ba.split( '\n' );
for ( const QByteArray &line : lines )
{
m_localeGenLines.append( QString::fromLatin1( line.simplified() ) );
}
@ -326,7 +327,8 @@ LocalePage::init( const QString& initialRegion,
localeA.waitForFinished();
ba = localeA.readAllStandardOutput();
}
foreach ( QByteArray line, ba.split( '\n' ) )
const auto lines = ba.split( '\n' );
for ( const QByteArray &line : lines )
{
if ( line.startsWith( "## " ) ||
line.startsWith( "# " ) ||

9
src/modules/partition/core/PartUtils.cpp
View File

@ -155,10 +155,10 @@ lookForFstabEntries( const QString& partitionPath )
QFile fstabFile( mountsDir.path() + "/etc/fstab" );
if ( fstabFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
{
QStringList fstabLines = QString::fromLocal8Bit( fstabFile.readAll() )
const QStringList fstabLines = QString::fromLocal8Bit( fstabFile.readAll() )
.split( '\n' );
foreach ( const QString& rawLine, fstabLines )
for ( const QString& rawLine : fstabLines )
{
QString line = rawLine.simplified();
if ( line.startsWith( '#' ) )
@ -194,7 +194,7 @@ findPartitionPathForMountPoint( const FstabEntryList& fstab,
if ( fstab.isEmpty() )
return QString();
foreach ( const FstabEntry& entry, fstab )
for ( const FstabEntry& entry : fstab )
{
if ( entry.mountPoint == mountPoint )
{
@ -283,7 +283,8 @@ runOsprober( PartitionCoreModule* core )
QString osProberReport( "Osprober lines, clean:\n" );
QStringList osproberCleanLines;
OsproberEntryList osproberEntries;
foreach ( const QString& line, osproberOutput.split( '\n' ) )
const auto lines = osproberOutput.split( '\n' );
for ( const QString& line : lines )
{
if ( !line.simplified().isEmpty() )
{

2
src/modules/partition/core/PartitionCoreModule.cpp
View File

@ -480,7 +480,7 @@ PartitionCoreModule::dumpQueue() const
}
OsproberEntryList
const OsproberEntryList
PartitionCoreModule::osproberEntries() const
{
return m_osproberLines;

2
src/modules/partition/core/PartitionCoreModule.h
View File

@ -127,7 +127,7 @@ public:
void dumpQueue() const;
OsproberEntryList osproberEntries() const;
const OsproberEntryList osproberEntries() const;
Q_SIGNALS:
void hasRootMountPointChanged( bool value );

2
src/modules/partition/gui/AlongsidePage.cpp
View File

@ -129,7 +129,7 @@ AlongsidePage::init( PartitionCoreModule* core )
string( Calamares::Branding::ProductName ) ) );
} );
foreach ( const OsproberEntry& e, m_core->osproberEntries() )
for ( const OsproberEntry& e : m_core->osproberEntries() )
{
if ( e.canBeResized )
m_partitionsComboBox->addItem( e.prettyName + " (" + e.path + ")", e.path );

4
src/modules/partition/gui/ChoicePage.cpp
View File

@ -733,7 +733,7 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
// Find out is the selected partition has a rootfs. If yes, then make the
// m_reuseHomeCheckBox visible and set its text to something meaningful.
homePartitionPath->clear();
foreach ( const OsproberEntry& osproberEntry, m_core->osproberEntries() )
for ( const OsproberEntry& osproberEntry : m_core->osproberEntries() )
if ( osproberEntry.path == partPath )
*homePartitionPath = osproberEntry.homePath;
if ( homePartitionPath->isEmpty() )
@ -1329,7 +1329,7 @@ OsproberEntryList
ChoicePage::getOsproberEntriesForDevice( Device* device ) const
{
OsproberEntryList eList;
foreach ( const OsproberEntry& entry, m_core->osproberEntries() )
for ( const OsproberEntry& entry : m_core->osproberEntries() )
{
if ( entry.path.startsWith( device->deviceNode() ) )
eList.append( entry );

20
src/modules/partition/gui/PartitionLabelsView.cpp
View File

@ -240,11 +240,11 @@ PartitionLabelsView::drawLabels( QPainter* painter,
if ( !modl )
return;
QModelIndexList indexesToDraw = getIndexesToDraw( parent );
const QModelIndexList indexesToDraw = getIndexesToDraw( parent );
int label_x = rect.x();
int label_y = rect.y();
foreach ( const QModelIndex& index, indexesToDraw )
for ( const QModelIndex& index : indexesToDraw )
{
QStringList texts = buildTexts( index );
@ -306,12 +306,12 @@ PartitionLabelsView::sizeForAllLabels( int maxLineWidth ) const
if ( !modl )
return QSize();
QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
const QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
int lineLength = 0;
int numLines = 1;
int singleLabelHeight = 0;
foreach ( const QModelIndex& index, indexesToDraw )
for ( const QModelIndex& index : indexesToDraw )
{
QStringList texts = buildTexts( index );
@ -349,7 +349,7 @@ PartitionLabelsView::sizeForLabel( const QStringList& text ) const
{
int vertOffset = 0;
int width = 0;
foreach ( const QString& textLine, text )
for ( const QString& textLine : text )
{
QSize textSize = fontMetrics().size( Qt::TextSingleLine, textLine );
@ -371,7 +371,7 @@ PartitionLabelsView::drawLabel( QPainter* painter,
painter->setPen( Qt::black );
int vertOffset = 0;
int width = 0;
foreach ( const QString& textLine, text )
for ( const QString& textLine : text )
{
QSize textSize = painter->fontMetrics().size( Qt::TextSingleLine, textLine );
painter->drawText( pos.x()+LABEL_PARTITION_SQUARE_MARGIN,
@ -402,12 +402,12 @@ PartitionLabelsView::indexAt( const QPoint& point ) const
if ( !modl )
return QModelIndex();
QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
const QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
QRect rect = this->rect();
int label_x = rect.x();
int label_y = rect.y();
foreach ( const QModelIndex& index, indexesToDraw )
for ( const QModelIndex& index : indexesToDraw )
{
QStringList texts = buildTexts( index );
@ -437,12 +437,12 @@ PartitionLabelsView::visualRect( const QModelIndex& idx ) const
if ( !modl )
return QRect();
QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
const QModelIndexList indexesToDraw = getIndexesToDraw( QModelIndex() );
QRect rect = this->rect();
int label_x = rect.x();
int label_y = rect.y();
foreach ( const QModelIndex& index, indexesToDraw )
for ( const QModelIndex& index : indexesToDraw )
{
QStringList texts = buildTexts( index );

2
src/modules/partition/gui/PartitionSplitterWidget.cpp
View File

@ -105,7 +105,7 @@ PartitionSplitterWidget::setupItems( const QVector<PartitionSplitterItem>& items
m_items.clear();
m_items = items;
repaint();
foreach ( const PartitionSplitterItem& item, items )
for ( const PartitionSplitterItem& item : items )
cDebug() << "PSI added item" << item.itemPath << "size" << item.size;
}

4
src/modules/partition/gui/ReplaceWidget.cpp
View File

@ -149,7 +149,7 @@ ReplaceWidget::onPartitionSelected()
PartitionModel* model = qobject_cast< PartitionModel* >( m_ui->partitionTreeView->model() );
if ( model && ok )
{
QStringList osproberLines = Calamares::JobQueue::instance()
const QStringList osproberLines = Calamares::JobQueue::instance()
->globalStorage()
->value( "osproberLines" ).toStringList();
@ -197,7 +197,7 @@ ReplaceWidget::onPartitionSelected()
QString prettyName = tr( "Data partition (%1)" )
.arg( partition->fileSystem().name() );
foreach ( const QString& line, osproberLines )
for ( const QString& line : osproberLines )
{
QStringList lineColumns = line.split( ':' );

26
src/modules/partition/jobs/ClearMountsJob.cpp
View File

@ -72,8 +72,8 @@ ClearMountsJob::exec()
process.start();
process.waitForFinished();
QString partitions = process.readAllStandardOutput();
QStringList partitionsList = partitions.simplified().split( ' ' );
const QString partitions = process.readAllStandardOutput();
const QStringList partitionsList = partitions.simplified().split( ' ' );
// Build a list of partitions of type 82 (Linux swap / Solaris).
// We then need to clear them just in case they contain something resumable from a
@ -100,7 +100,8 @@ ClearMountsJob::exec()
*it = (*it).simplified().split( ' ' ).first();
}
foreach ( QString mapperPath, getCryptoDevices() )
const QStringList cryptoDevices = getCryptoDevices();
for ( const QString &mapperPath : cryptoDevices )
{
tryUmount( mapperPath );
QString news = tryCryptoClose( mapperPath );
@ -113,8 +114,8 @@ ClearMountsJob::exec()
process.waitForFinished();
if ( process.exitCode() == 0 ) //means LVM2 tools are installed
{
QStringList lvscanLines = QString::fromLocal8Bit( process.readAllStandardOutput() ).split( '\n' );
foreach ( const QString& lvscanLine, lvscanLines )
const QStringList lvscanLines = QString::fromLocal8Bit( process.readAllStandardOutput() ).split( '\n' );
for ( const QString& lvscanLine : lvscanLines )
{
QString lvPath = lvscanLine.simplified().split( ' ' ).value( 1 ); //second column
lvPath = lvPath.replace( '\'', "" );
@ -137,8 +138,8 @@ ClearMountsJob::exec()
{
QSet< QString > vgSet;
QStringList pvdisplayLines = pvdisplayOutput.split( '\n' );
foreach ( const QString& pvdisplayLine, pvdisplayLines )
const QStringList pvdisplayLines = pvdisplayOutput.split( '\n' );
for ( const QString& pvdisplayLine : pvdisplayLines )
{
QString pvPath = pvdisplayLine.simplified().split( ' ' ).value( 0 );
QString vgName = pvdisplayLine.simplified().split( ' ' ).value( 1 );
@ -160,7 +161,8 @@ ClearMountsJob::exec()
else
cDebug() << "WARNING: this system does not seem to have LVM2 tools.";
foreach ( QString mapperPath, getCryptoDevices() )
const QStringList cryptoDevices2 = getCryptoDevices();
for ( const QString &mapperPath : cryptoDevices2 )
{
tryUmount( mapperPath );
QString news = tryCryptoClose( mapperPath );
@ -168,7 +170,7 @@ ClearMountsJob::exec()
goodNews.append( news );
}
foreach ( QString p, partitionsList )
for ( const QString &p : partitionsList )
{
QString partPath = QString( "/dev/%1" ).arg( p );
@ -247,13 +249,13 @@ ClearMountsJob::tryCryptoClose( const QString& mapperPath )
QStringList
ClearMountsJob::getCryptoDevices()
ClearMountsJob::getCryptoDevices() const
{
QDir mapperDir( "/dev/mapper" );
QFileInfoList fiList = mapperDir.entryInfoList( QDir::Files );
const QFileInfoList fiList = mapperDir.entryInfoList( QDir::Files );
QStringList list;
QProcess process;
foreach ( QFileInfo fi, fiList )
for ( const QFileInfo &fi : fiList )
{
if ( fi.baseName() == "control" )
continue;

2
src/modules/partition/jobs/ClearMountsJob.h
View File

@ -39,7 +39,7 @@ private:
QString tryUmount( const QString& partPath );
QString tryClearSwap( const QString& partPath );
QString tryCryptoClose( const QString& mapperPath );
QStringList getCryptoDevices();
QStringList getCryptoDevices() const;
Device* m_device;
};

3
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -126,7 +126,8 @@ FillGlobalStorageJob::prettyDescription() const
{
QStringList lines;
foreach ( QVariant partitionItem, createPartitionList().toList() )
const auto partitionList = createPartitionList().toList();
for ( const QVariant &partitionItem : partitionList )
{
if ( partitionItem.type() == QVariant::Map )
{

6
src/modules/summary/SummaryPage.cpp
View File

@ -63,10 +63,10 @@ SummaryPage::onActivate()
QString text;
bool first = true;
Calamares::ViewStepList steps =
const Calamares::ViewStepList steps =
stepsForSummary( Calamares::ViewManager::instance()->viewSteps() );
foreach ( Calamares::ViewStep* step, steps )
for ( Calamares::ViewStep* step : steps )
{
QString text = step->prettyStatus();
QWidget* widget = step->createSummaryWidget();
@ -101,7 +101,7 @@ Calamares::ViewStepList
SummaryPage::stepsForSummary( const Calamares::ViewStepList& allSteps ) const
{
Calamares::ViewStepList steps;
foreach ( Calamares::ViewStep* step, allSteps )
for ( Calamares::ViewStep* step : allSteps )
{
// We start from the beginning of the complete steps list. If we encounter any
// ExecutionViewStep, it means there was an execution phase in the past, and any

3
src/modules/welcome/WelcomePage.cpp
View File

@ -109,7 +109,8 @@ WelcomePage::initLanguages()
{
bool isTranslationAvailable = false;
foreach ( const QString& locale, QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';') )
const auto locales = QString( CALAMARES_TRANSLATION_LANGUAGES ).split( ';');
for ( const QString& locale : locales )
{
QLocale thisLocale = QLocale( locale );
QString lang = QLocale::languageToString( thisLocale.language() );

5
src/modules/welcome/checker/RequirementsChecker.cpp
View File

@ -264,9 +264,8 @@ RequirementsChecker::checkBatteryExists()
return false;
QDir baseDir( basePath.absoluteFilePath() );
foreach ( auto item, baseDir.entryList( QDir::AllDirs |
QDir::Readable |
QDir::NoDotAndDotDot ) )
const auto entries = baseDir.entryList( QDir::AllDirs | QDir::Readable | QDir::NoDotAndDotDot );
for ( const auto &item : entries )
{
QFileInfo typePath( baseDir.absoluteFilePath( QString( "%1/type" )
.arg( item ) ) );