diff --git a/src/config/generalpagewidget.cpp b/src/config/generalpagewidget.cpp index d1beb2c..195b146 100644 --- a/src/config/generalpagewidget.cpp +++ b/src/config/generalpagewidget.cpp @@ -1,6 +1,6 @@ /* SPDX-FileCopyrightText: 2010 Volker Lanz - SPDX-FileCopyrightText: 2014-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas SPDX-License-Identifier: GPL-3.0-or-later */ @@ -13,6 +13,8 @@ #include #include "util/guihelpers.h" +#include + #include GeneralPageWidget::GeneralPageWidget(QWidget* parent) : @@ -42,7 +44,7 @@ void GeneralPageWidget::setupDialog() std::sort(fsNames.begin(), fsNames.end(), caseInsensitiveLessThan); - for (const auto &fsName : qAsConst(fsNames)) + for (const auto &fsName : std::as_const(fsNames)) comboDefaultFileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName); setDefaultFileSystem(GuiHelpers::defaultFileSystem()); diff --git a/src/gui/createvolumegroupdialog.cpp b/src/gui/createvolumegroupdialog.cpp index 8801213..24dfbe6 100644 --- a/src/gui/createvolumegroupdialog.cpp +++ b/src/gui/createvolumegroupdialog.cpp @@ -1,6 +1,6 @@ /* SPDX-FileCopyrightText: 2016 Chantara Tith - SPDX-FileCopyrightText: 2016 Andrius Štikonas + SPDX-FileCopyrightText: 2016-2020 Andrius Štikonas SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho SPDX-FileCopyrightText: 2019 Yuri Chornoivan @@ -21,6 +21,8 @@ #include #include +#include + #include #include @@ -48,11 +50,11 @@ CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgNam void CreateVolumeGroupDialog::setupDialog() { - for (const auto &p : qAsConst(LVM::pvList::list())) { + for (const auto &p : std::as_const(LVM::pvList::list())) { bool toBeDeleted = false; // Ignore partitions that are going to be deleted - for (const auto &o : qAsConst(m_PendingOps)) { + for (const auto &o : std::as_const(m_PendingOps)) { if (dynamic_cast(o) && o->targets(*p.partition())) { toBeDeleted = true; break; @@ -66,9 +68,9 @@ void CreateVolumeGroupDialog::setupDialog() dialogWidget().listPV().addPartition(*p.partition(), false); } - for (const Device *d : qAsConst(m_Devices)) { + for (const Device *d : std::as_const(m_Devices)) { if (d->partitionTable() != nullptr) { - for (const Partition *p : qAsConst(d->partitionTable()->children())) { + for (const Partition *p : std::as_const(d->partitionTable()->children())) { // Looking if there is another VG creation that contains this partition if (LvmDevice::s_DirtyPVs.contains(p)) continue; @@ -88,7 +90,7 @@ void CreateVolumeGroupDialog::setupDialog() } } - for (const Partition *p : qAsConst(LvmDevice::s_OrphanPVs)) + for (const Partition *p : std::as_const(LvmDevice::s_OrphanPVs)) if (!LvmDevice::s_DirtyPVs.contains(p)) dialogWidget().listPV().addPartition(*p, false); } diff --git a/src/gui/newdialog.cpp b/src/gui/newdialog.cpp index e1205a9..81da2ad 100644 --- a/src/gui/newdialog.cpp +++ b/src/gui/newdialog.cpp @@ -1,6 +1,6 @@ /* SPDX-FileCopyrightText: 2008-2012 Volker Lanz - SPDX-FileCopyrightText: 2013-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2013-2020 Andrius Štikonas SPDX-FileCopyrightText: 2015 Teo Mrnjavac SPDX-FileCopyrightText: 2016 Chantara Tith SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho @@ -22,6 +22,8 @@ #include #include "util/guihelpers.h" +#include + #include #include @@ -72,7 +74,7 @@ void NewDialog::setupDialog() std::sort(fsNames.begin(), fsNames.end(), caseInsensitiveLessThan); - for (const auto &fsName : qAsConst(fsNames)) + for (const auto &fsName : std::as_const(fsNames)) dialogWidget().comboFileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName); QString selected = FileSystem::nameForType(GuiHelpers::defaultFileSystem()); diff --git a/src/gui/partpropsdialog.cpp b/src/gui/partpropsdialog.cpp index ef199c6..01bfede 100644 --- a/src/gui/partpropsdialog.cpp +++ b/src/gui/partpropsdialog.cpp @@ -1,6 +1,6 @@ /* SPDX-FileCopyrightText: 2008-2010 Volker Lanz - SPDX-FileCopyrightText: 2014-2017 Andrius Štikonas + SPDX-FileCopyrightText: 2014-2020 Andrius Štikonas SPDX-FileCopyrightText: 2014 Yuri Chornoivan SPDX-FileCopyrightText: 2018 Abhijeet Sharma @@ -19,6 +19,8 @@ #include #include "util/guihelpers.h" +#include + #include #include #include @@ -319,7 +321,7 @@ void PartPropsDialog::setupFileSystemComboBox() std::sort(fsNames.begin(), fsNames.end(), caseInsensitiveLessThan); - for (const auto &fsName : qAsConst(fsNames)) + for (const auto &fsName : std::as_const(fsNames)) dialogWidget().fileSystem().addItem(createFileSystemColor(FileSystem::typeForName(fsName), 8), fsName); dialogWidget().fileSystem().setCurrentIndex(dialogWidget().fileSystem().findText(selected)); diff --git a/src/gui/resizevolumegroupdialog.cpp b/src/gui/resizevolumegroupdialog.cpp index 50c8e7a..8791dfe 100644 --- a/src/gui/resizevolumegroupdialog.cpp +++ b/src/gui/resizevolumegroupdialog.cpp @@ -1,6 +1,6 @@ /* SPDX-FileCopyrightText: 2016 Chantara Tith - SPDX-FileCopyrightText: 2016-2018 Andrius Štikonas + SPDX-FileCopyrightText: 2016-2020 Andrius Štikonas SPDX-FileCopyrightText: 2018 Caio Jordão Carvalho SPDX-FileCopyrightText: 2019 Yuri Chornoivan @@ -20,6 +20,8 @@ #include #include +#include + #include #include #include @@ -46,11 +48,11 @@ ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerD void ResizeVolumeGroupDialog::setupDialog() { if (dialogWidget().volumeType().currentText() == QStringLiteral("LVM")) { - for (const auto &p : qAsConst(LVM::pvList::list())) { + for (const auto &p : std::as_const(LVM::pvList::list())) { bool toBeDeleted = false; // Ignore partitions that are going to be deleted - for (const auto &o : qAsConst(m_PendingOps)) { + for (const auto &o : std::as_const(m_PendingOps)) { if (dynamic_cast(o) && o->targets(*p.partition())) { toBeDeleted = true; break; @@ -68,9 +70,9 @@ void ResizeVolumeGroupDialog::setupDialog() dialogWidget().listPV().addPartition(*p.partition(), false); } - for (const Device *d : qAsConst(m_Devices)) { + for (const Device *d : std::as_const(m_Devices)) { if (d->partitionTable() != nullptr) { - for (const Partition *p : qAsConst(d->partitionTable()->children())) { + for (const Partition *p : std::as_const(d->partitionTable()->children())) { // Looking if there is another VG creation that contains this partition if (LvmDevice::s_DirtyPVs.contains(p)) continue; @@ -90,7 +92,7 @@ void ResizeVolumeGroupDialog::setupDialog() } } - for (const Partition *p : qAsConst(LvmDevice::s_OrphanPVs)) + for (const Partition *p : std::as_const(LvmDevice::s_OrphanPVs)) if (!LvmDevice::s_DirtyPVs.contains(p)) dialogWidget().listPV().addPartition(*p, false); }