diff --git a/src/config/advancedpagewidget.cpp b/src/config/advancedpagewidget.cpp index 5231d9d..e8553c6 100644 --- a/src/config/advancedpagewidget.cpp +++ b/src/config/advancedpagewidget.cpp @@ -37,7 +37,7 @@ QString AdvancedPageWidget::backend() const { const KService::List services = CoreBackendManager::self()->list(); - for (auto const &p : services) + for (const auto &p : services) if (p->name() == comboBackend().currentText()) return p->library(); @@ -48,7 +48,7 @@ void AdvancedPageWidget::setBackend(const QString& name) { const KService::List services = CoreBackendManager::self()->list(); - for (auto const &p : services) + for (const auto &p : services) if (p->library() == name) comboBackend().setCurrentIndex(comboBackend().findText(p->name())); } @@ -56,7 +56,7 @@ void AdvancedPageWidget::setBackend(const QString& name) void AdvancedPageWidget::setupDialog() { const KService::List services = CoreBackendManager::self()->list(); - for (auto const &p : services) + for (const auto &p : services) comboBackend().addItem(p->name()); setBackend(Config::backend()); diff --git a/src/config/generalpagewidget.cpp b/src/config/generalpagewidget.cpp index 123d80f..76fca96 100644 --- a/src/config/generalpagewidget.cpp +++ b/src/config/generalpagewidget.cpp @@ -47,13 +47,13 @@ void GeneralPageWidget::setDefaultFileSystem(FileSystem::Type t) void GeneralPageWidget::setupDialog() { QStringList fsNames; - for (const FileSystem * fs : FileSystemFactory::map()) + for (const auto &fs : FileSystemFactory::map()) if (fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended && fs->type() != FileSystem::Luks) fsNames.append(fs->name()); qSort(fsNames.begin(), fsNames.end(), caseInsensitiveLessThan); - for (const QString & fsName : fsNames) + for (const auto &fsName : fsNames) comboDefaultFileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName); setDefaultFileSystem(GuiHelpers::defaultFileSystem()); diff --git a/src/gui/editmountoptionsdialog.cpp b/src/gui/editmountoptionsdialog.cpp index 000c990..d6da5ec 100644 --- a/src/gui/editmountoptionsdialog.cpp +++ b/src/gui/editmountoptionsdialog.cpp @@ -58,7 +58,7 @@ QStringList EditMountOptionsDialog::options() { QStringList rval; const QStringList lines = widget().editOptions().toPlainText().split(QStringLiteral("\n")); - for (auto const &line : lines) + for (const auto &line : lines) rval.append(line.simplified().toLower()); return rval; } diff --git a/src/gui/editmountoptionsdialogwidget.cpp b/src/gui/editmountoptionsdialogwidget.cpp index 8eb3b37..62bde80 100644 --- a/src/gui/editmountoptionsdialogwidget.cpp +++ b/src/gui/editmountoptionsdialogwidget.cpp @@ -25,6 +25,6 @@ EditMountOptionsDialogWidget::EditMountOptionsDialogWidget(QWidget* parent, cons { setupUi(this); - for (auto const &o : options) + for (const auto &o : options) editOptions().appendPlainText(o); } diff --git a/src/gui/editmountpointdialogwidget.cpp b/src/gui/editmountpointdialogwidget.cpp index be6aaf4..617c1e0 100644 --- a/src/gui/editmountpointdialogwidget.cpp +++ b/src/gui/editmountpointdialogwidget.cpp @@ -135,7 +135,7 @@ void EditMountPointDialogWidget::setupOptions(const QStringList& options) { QStringList optTmpList; - for (auto const &o : options) { + for (const auto &o : options) { if (boxOptions().find(o) != boxOptions().end()) boxOptions()[o]->setChecked(true); else @@ -162,11 +162,11 @@ void EditMountPointDialogWidget::buttonMoreClicked(bool) delete dlg; } -QStringList EditMountPointDialogWidget::options() +QStringList EditMountPointDialogWidget::options() const { QStringList optList = m_Options.split(QStringLiteral(","), QString::SkipEmptyParts); - foreach(auto const &s, boxOptions().keys()) + foreach(const auto &s, boxOptions().keys()) if (boxOptions()[s]->isChecked()) optList.append(s); @@ -266,7 +266,7 @@ bool EditMountPointDialogWidget::writeMountpoints(const QString& filename) qWarning() << "could not open output file " << newFilename; rval = false; } else { - foreach(auto const &me, mountPoints()) + foreach(const auto &me, mountPoints()) writeEntry(out, me); out.close(); diff --git a/src/gui/editmountpointdialogwidget.h b/src/gui/editmountpointdialogwidget.h index 4ac5765..93edd2a 100644 --- a/src/gui/editmountpointdialogwidget.h +++ b/src/gui/editmountpointdialogwidget.h @@ -60,7 +60,7 @@ public: QLabel& labelType() { return *m_LabelTypeValue; } - QStringList options(); + QStringList options() const; QRadioButton& radioUUID() { return *m_RadioUUID; } diff --git a/src/gui/filesystemsupportdialog.cpp b/src/gui/filesystemsupportdialog.cpp index a014965..b6cfe3c 100644 --- a/src/gui/filesystemsupportdialog.cpp +++ b/src/gui/filesystemsupportdialog.cpp @@ -71,7 +71,7 @@ void FileSystemSupportDialog::setupDialog() dialogWidget().tree().clear(); - for (auto const &fs : FileSystemFactory::map()) { + for (const auto &fs : FileSystemFactory::map()) { if (fs->type() == FileSystem::Unknown || fs->type() == FileSystem::Extended || fs->type() == FileSystem::Luks) continue; diff --git a/src/gui/listoperations.cpp b/src/gui/listoperations.cpp index d649551..77362ed 100644 --- a/src/gui/listoperations.cpp +++ b/src/gui/listoperations.cpp @@ -40,7 +40,7 @@ void ListOperations::updateOperations(const OperationStack::Operations& ops) { listOperations().clear(); - for (auto const &op : ops) { + for (const auto &op : ops) { QListWidgetItem* item = new QListWidgetItem(QIcon::fromTheme(op->iconName()).pixmap(IconSize(KIconLoader::Small)), op->description()); item->setToolTip(op->description()); listOperations().addItem(item); diff --git a/src/gui/newdialog.cpp b/src/gui/newdialog.cpp index f591613..ad566a8 100644 --- a/src/gui/newdialog.cpp +++ b/src/gui/newdialog.cpp @@ -73,7 +73,7 @@ NewDialog::~NewDialog() void NewDialog::setupDialog() { QStringList fsNames; - for (auto const &fs : FileSystemFactory::map()) { + for (const auto &fs : FileSystemFactory::map()) { if (fs->supportCreate() != FileSystem::cmdSupportNone && fs->type() != FileSystem::Extended && fs->type() != FileSystem::Luks) @@ -82,7 +82,7 @@ void NewDialog::setupDialog() qSort(fsNames.begin(), fsNames.end(), caseInsensitiveLessThan); - foreach (auto const &fsName, fsNames) + foreach (const auto &fsName, fsNames) dialogWidget().comboFileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName); QString selected = FileSystem::nameForType(GuiHelpers::defaultFileSystem()); diff --git a/src/gui/partitionmanagerwidget.cpp b/src/gui/partitionmanagerwidget.cpp index 7f1c6e0..b74f0a7 100644 --- a/src/gui/partitionmanagerwidget.cpp +++ b/src/gui/partitionmanagerwidget.cpp @@ -327,11 +327,11 @@ void PartitionManagerWidget::on_m_PartTableWidget_itemSelectionChanged(PartWidge if (p) { QList findResult = treePartitions().findItems(p->deviceNode(), Qt::MatchFixedString | Qt::MatchRecursive, 0); - for (int idx = 0; idx < findResult.size(); idx++) { - const PartitionTreeWidgetItem* ptwItem = dynamic_cast(findResult[idx]); + for (const auto &item : findResult) { + const PartitionTreeWidgetItem* ptwItem = dynamic_cast(item); if (ptwItem && ptwItem->partition() == p) { - treePartitions().setCurrentItem(findResult[idx]); + treePartitions().setCurrentItem(item); break; } } diff --git a/src/gui/partpropsdialog.cpp b/src/gui/partpropsdialog.cpp index 32f77bb..313a0fc 100644 --- a/src/gui/partpropsdialog.cpp +++ b/src/gui/partpropsdialog.cpp @@ -280,7 +280,7 @@ void PartPropsDialog::setupFileSystemComboBox() QString selected; QStringList fsNames; - for(const FileSystem * fs : FileSystemFactory::map()) + for(const auto &fs : FileSystemFactory::map()) { // If the partition isn't encrypted, skip the luks FS if (fs->type() == FileSystem::Luks && partition().fileSystem().type() != FileSystem::Luks) @@ -312,7 +312,7 @@ void PartPropsDialog::setupFileSystemComboBox() qSort(fsNames.begin(), fsNames.end(), caseInsensitiveLessThan); - for (const QString & fsName : fsNames) + for (const auto &fsName : fsNames) dialogWidget().fileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName); dialogWidget().fileSystem().setCurrentIndex(dialogWidget().fileSystem().findText(selected)); diff --git a/src/gui/parttablewidget.cpp b/src/gui/parttablewidget.cpp index 068ddf7..0551b7f 100644 --- a/src/gui/parttablewidget.cpp +++ b/src/gui/parttablewidget.cpp @@ -51,7 +51,7 @@ void PartTableWidget::setPartitionTable(const PartitionTable* ptable) m_PartitionTable = ptable; if (partitionTable() != nullptr) { - for (auto const &p : partitionTable()->children()) { + for (const auto &p : partitionTable()->children()) { PartWidget* w = new PartWidget(this, p); w->setVisible(true); w->setFileSystemColorCode(GuiHelpers::fileSystemColorCodesFromSettings()); diff --git a/src/gui/resizevolumedialog.cpp b/src/gui/resizevolumedialog.cpp index 64e6611..31e956e 100644 --- a/src/gui/resizevolumedialog.cpp +++ b/src/gui/resizevolumedialog.cpp @@ -58,7 +58,7 @@ void ResizeVolumeDialog::setupDialog() { if (dialogWidget().volumeType().currentText() == QStringLiteral("LVM")) { dialogWidget().listPV().addPartitionList(device().deviceNodeList(), true); - for (auto const &pvpath : FS::lvm2_pv::getFreePV()) { + for (const auto &pvpath : FS::lvm2_pv::getFreePV()) { if (!LvmDevice::s_DirtyPVs.contains(pvpath)) { dialogWidget().listPV().addPartition(pvpath, false); } diff --git a/src/gui/sizedialogbase.cpp b/src/gui/sizedialogbase.cpp index ea07c24..1652d42 100644 --- a/src/gui/sizedialogbase.cpp +++ b/src/gui/sizedialogbase.cpp @@ -337,9 +337,8 @@ void SizeDialogBase::onAlignToggled(bool align) dialogWidget().spinCapacity().setSingleStep(capacityStep); // if align is on, turn off keyboard tracking for all spin boxes to avoid the two clashing - foreach(auto &box, dialogWidget().findChildren() + - detailsWidget().findChildren()) - box->setKeyboardTracking(!align); + foreach(const auto &box, dialogWidget().findChildren() + detailsWidget().findChildren()) + box->setKeyboardTracking(!align); if (align) { onSpinFirstSectorChanged(partition().firstSector()); diff --git a/src/gui/smartdialog.cpp b/src/gui/smartdialog.cpp index 40da5e6..d8bc9bd 100644 --- a/src/gui/smartdialog.cpp +++ b/src/gui/smartdialog.cpp @@ -115,7 +115,7 @@ void SmartDialog::setupDialog() const QString st = QStringLiteral("").arg(f.family()).arg(size); - for (auto const &a : device().smartStatus().attributes()) { + for (const auto &a : device().smartStatus().attributes()) { QTreeWidgetItem* item = new QTreeWidgetItem( QStringList() << QLocale().toString(a.id()) @@ -180,7 +180,7 @@ QString SmartDialog::toHtml() const s << "\n"; - for (auto const &a : device().smartStatus().attributes()) { + for (const auto &a : device().smartStatus().attributes()) { s << "\n"; s << "\n" diff --git a/src/util/guihelpers.cpp b/src/util/guihelpers.cpp index aaa4892..89a56c2 100644 --- a/src/util/guihelpers.cpp +++ b/src/util/guihelpers.cpp @@ -116,8 +116,8 @@ QString suCommand() const QString candidates[] = { QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5"/kdesu"), QStringLiteral("kdesu"), QStringLiteral("kdesudo"), QStringLiteral("gksudo"), QStringLiteral("gksu") }; QString rval; - for (quint32 i = 0; i < sizeof(candidates) / sizeof(candidates[0]); i++) { - rval = QStandardPaths::findExecutable(candidates[i]); + for (const auto &candidate : candidates) { + rval = QStandardPaths::findExecutable(candidate); if (QFileInfo(rval).isExecutable()) return rval; }
" << QLocale().toString(a.id()) << "