From f4e3964ee51ba0cf13e0eeb3a557419c18160863 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 11 Sep 2023 00:09:31 +0200 Subject: [PATCH] libcalamares: use namespace Calamares::Partition consistently --- src/libcalamares/PythonJobApi.cpp | 2 +- src/libcalamares/partition/AutoMount.cpp | 4 ++-- src/libcalamares/partition/AutoMount.h | 4 ++-- src/libcalamares/partition/FileSystem.cpp | 4 ++-- src/libcalamares/partition/FileSystem.h | 4 ++-- src/libcalamares/partition/Global.cpp | 6 +++--- src/libcalamares/partition/Global.h | 4 ++-- src/libcalamares/partition/KPMManager.cpp | 4 ++-- src/libcalamares/partition/KPMManager.h | 4 ++-- src/libcalamares/partition/KPMTests.cpp | 2 +- src/libcalamares/partition/Mount.cpp | 8 ++++---- src/libcalamares/partition/Mount.h | 4 ++-- .../partition/PartitionIterator.cpp | 4 ++-- src/libcalamares/partition/PartitionIterator.h | 4 ++-- src/libcalamares/partition/PartitionQuery.cpp | 4 ++-- src/libcalamares/partition/PartitionQuery.h | 4 ++-- src/libcalamares/partition/PartitionSize.cpp | 4 ++-- src/libcalamares/partition/PartitionSize.h | 4 ++-- src/libcalamares/partition/Sync.cpp | 2 +- src/libcalamares/partition/Sync.h | 4 ++-- src/libcalamares/partition/Tests.cpp | 10 +++++----- src/libcalamares/partition/calautomount.cpp | 2 +- src/modules/fsresizer/ResizeFSJob.cpp | 2 +- src/modules/fsresizer/ResizeFSJob.h | 4 ++-- src/modules/fsresizer/Tests.cpp | 2 +- src/modules/partition/Config.cpp | 2 +- src/modules/partition/core/ColorUtils.cpp | 6 +++--- src/modules/partition/core/DeviceList.cpp | 2 +- src/modules/partition/core/KPMHelpers.cpp | 2 +- src/modules/partition/core/PartUtils.cpp | 8 ++++---- .../partition/core/PartitionCoreModule.cpp | 8 ++++---- .../partition/core/PartitionCoreModule.h | 2 +- src/modules/partition/core/PartitionLayout.cpp | 4 ++-- src/modules/partition/core/PartitionLayout.h | 6 +++--- src/modules/partition/core/PartitionModel.cpp | 8 ++++---- src/modules/partition/gui/ChoicePage.cpp | 6 +++--- .../partition/gui/CreatePartitionDialog.cpp | 6 +++--- .../gui/EditExistingPartitionDialog.cpp | 4 ++-- src/modules/partition/gui/PartitionPage.cpp | 8 ++++---- .../partition/gui/PartitionSplitterWidget.cpp | 4 ++-- .../partition/jobs/AutoMountManagementJob.cpp | 4 ++-- .../partition/jobs/AutoMountManagementJob.h | 4 ++-- src/modules/partition/jobs/ClearMountsJob.cpp | 4 ++-- .../partition/jobs/ClearTempMountsJob.cpp | 4 ++-- .../partition/jobs/CreatePartitionJob.cpp | 10 +++++----- .../partition/jobs/CreatePartitionTableJob.cpp | 2 +- .../partition/jobs/CreatePartitionTableJob.h | 2 +- .../partition/jobs/CreateVolumeGroupJob.h | 2 +- .../partition/jobs/DeactivateVolumeGroupJob.h | 2 +- .../partition/jobs/FillGlobalStorageJob.cpp | 12 ++++++------ .../partition/jobs/FormatPartitionJob.cpp | 4 ++-- src/modules/partition/jobs/PartitionJob.h | 2 +- .../partition/jobs/RemoveVolumeGroupJob.h | 2 +- .../partition/jobs/ResizeVolumeGroupJob.h | 2 +- .../partition/jobs/SetPartitionFlagsJob.cpp | 4 ++-- src/modules/partition/tests/AutoMountTests.cpp | 4 ++-- .../partition/tests/CreateLayoutsTests.cpp | 4 ++-- src/modules/partition/tests/DevicesTests.cpp | 4 ++-- .../partition/tests/PartitionJobTests.cpp | 17 +++++++++-------- src/modules/umount/UmountJob.cpp | 4 ++-- 60 files changed, 135 insertions(+), 134 deletions(-) diff --git a/src/libcalamares/PythonJobApi.cpp b/src/libcalamares/PythonJobApi.cpp index 6da84c08c..50a8e82aa 100644 --- a/src/libcalamares/PythonJobApi.cpp +++ b/src/libcalamares/PythonJobApi.cpp @@ -79,7 +79,7 @@ mount( const std::string& device_path, const std::string& filesystem_name, const std::string& options ) { - return CalamaresUtils::Partition::mount( QString::fromStdString( device_path ), + return Calamares::Partition::mount( QString::fromStdString( device_path ), QString::fromStdString( mount_point ), QString::fromStdString( filesystem_name ), QString::fromStdString( options ) ); diff --git a/src/libcalamares/partition/AutoMount.cpp b/src/libcalamares/partition/AutoMount.cpp index 4b6980667..7e1040a28 100644 --- a/src/libcalamares/partition/AutoMount.cpp +++ b/src/libcalamares/partition/AutoMount.cpp @@ -15,7 +15,7 @@ #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -168,4 +168,4 @@ automountRestore( const std::shared_ptr< AutoMountInfo >& info ) } } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/partition/AutoMount.h b/src/libcalamares/partition/AutoMount.h index c792eeb99..de8bc4c8b 100644 --- a/src/libcalamares/partition/AutoMount.h +++ b/src/libcalamares/partition/AutoMount.h @@ -15,7 +15,7 @@ #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -46,6 +46,6 @@ DLLEXPORT std::shared_ptr< AutoMountInfo > automountDisable( bool disable = true DLLEXPORT void automountRestore( const std::shared_ptr< AutoMountInfo >& t ); } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/partition/FileSystem.cpp b/src/libcalamares/partition/FileSystem.cpp index c6bfc5aba..9e197d214 100644 --- a/src/libcalamares/partition/FileSystem.cpp +++ b/src/libcalamares/partition/FileSystem.cpp @@ -14,7 +14,7 @@ #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -92,4 +92,4 @@ untranslatedFS( FileSystem::Type t ) } } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/partition/FileSystem.h b/src/libcalamares/partition/FileSystem.h index 0f16c2979..36291e7af 100644 --- a/src/libcalamares/partition/FileSystem.h +++ b/src/libcalamares/partition/FileSystem.h @@ -23,7 +23,7 @@ #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -95,6 +95,6 @@ isFilesystemUsedGS( FileSystem::Type filesystem ) } } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares #endif // PARTITION_PARTITIONQUERY_H diff --git a/src/libcalamares/partition/Global.cpp b/src/libcalamares/partition/Global.cpp index a4d2ee979..9b01108ab 100644 --- a/src/libcalamares/partition/Global.cpp +++ b/src/libcalamares/partition/Global.cpp @@ -17,7 +17,7 @@ static const QString fsUse_key = QStringLiteral( "filesystem_use" ); bool -CalamaresUtils::Partition::isFilesystemUsedGS( const Calamares::GlobalStorage* gs, const QString& filesystemType ) +Calamares::Partition::isFilesystemUsedGS( const Calamares::GlobalStorage* gs, const QString& filesystemType ) { if ( !gs ) { @@ -34,7 +34,7 @@ CalamaresUtils::Partition::isFilesystemUsedGS( const Calamares::GlobalStorage* g } void -CalamaresUtils::Partition::useFilesystemGS( Calamares::GlobalStorage* gs, const QString& filesystemType, bool used ) +Calamares::Partition::useFilesystemGS( Calamares::GlobalStorage* gs, const QString& filesystemType, bool used ) { if ( gs ) { @@ -46,7 +46,7 @@ CalamaresUtils::Partition::useFilesystemGS( Calamares::GlobalStorage* gs, const } void -CalamaresUtils::Partition::clearFilesystemGS( Calamares::GlobalStorage* gs ) +Calamares::Partition::clearFilesystemGS( Calamares::GlobalStorage* gs ) { if ( gs ) { diff --git a/src/libcalamares/partition/Global.h b/src/libcalamares/partition/Global.h index efdec5bd0..cef1ecb94 100644 --- a/src/libcalamares/partition/Global.h +++ b/src/libcalamares/partition/Global.h @@ -19,7 +19,7 @@ #include "DllMacro.h" #include "JobQueue.h" -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -73,6 +73,6 @@ isFilesystemUsedGS( const QString& filesystemType ) } } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/partition/KPMManager.cpp b/src/libcalamares/partition/KPMManager.cpp index 7220b6151..c82bc6848 100644 --- a/src/libcalamares/partition/KPMManager.cpp +++ b/src/libcalamares/partition/KPMManager.cpp @@ -19,7 +19,7 @@ #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -97,4 +97,4 @@ KPMManager::backend() const } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/partition/KPMManager.h b/src/libcalamares/partition/KPMManager.h index 871deb866..6111505fa 100644 --- a/src/libcalamares/partition/KPMManager.h +++ b/src/libcalamares/partition/KPMManager.h @@ -20,7 +20,7 @@ class CoreBackend; -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -56,6 +56,6 @@ private: }; } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares #endif // PARTITION_KPMMANAGER_H diff --git a/src/libcalamares/partition/KPMTests.cpp b/src/libcalamares/partition/KPMTests.cpp index 2f828f772..910627902 100644 --- a/src/libcalamares/partition/KPMTests.cpp +++ b/src/libcalamares/partition/KPMTests.cpp @@ -89,7 +89,7 @@ KPMTests::testFSNames() calaFSNames.reserve( fstypes.count() ); for ( const auto t : fstypes ) { - QString s = CalamaresUtils::Partition::untranslatedFS( t ); + QString s = Calamares::Partition::untranslatedFS( t ); calaFSNames.append( s ); } diff --git a/src/libcalamares/partition/Mount.cpp b/src/libcalamares/partition/Mount.cpp index c22ba942b..18ec5a935 100644 --- a/src/libcalamares/partition/Mount.cpp +++ b/src/libcalamares/partition/Mount.cpp @@ -19,7 +19,7 @@ #include #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -38,7 +38,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file cWarning() << "Can't mount on an empty mountpoint."; } - return static_cast< int >( ProcessResult::Code::NoWorkingDirectory ); + return static_cast< int >( CalamaresUtils::ProcessResult::Code::NoWorkingDirectory ); } QDir mountPointDir( mountPoint ); @@ -48,7 +48,7 @@ mount( const QString& devicePath, const QString& mountPoint, const QString& file if ( !ok ) { cWarning() << "Could not create mountpoint" << mountPoint; - return static_cast< int >( ProcessResult::Code::NoWorkingDirectory ); + return static_cast< int >( CalamaresUtils::ProcessResult::Code::NoWorkingDirectory ); } } @@ -158,4 +158,4 @@ MtabInfo::fromMtabFilteredByPrefix( const QString& mountPrefix, const QString& m } } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/partition/Mount.h b/src/libcalamares/partition/Mount.h index f772c33a4..3781c4feb 100644 --- a/src/libcalamares/partition/Mount.h +++ b/src/libcalamares/partition/Mount.h @@ -20,7 +20,7 @@ #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -107,6 +107,6 @@ struct DLLEXPORT MtabInfo }; } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/partition/PartitionIterator.cpp b/src/libcalamares/partition/PartitionIterator.cpp index 8b4556f7f..610e51b9b 100644 --- a/src/libcalamares/partition/PartitionIterator.cpp +++ b/src/libcalamares/partition/PartitionIterator.cpp @@ -17,7 +17,7 @@ #include #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -136,4 +136,4 @@ PartitionIterator::end( PartitionTable* table ) } } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/partition/PartitionIterator.h b/src/libcalamares/partition/PartitionIterator.h index b6207f943..c90b925fb 100644 --- a/src/libcalamares/partition/PartitionIterator.h +++ b/src/libcalamares/partition/PartitionIterator.h @@ -23,7 +23,7 @@ class Device; class Partition; class PartitionTable; -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -62,6 +62,6 @@ private: }; } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares #endif // PARTITION_PARTITIONITERATOR_H diff --git a/src/libcalamares/partition/PartitionQuery.cpp b/src/libcalamares/partition/PartitionQuery.cpp index 4d54215f3..9f49026e0 100644 --- a/src/libcalamares/partition/PartitionQuery.cpp +++ b/src/libcalamares/partition/PartitionQuery.cpp @@ -18,7 +18,7 @@ #include #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -108,4 +108,4 @@ findPartitions( const QList< Device* >& devices, std::function< bool( Partition* } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/partition/PartitionQuery.h b/src/libcalamares/partition/PartitionQuery.h index 364c747fe..f7dc6eee6 100644 --- a/src/libcalamares/partition/PartitionQuery.h +++ b/src/libcalamares/partition/PartitionQuery.h @@ -26,7 +26,7 @@ class Device; class Partition; class PartitionTable; -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -70,6 +70,6 @@ Partition* findPartitionByPath( const QList< Device* >& devices, const QString& QList< Partition* > findPartitions( const QList< Device* >& devices, std::function< bool( Partition* ) > criterionFunction ); } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares #endif // PARTITION_PARTITIONQUERY_H diff --git a/src/libcalamares/partition/PartitionSize.cpp b/src/libcalamares/partition/PartitionSize.cpp index ddd3be2ef..b49198afe 100644 --- a/src/libcalamares/partition/PartitionSize.cpp +++ b/src/libcalamares/partition/PartitionSize.cpp @@ -14,7 +14,7 @@ #include "utils/Logger.h" #include "utils/Units.h" -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -289,4 +289,4 @@ PartitionSize::operator==( const PartitionSize& other ) const } } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares diff --git a/src/libcalamares/partition/PartitionSize.h b/src/libcalamares/partition/PartitionSize.h index b4808e36e..cea857808 100644 --- a/src/libcalamares/partition/PartitionSize.h +++ b/src/libcalamares/partition/PartitionSize.h @@ -18,7 +18,7 @@ // Qt #include -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -114,6 +114,6 @@ public: }; } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares #endif // PARTITION_PARTITIONSIZE_H diff --git a/src/libcalamares/partition/Sync.cpp b/src/libcalamares/partition/Sync.cpp index bcdf0cd7f..99e1c544f 100644 --- a/src/libcalamares/partition/Sync.cpp +++ b/src/libcalamares/partition/Sync.cpp @@ -14,7 +14,7 @@ #include "utils/Logger.h" void -CalamaresUtils::Partition::sync() +Calamares::Partition::sync() { /* I would normally use full paths here, e.g. /sbin/udevadm and /bin/sync, * but there's enough variation / opinion on where these executables diff --git a/src/libcalamares/partition/Sync.h b/src/libcalamares/partition/Sync.h index bcb2832ed..c564b94be 100644 --- a/src/libcalamares/partition/Sync.h +++ b/src/libcalamares/partition/Sync.h @@ -13,7 +13,7 @@ #include "DllMacro.h" -namespace CalamaresUtils +namespace Calamares { namespace Partition { @@ -35,6 +35,6 @@ struct DLLEXPORT Syncer }; } // namespace Partition -} // namespace CalamaresUtils +} // namespace Calamares #endif diff --git a/src/libcalamares/partition/Tests.cpp b/src/libcalamares/partition/Tests.cpp index 16f7d78c2..582accf8c 100644 --- a/src/libcalamares/partition/Tests.cpp +++ b/src/libcalamares/partition/Tests.cpp @@ -17,8 +17,8 @@ #include #include -using SizeUnit = CalamaresUtils::Partition::SizeUnit; -using PartitionSize = CalamaresUtils::Partition::PartitionSize; +using SizeUnit = Calamares::Partition::SizeUnit; +using PartitionSize = Calamares::Partition::PartitionSize; Q_DECLARE_METATYPE( SizeUnit ) @@ -161,8 +161,8 @@ PartitionServiceTests::testUnitNormalisation() void PartitionServiceTests::testFilesystemGS() { - using CalamaresUtils::Partition::isFilesystemUsedGS; - using CalamaresUtils::Partition::useFilesystemGS; + using Calamares::Partition::isFilesystemUsedGS; + using Calamares::Partition::useFilesystemGS; // Some filesystems names, they don't have to be real const QStringList fsNames { "ext4", "zfs", "berries", "carrot" }; @@ -212,7 +212,7 @@ PartitionServiceTests::testFilesystemGS() useFilesystemGS( &gs, "ext4", true ); QVERIFY( isFilesystemUsedGS( &gs, "EXT4" ) ); - CalamaresUtils::Partition::clearFilesystemGS( &gs ); + Calamares::Partition::clearFilesystemGS( &gs ); QVERIFY( !isFilesystemUsedGS( &gs, "ZFS" ) ); QVERIFY( !isFilesystemUsedGS( &gs, "EXT4" ) ); QVERIFY( !isFilesystemUsedGS( &gs, "ext4" ) ); diff --git a/src/libcalamares/partition/calautomount.cpp b/src/libcalamares/partition/calautomount.cpp index a91fc3dda..3906f309d 100644 --- a/src/libcalamares/partition/calautomount.cpp +++ b/src/libcalamares/partition/calautomount.cpp @@ -46,7 +46,7 @@ main( int argc, char** argv ) Logger::setupLogfile(); Logger::setupLogLevel( Logger::LOGDEBUG ); - CalamaresUtils::Partition::automountDisable( argv[ 1 ][ 1 ] == 'd' ); + Calamares::Partition::automountDisable( argv[ 1 ][ 1 ] == 'd' ); return 0; } diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp index 562644594..e17d30ebb 100644 --- a/src/modules/fsresizer/ResizeFSJob.cpp +++ b/src/modules/fsresizer/ResizeFSJob.cpp @@ -27,7 +27,7 @@ #include #include -using CalamaresUtils::Partition::PartitionIterator; +using Calamares::Partition::PartitionIterator; ResizeFSJob::ResizeFSJob( QObject* parent ) : Calamares::CppJob( parent ) diff --git a/src/modules/fsresizer/ResizeFSJob.h b/src/modules/fsresizer/ResizeFSJob.h index 52c4692e6..e31c0b911 100644 --- a/src/modules/fsresizer/ResizeFSJob.h +++ b/src/modules/fsresizer/ResizeFSJob.h @@ -25,7 +25,7 @@ class CoreBackend; // From KPMCore class Device; // From KPMCore class Partition; -using PartitionSize = CalamaresUtils::Partition::PartitionSize; +using PartitionSize = Calamares::Partition::PartitionSize; class PLUGINDLLEXPORT ResizeFSJob : public Calamares::CppJob { @@ -51,7 +51,7 @@ public: PartitionSize minimumSize() const { return m_atleast; } private: - CalamaresUtils::Partition::KPMManager m_kpmcore; + Calamares::Partition::KPMManager m_kpmcore; PartitionSize m_size; PartitionSize m_atleast; QString m_fsname; // Either this, or devicename, is set, not both diff --git a/src/modules/fsresizer/Tests.cpp b/src/modules/fsresizer/Tests.cpp index 7cd60ee9e..3a3e5ef30 100644 --- a/src/modules/fsresizer/Tests.cpp +++ b/src/modules/fsresizer/Tests.cpp @@ -23,7 +23,7 @@ #include #include -using SizeUnit = CalamaresUtils::Partition::SizeUnit; +using SizeUnit = Calamares::Partition::SizeUnit; QTEST_GUILESS_MAIN( FSResizerTests ) diff --git a/src/modules/partition/Config.cpp b/src/modules/partition/Config.cpp index 881ff3b52..083fe3685 100644 --- a/src/modules/partition/Config.cpp +++ b/src/modules/partition/Config.cpp @@ -283,7 +283,7 @@ fillGSConfigurationEFI( Calamares::GlobalStorage* gs, const QVariantMap& configu if ( configurationMap.contains( "efiSystemPartitionSize" ) ) { const QString sizeString = CalamaresUtils::getString( configurationMap, "efiSystemPartitionSize" ); - CalamaresUtils::Partition::PartitionSize part_size = CalamaresUtils::Partition::PartitionSize( sizeString ); + Calamares::Partition::PartitionSize part_size = Calamares::Partition::PartitionSize( sizeString ); if ( part_size.isValid() ) { // Insert once as string, once as a size-in-bytes; diff --git a/src/modules/partition/core/ColorUtils.cpp b/src/modules/partition/core/ColorUtils.cpp index 5368c2f86..912d4f822 100644 --- a/src/modules/partition/core/ColorUtils.cpp +++ b/src/modules/partition/core/ColorUtils.cpp @@ -24,9 +24,9 @@ #include #include -using CalamaresUtils::Partition::isPartitionFreeSpace; -using CalamaresUtils::Partition::isPartitionNew; -using CalamaresUtils::Partition::PartitionIterator; +using Calamares::Partition::isPartitionFreeSpace; +using Calamares::Partition::isPartitionNew; +using Calamares::Partition::PartitionIterator; static const int NUM_PARTITION_COLORS = 5; static const int NUM_NEW_PARTITION_COLORS = 4; diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp index 321827876..b81c28be6 100644 --- a/src/modules/partition/core/DeviceList.cpp +++ b/src/modules/partition/core/DeviceList.cpp @@ -21,7 +21,7 @@ #include -using CalamaresUtils::Partition::PartitionIterator; +using Calamares::Partition::PartitionIterator; namespace PartUtils { diff --git a/src/modules/partition/core/KPMHelpers.cpp b/src/modules/partition/core/KPMHelpers.cpp index 44da940fb..50fd11d67 100644 --- a/src/modules/partition/core/KPMHelpers.cpp +++ b/src/modules/partition/core/KPMHelpers.cpp @@ -27,7 +27,7 @@ #include -using CalamaresUtils::Partition::PartitionIterator; +using Calamares::Partition::PartitionIterator; namespace KPMHelpers { diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp index c7c8da074..e3bb40a00 100644 --- a/src/modules/partition/core/PartUtils.cpp +++ b/src/modules/partition/core/PartUtils.cpp @@ -32,8 +32,8 @@ #include #include -using CalamaresUtils::Partition::isPartitionFreeSpace; -using CalamaresUtils::Partition::isPartitionNew; +using Calamares::Partition::isPartitionFreeSpace; +using Calamares::Partition::isPartitionNew; namespace PartUtils { @@ -205,7 +205,7 @@ canBeResized( DeviceModel* dm, const QString& partitionPath, const Logger::Once& for ( int i = 0; i < dm->rowCount(); ++i ) { Device* dev = dm->deviceForIndex( dm->index( i ) ); - Partition* candidate = CalamaresUtils::Partition::findPartitionByPath( { dev }, partitionPath ); + Partition* candidate = Calamares::Partition::findPartitionByPath( { dev }, partitionPath ); if ( candidate ) { return canBeResized( candidate, o ); @@ -246,7 +246,7 @@ lookForFstabEntries( const QString& partitionPath ) FstabEntryList fstabEntries; - CalamaresUtils::Partition::TemporaryMount mount( partitionPath, QString(), mountOptions.join( ',' ) ); + Calamares::Partition::TemporaryMount mount( partitionPath, QString(), mountOptions.join( ',' ) ); if ( mount.isValid() ) { QFile fstabFile( mount.path() + "/etc/fstab" ); diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp index 851f729f4..69b2355dc 100644 --- a/src/modules/partition/core/PartitionCoreModule.cpp +++ b/src/modules/partition/core/PartitionCoreModule.cpp @@ -63,9 +63,9 @@ #include #include -using CalamaresUtils::Partition::isPartitionFreeSpace; -using CalamaresUtils::Partition::isPartitionNew; -using CalamaresUtils::Partition::PartitionIterator; +using Calamares::Partition::isPartitionFreeSpace; +using Calamares::Partition::isPartitionNew; +using Calamares::Partition::PartitionIterator; PartitionCoreModule::RefreshHelper::RefreshHelper( PartitionCoreModule* module ) : m_module( module ) @@ -807,7 +807,7 @@ PartitionCoreModule::scanForEfiSystemPartitions() } QList< Partition* > efiSystemPartitions - = CalamaresUtils::Partition::findPartitions( devices, PartUtils::isEfiBootable ); + = Calamares::Partition::findPartitions( devices, PartUtils::isEfiBootable ); if ( efiSystemPartitions.isEmpty() ) { diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h index a6f0c17ae..bf5145a90 100644 --- a/src/modules/partition/core/PartitionCoreModule.h +++ b/src/modules/partition/core/PartitionCoreModule.h @@ -257,7 +257,7 @@ private: DeviceInfo* infoForDevice( const Device* ) const; - CalamaresUtils::Partition::KPMManager m_kpmcore; + Calamares::Partition::KPMManager m_kpmcore; QList< DeviceInfo* > m_deviceInfos; QList< Partition* > m_efiSystemPartitions; diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp index 61c701042..38d1e9fd0 100644 --- a/src/modules/partition/core/PartitionLayout.cpp +++ b/src/modules/partition/core/PartitionLayout.cpp @@ -232,7 +232,7 @@ PartitionLayout::createPartitions( Device* dev, // warnings to ensure that all the cases are covered below. // We need to ignore the percent-defined until later qint64 sectors = 0; - if ( entry.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent ) + if ( entry.partSize.unit() != Calamares::Partition::SizeUnit::Percent ) { sectors = entry.partSize.toSectors( totalSectors, dev->logicalSize() ); } @@ -264,7 +264,7 @@ PartitionLayout::createPartitions( Device* dev, // Assign sectors for percentage-defined partitions. for ( const auto& entry : qAsConst( m_partLayout ) ) { - if ( entry.partSize.unit() == CalamaresUtils::Partition::SizeUnit::Percent ) + if ( entry.partSize.unit() == Calamares::Partition::SizeUnit::Percent ) { qint64 sectors = entry.partSize.toSectors( availableSectors + partSectorsMap.value( &entry ), dev->logicalSize() ); diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h index 6a3aad6fc..bc1c144fe 100644 --- a/src/modules/partition/core/PartitionLayout.h +++ b/src/modules/partition/core/PartitionLayout.h @@ -38,9 +38,9 @@ public: QString partMountPoint; FileSystem::Type partFileSystem = FileSystem::Unknown; QVariantMap partFeatures; - CalamaresUtils::Partition::PartitionSize partSize; - CalamaresUtils::Partition::PartitionSize partMinSize; - CalamaresUtils::Partition::PartitionSize partMaxSize; + Calamares::Partition::PartitionSize partSize; + Calamares::Partition::PartitionSize partMinSize; + Calamares::Partition::PartitionSize partMaxSize; /// @brief All-zeroes PartitionEntry PartitionEntry(); diff --git a/src/modules/partition/core/PartitionModel.cpp b/src/modules/partition/core/PartitionModel.cpp index 19dbcd076..f425f9e4e 100644 --- a/src/modules/partition/core/PartitionModel.cpp +++ b/src/modules/partition/core/PartitionModel.cpp @@ -28,8 +28,8 @@ // Qt #include -using CalamaresUtils::Partition::isPartitionFreeSpace; -using CalamaresUtils::Partition::isPartitionNew; +using Calamares::Partition::isPartitionFreeSpace; +using Calamares::Partition::isPartitionNew; //- ResetHelper -------------------------------------------- PartitionModel::ResetHelper::ResetHelper( PartitionModel* model ) @@ -163,7 +163,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const } if ( col == FileSystemColumn ) { - return CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); + return Calamares::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); } if ( col == FileSystemLabelColumn ) { @@ -206,7 +206,7 @@ PartitionModel::data( const QModelIndex& index, int role ) const } } QString prettyFileSystem - = CalamaresUtils::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); + = Calamares::Partition::prettyNameForFileSystemType( partition->fileSystem().type() ); qint64 size = ( partition->lastSector() - partition->firstSector() + 1 ) * m_device->logicalSize(); QString prettySize = formatByteSize( size ); return QVariant( name + " " + prettyFileSystem + " " + prettySize ); diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index b31d042fd..f397a39be 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -55,9 +55,9 @@ #include using Calamares::Widgets::PrettyRadioButton; -using CalamaresUtils::Partition::findPartitionByPath; -using CalamaresUtils::Partition::isPartitionFreeSpace; -using CalamaresUtils::Partition::PartitionIterator; +using Calamares::Partition::findPartitionByPath; +using Calamares::Partition::isPartitionFreeSpace; +using Calamares::Partition::PartitionIterator; using InstallChoice = Config::InstallChoice; using SwapChoice = Config::SwapChoice; diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index 8c8116b2e..942d4f913 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -43,8 +43,8 @@ #include #include -using CalamaresUtils::Partition::untranslatedFS; -using CalamaresUtils::Partition::userVisibleFS; +using Calamares::Partition::untranslatedFS; +using Calamares::Partition::userVisibleFS; static QSet< FileSystem::Type > s_unmountableFS( { FileSystem::Unformatted, FileSystem::LinuxSwap, @@ -352,7 +352,7 @@ CreatePartitionDialog::checkMountPointSelection() void CreatePartitionDialog::initPartResizerWidget( Partition* partition ) { - QColor color = CalamaresUtils::Partition::isPartitionFreeSpace( partition ) + QColor color = Calamares::Partition::isPartitionFreeSpace( partition ) ? ColorUtils::colorForPartitionInFreeSpace( partition ) : ColorUtils::colorForPartition( partition ); m_partitionSizeController->init( m_device, partition, color ); diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp index f02c5607d..55303d06d 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp @@ -42,8 +42,8 @@ #include #include -using CalamaresUtils::Partition::untranslatedFS; -using CalamaresUtils::Partition::userVisibleFS; +using Calamares::Partition::untranslatedFS; +using Calamares::Partition::userVisibleFS; EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, Partition* partition, diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp index 25e6a27ab..3daa4176a 100644 --- a/src/modules/partition/gui/PartitionPage.cpp +++ b/src/modules/partition/gui/PartitionPage.cpp @@ -134,7 +134,7 @@ PartitionPage::updateButtons() Q_ASSERT( model ); Partition* partition = model->partitionForIndex( index ); Q_ASSERT( partition ); - const bool isFree = CalamaresUtils::Partition::isPartitionFreeSpace( partition ); + const bool isFree = Calamares::Partition::isPartitionFreeSpace( partition ); const bool isExtended = partition->roles().has( PartitionRole::Extended ); // An extended partition can have a "free space" child; that one does @@ -144,7 +144,7 @@ PartitionPage::updateButtons() const bool hasChildren = isExtended && ( partition->children().length() > 1 || ( partition->children().length() == 1 - && !CalamaresUtils::Partition::isPartitionFreeSpace( partition->children().at( 0 ) ) ) ); + && !Calamares::Partition::isPartitionFreeSpace( partition->children().at( 0 ) ) ) ); const bool isInVG = m_core->isInVG( partition ); @@ -419,7 +419,7 @@ PartitionPage::onEditClicked() Partition* partition = model->partitionForIndex( index ); Q_ASSERT( partition ); - if ( CalamaresUtils::Partition::isPartitionNew( partition ) ) + if ( Calamares::Partition::isPartitionNew( partition ) ) { updatePartitionToCreate( model->device(), partition ); } @@ -487,7 +487,7 @@ PartitionPage::onPartitionViewActivated() // but I don't expect there will be other occurences of triggering the same // action from multiple UI elements in this page, so it does not feel worth // the price. - if ( CalamaresUtils::Partition::isPartitionFreeSpace( partition ) ) + if ( Calamares::Partition::isPartitionFreeSpace( partition ) ) { m_ui->createButton->click(); } diff --git a/src/modules/partition/gui/PartitionSplitterWidget.cpp b/src/modules/partition/gui/PartitionSplitterWidget.cpp index 11b6a4014..ea97761fb 100644 --- a/src/modules/partition/gui/PartitionSplitterWidget.cpp +++ b/src/modules/partition/gui/PartitionSplitterWidget.cpp @@ -27,7 +27,7 @@ #include #include -using CalamaresUtils::Partition::PartitionIterator; +using Calamares::Partition::PartitionIterator; static const int VIEW_HEIGHT = qMax( CalamaresUtils::defaultFontHeight() + 8, // wins out with big fonts @@ -103,7 +103,7 @@ PartitionSplitterWidget::init( Device* dev, bool drawNestedPartitions ) { PartitionSplitterItem newItem = { ( *it )->partitionPath(), ColorUtils::colorForPartition( *it ), - CalamaresUtils::Partition::isPartitionFreeSpace( *it ), + Calamares::Partition::isPartitionFreeSpace( *it ), ( *it )->capacity(), PartitionSplitterItem::Normal, {} }; diff --git a/src/modules/partition/jobs/AutoMountManagementJob.cpp b/src/modules/partition/jobs/AutoMountManagementJob.cpp index 71d3f32ff..4e78084bf 100644 --- a/src/modules/partition/jobs/AutoMountManagementJob.cpp +++ b/src/modules/partition/jobs/AutoMountManagementJob.cpp @@ -28,13 +28,13 @@ AutoMountManagementJob::exec() if ( m_stored ) { cDebug() << "Restore automount settings"; - CalamaresUtils::Partition::automountRestore( m_stored ); + Calamares::Partition::automountRestore( m_stored ); m_stored.reset(); } else { cDebug() << "Set automount to" << ( m_disable ? "disable" : "enable" ); - m_stored = CalamaresUtils::Partition::automountDisable( m_disable ); + m_stored = Calamares::Partition::automountDisable( m_disable ); } return Calamares::JobResult::ok(); } diff --git a/src/modules/partition/jobs/AutoMountManagementJob.h b/src/modules/partition/jobs/AutoMountManagementJob.h index e1dcf16dc..9b7c18cf7 100644 --- a/src/modules/partition/jobs/AutoMountManagementJob.h +++ b/src/modules/partition/jobs/AutoMountManagementJob.h @@ -17,7 +17,7 @@ /** * This job sets automounting to a specific value, and when run a * second time, **re**sets to the original value. See the documentation - * for CalamaresUtils::Partition::automountDisable() for details. + * for Calamares::Partition::automountDisable() for details. * Use @c true to **disable** automounting. * * Effectively: queue the **same** job twice; the first time it runs @@ -36,7 +36,7 @@ public: private: bool m_disable; - decltype( CalamaresUtils::Partition::automountDisable( true ) ) m_stored; + decltype( Calamares::Partition::automountDisable( true ) ) m_stored; }; #endif /* PARTITION_AUTOMOUNTMANAGEMENTJOB_H */ diff --git a/src/modules/partition/jobs/ClearMountsJob.cpp b/src/modules/partition/jobs/ClearMountsJob.cpp index 3d7b9d0de..00075c415 100644 --- a/src/modules/partition/jobs/ClearMountsJob.cpp +++ b/src/modules/partition/jobs/ClearMountsJob.cpp @@ -28,7 +28,7 @@ #include #include -using CalamaresUtils::Partition::PartitionIterator; +using Calamares::Partition::PartitionIterator; /** @brief Returns list of partitions on a given @p deviceName @@ -381,7 +381,7 @@ Calamares::JobResult ClearMountsJob::exec() { const QString deviceName = m_deviceNode.split( '/' ).last(); - CalamaresUtils::Partition::Syncer s; + Calamares::Partition::Syncer s; QList< MessageAndPath > goodNews; apply( getCryptoDevices( m_mapperExceptions ), tryCryptoClose, goodNews ); diff --git a/src/modules/partition/jobs/ClearTempMountsJob.cpp b/src/modules/partition/jobs/ClearTempMountsJob.cpp index 6219de004..59902650f 100644 --- a/src/modules/partition/jobs/ClearTempMountsJob.cpp +++ b/src/modules/partition/jobs/ClearTempMountsJob.cpp @@ -46,7 +46,7 @@ ClearTempMountsJob::exec() { Logger::Once o; // Fetch a list of current mounts to Calamares temporary directories. - using MtabInfo = CalamaresUtils::Partition::MtabInfo; + using MtabInfo = Calamares::Partition::MtabInfo; auto targetMounts = MtabInfo::fromMtabFilteredByPrefix( QStringLiteral( "/tmp/calamares-" ) ); if ( targetMounts.isEmpty() ) @@ -59,7 +59,7 @@ ClearTempMountsJob::exec() for ( const auto& m : qAsConst( targetMounts ) ) { cDebug() << o << "Will try to umount path" << m.mountPoint; - if ( CalamaresUtils::Partition::unmount( m.mountPoint, { "-lv" } ) == 0 ) + if ( Calamares::Partition::unmount( m.mountPoint, { "-lv" } ) == 0 ) { // Returns the program's exit code, so 0 is success goodNews.append( QString( "Successfully unmounted %1." ).arg( m.mountPoint ) ); diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 19a04a2de..a43724eec 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -31,8 +31,8 @@ #include #include -using CalamaresUtils::Partition::untranslatedFS; -using CalamaresUtils::Partition::userVisibleFS; +using Calamares::Partition::untranslatedFS; +using Calamares::Partition::userVisibleFS; /** @brief Create * @@ -174,7 +174,7 @@ prettyGptEntries( const Partition* partition ) QString CreatePartitionJob::prettyName() const { - const PartitionTable* table = CalamaresUtils::Partition::getPartitionTable( m_partition ); + const PartitionTable* table = Calamares::Partition::getPartitionTable( m_partition ); if ( table && table->type() == PartitionTable::TableType::gpt ) { QString entries = prettyGptEntries( m_partition ); @@ -206,7 +206,7 @@ CreatePartitionJob::prettyName() const QString CreatePartitionJob::prettyDescription() const { - const PartitionTable* table = CalamaresUtils::Partition::getPartitionTable( m_partition ); + const PartitionTable* table = Calamares::Partition::getPartitionTable( m_partition ); if ( table && table->type() == PartitionTable::TableType::gpt ) { QString entries = prettyGptEntries( m_partition ); @@ -240,7 +240,7 @@ CreatePartitionJob::prettyDescription() const QString CreatePartitionJob::prettyStatusMessage() const { - const PartitionTable* table = CalamaresUtils::Partition::getPartitionTable( m_partition ); + const PartitionTable* table = Calamares::Partition::getPartitionTable( m_partition ); if ( table && table->type() == PartitionTable::TableType::gpt ) { QString type = prettyGptType( m_partition ); diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.cpp b/src/modules/partition/jobs/CreatePartitionTableJob.cpp index 3b9415d1a..9ee293705 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionTableJob.cpp @@ -27,7 +27,7 @@ // Qt #include -using CalamaresUtils::Partition::PartitionIterator; +using Calamares::Partition::PartitionIterator; CreatePartitionTableJob::CreatePartitionTableJob( Device* device, PartitionTable::TableType type ) : m_device( device ) diff --git a/src/modules/partition/jobs/CreatePartitionTableJob.h b/src/modules/partition/jobs/CreatePartitionTableJob.h index ee1ba0a38..4acb1e5a8 100644 --- a/src/modules/partition/jobs/CreatePartitionTableJob.h +++ b/src/modules/partition/jobs/CreatePartitionTableJob.h @@ -39,7 +39,7 @@ public: Device* device() const { return m_device; } private: - CalamaresUtils::Partition::KPMManager m_kpmcore; + Calamares::Partition::KPMManager m_kpmcore; Device* m_device; PartitionTable::TableType m_type; PartitionTable* createTable(); diff --git a/src/modules/partition/jobs/CreateVolumeGroupJob.h b/src/modules/partition/jobs/CreateVolumeGroupJob.h index 987c937c6..c4b4c36ed 100644 --- a/src/modules/partition/jobs/CreateVolumeGroupJob.h +++ b/src/modules/partition/jobs/CreateVolumeGroupJob.h @@ -33,7 +33,7 @@ public: void undoPreview(); private: - CalamaresUtils::Partition::KPMManager m_kpmcore; + Calamares::Partition::KPMManager m_kpmcore; QString m_vgName; QVector< const Partition* > m_pvList; qint32 m_peSize; diff --git a/src/modules/partition/jobs/DeactivateVolumeGroupJob.h b/src/modules/partition/jobs/DeactivateVolumeGroupJob.h index a6bdd4ddb..175c4c6a5 100644 --- a/src/modules/partition/jobs/DeactivateVolumeGroupJob.h +++ b/src/modules/partition/jobs/DeactivateVolumeGroupJob.h @@ -27,7 +27,7 @@ public: Calamares::JobResult exec() override; private: - CalamaresUtils::Partition::KPMManager m_kpmcore; + Calamares::Partition::KPMManager m_kpmcore; LvmDevice* m_device; }; diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index 131d06f35..985e84ecc 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -34,9 +34,9 @@ #include #include -using CalamaresUtils::Partition::PartitionIterator; -using CalamaresUtils::Partition::untranslatedFS; -using CalamaresUtils::Partition::userVisibleFS; +using Calamares::Partition::PartitionIterator; +using Calamares::Partition::untranslatedFS; +using Calamares::Partition::userVisibleFS; typedef QHash< QString, QString > UuidForPartitionHash; @@ -306,14 +306,14 @@ FillGlobalStorageJob::prettyStatusMessage() const * .. mark as "2" if it's one of the claimed / in-use FSses * * Stores a GS key called "filesystem_use" with this mapping. - * @see CalamaresUtils::Partition::useFilesystemGS() + * @see Calamares::Partition::useFilesystemGS() */ static void storeFSUse( Calamares::GlobalStorage* storage, const QVariantList& partitions ) { if ( storage ) { - CalamaresUtils::Partition::clearFilesystemGS( storage ); + Calamares::Partition::clearFilesystemGS( storage ); for ( const auto& p : partitions ) { const auto pmap = p.toMap(); @@ -325,7 +325,7 @@ storeFSUse( Calamares::GlobalStorage* storage, const QVariantList& partitions ) continue; } - CalamaresUtils::Partition::useFilesystemGS( storage, fs, true ); + Calamares::Partition::useFilesystemGS( storage, fs, true ); } } } diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp index 599e29769..5b72d749c 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.cpp +++ b/src/modules/partition/jobs/FormatPartitionJob.cpp @@ -24,8 +24,8 @@ #include #include -using CalamaresUtils::Partition::untranslatedFS; -using CalamaresUtils::Partition::userVisibleFS; +using Calamares::Partition::untranslatedFS; +using Calamares::Partition::userVisibleFS; FormatPartitionJob::FormatPartitionJob( Device* device, Partition* partition ) : PartitionJob( partition ) diff --git a/src/modules/partition/jobs/PartitionJob.h b/src/modules/partition/jobs/PartitionJob.h index 5222cf4d3..f808a798f 100644 --- a/src/modules/partition/jobs/PartitionJob.h +++ b/src/modules/partition/jobs/PartitionJob.h @@ -36,7 +36,7 @@ public slots: void iprogress( int percent ); protected: - CalamaresUtils::Partition::KPMManager m_kpmcore; + Calamares::Partition::KPMManager m_kpmcore; Partition* m_partition; }; diff --git a/src/modules/partition/jobs/RemoveVolumeGroupJob.h b/src/modules/partition/jobs/RemoveVolumeGroupJob.h index 8582e3635..a1f586f0c 100644 --- a/src/modules/partition/jobs/RemoveVolumeGroupJob.h +++ b/src/modules/partition/jobs/RemoveVolumeGroupJob.h @@ -28,7 +28,7 @@ public: Calamares::JobResult exec() override; private: - CalamaresUtils::Partition::KPMManager m_kpmcore; + Calamares::Partition::KPMManager m_kpmcore; LvmDevice* m_device; }; diff --git a/src/modules/partition/jobs/ResizeVolumeGroupJob.h b/src/modules/partition/jobs/ResizeVolumeGroupJob.h index bb3e09d75..07765cff4 100644 --- a/src/modules/partition/jobs/ResizeVolumeGroupJob.h +++ b/src/modules/partition/jobs/ResizeVolumeGroupJob.h @@ -35,7 +35,7 @@ private: QString targetPartitions() const; private: - CalamaresUtils::Partition::KPMManager m_kpmcore; + Calamares::Partition::KPMManager m_kpmcore; LvmDevice* m_device; QVector< const Partition* > m_partitionList; }; diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp index 507773288..1da3097ff 100644 --- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp +++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp @@ -26,8 +26,8 @@ #include using CalamaresUtils::BytesToMiB; -using CalamaresUtils::Partition::untranslatedFS; -using CalamaresUtils::Partition::userVisibleFS; +using Calamares::Partition::untranslatedFS; +using Calamares::Partition::userVisibleFS; SetPartFlagsJob::SetPartFlagsJob( Device* device, Partition* partition, PartitionTable::Flags flags ) : PartitionJob( partition ) diff --git a/src/modules/partition/tests/AutoMountTests.cpp b/src/modules/partition/tests/AutoMountTests.cpp index 103fe6f82..68c929f44 100644 --- a/src/modules/partition/tests/AutoMountTests.cpp +++ b/src/modules/partition/tests/AutoMountTests.cpp @@ -41,7 +41,7 @@ AutoMountJobTests::testRunThrice() { Logger::setupLogLevel( Logger::LOGVERBOSE ); - auto original = CalamaresUtils::Partition::automountDisable( true ); + auto original = Calamares::Partition::automountDisable( true ); cDebug() << "Got automount info" << Logger::Pointer( original ); AutoMountManagementJob j( false ); @@ -49,7 +49,7 @@ AutoMountJobTests::testRunThrice() QVERIFY( j.exec() ); QVERIFY( j.exec() ); - CalamaresUtils::Partition::automountRestore( original ); + Calamares::Partition::automountRestore( original ); } void diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp index db57f0e9d..4fb3c886a 100644 --- a/src/modules/partition/tests/CreateLayoutsTests.cpp +++ b/src/modules/partition/tests/CreateLayoutsTests.cpp @@ -26,7 +26,7 @@ class SmartStatus; QTEST_GUILESS_MAIN( CreateLayoutsTests ) -static CalamaresUtils::Partition::KPMManager* kpmcore = nullptr; +static Calamares::Partition::KPMManager* kpmcore = nullptr; static Calamares::JobQueue* jobqueue = nullptr; #define LOGICAL_SIZE 512 @@ -40,7 +40,7 @@ void CreateLayoutsTests::init() { jobqueue = new Calamares::JobQueue( nullptr ); - kpmcore = new CalamaresUtils::Partition::KPMManager(); + kpmcore = new Calamares::Partition::KPMManager(); } void diff --git a/src/modules/partition/tests/DevicesTests.cpp b/src/modules/partition/tests/DevicesTests.cpp index ec6bdadff..1f80e2294 100644 --- a/src/modules/partition/tests/DevicesTests.cpp +++ b/src/modules/partition/tests/DevicesTests.cpp @@ -34,12 +34,12 @@ private Q_SLOTS: void testPartUtilScanDevices(); private: - std::unique_ptr< CalamaresUtils::Partition::KPMManager > m_d; + std::unique_ptr< Calamares::Partition::KPMManager > m_d; bool m_isRoot = false; }; DevicesTests::DevicesTests() - : m_d( std::make_unique< CalamaresUtils::Partition::KPMManager >() ) + : m_d( std::make_unique< Calamares::Partition::KPMManager >() ) , m_isRoot( geteuid() == 0 ) { } diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp index 4dddf4377..0646dacdf 100644 --- a/src/modules/partition/tests/PartitionJobTests.cpp +++ b/src/modules/partition/tests/PartitionJobTests.cpp @@ -27,7 +27,8 @@ QTEST_GUILESS_MAIN( PartitionJobTests ) -using namespace Calamares; +using Calamares::job_ptr; +using Calamares::JobList; using namespace CalamaresUtils::Units; class PartitionMounter @@ -99,11 +100,11 @@ writeFile( const QString& path, const QByteArray data ) } } -static Partition* +static ::Partition* firstFreePartition( PartitionNode* parent ) { for ( auto child : parent->children() ) - if ( CalamaresUtils::Partition::isPartitionFreeSpace( child ) ) + if ( Calamares::Partition::isPartitionFreeSpace( child ) ) { return child; } @@ -111,13 +112,13 @@ firstFreePartition( PartitionNode* parent ) } //- QueueRunner --------------------------------------------------------------- -QueueRunner::QueueRunner( JobQueue* queue ) +QueueRunner::QueueRunner( Calamares::JobQueue* queue ) : m_queue( queue ) , m_finished( false ) // Same initalizations as in ::run() , m_success( true ) { - connect( m_queue, &JobQueue::finished, this, &QueueRunner::onFinished ); - connect( m_queue, &JobQueue::failed, this, &QueueRunner::onFailed ); + connect( m_queue, &Calamares::JobQueue::finished, this, &QueueRunner::onFinished ); + connect( m_queue, &Calamares::JobQueue::failed, this, &QueueRunner::onFailed ); } QueueRunner::~QueueRunner() @@ -153,7 +154,7 @@ QueueRunner::onFailed( const QString& message, const QString& details ) QFAIL( qPrintable( msg ) ); } -static CalamaresUtils::Partition::KPMManager* kpmcore = nullptr; +static Calamares::Partition::KPMManager* kpmcore = nullptr; //- PartitionJobTests ------------------------------------------------------------------ PartitionJobTests::PartitionJobTests() @@ -172,7 +173,7 @@ PartitionJobTests::initTestCase() 0 ); } - kpmcore = new CalamaresUtils::Partition::KPMManager(); + kpmcore = new Calamares::Partition::KPMManager(); FileSystemFactory::init(); refreshDevice(); diff --git a/src/modules/umount/UmountJob.cpp b/src/modules/umount/UmountJob.cpp index fa8f28e11..2fd549348 100644 --- a/src/modules/umount/UmountJob.cpp +++ b/src/modules/umount/UmountJob.cpp @@ -58,7 +58,7 @@ unmountTargetMounts( const QString& rootMountPoint ) targetMountPath.append( '/' ); } - using MtabInfo = CalamaresUtils::Partition::MtabInfo; + using MtabInfo = Calamares::Partition::MtabInfo; auto targetMounts = MtabInfo::fromMtabFilteredByPrefix( targetMountPath ); std::sort( targetMounts.begin(), targetMounts.end(), MtabInfo::mountPointOrder ); @@ -67,7 +67,7 @@ unmountTargetMounts( const QString& rootMountPoint ) { // Returns the program's exit code, so 0 is success and non-0 // (truthy) is a failure. - if ( CalamaresUtils::Partition::unmount( m.mountPoint, { "-lv" } ) ) + if ( Calamares::Partition::unmount( m.mountPoint, { "-lv" } ) ) { return Calamares::JobResult::error( QCoreApplication::translate( UmountJob::staticMetaObject.className(),