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

[partition] Chase namespace change for Units

Browse Source
This commit is contained in:
Adriaan de Groot 2021-03-09 19:45:12 +01:00
parent 9f17d3fd12
commit 98524708cc
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/partition/core/PartitionActions.cpp
View File

@ -29,10 +29,10 @@
#include <QDir> #include <QDir>
using namespace CalamaresUtils::Units;
namespace PartitionActions namespace PartitionActions
{ {
using CalamaresUtils::operator""_GiB;
using CalamaresUtils::operator""_MiB;
qint64 qint64
swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap ) swapSuggestion( const qint64 availableSpaceB, Config::SwapChoice swap )

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

@ -27,7 +27,7 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QPainter> #include <QPainter>
using CalamaresUtils::operator""_MiB; using namespace CalamaresUtils::Units;
static const int LAYOUT_MARGIN = 4; static const int LAYOUT_MARGIN = 4;
static const int LABEL_PARTITION_SQUARE_MARGIN = qMax( QFontMetrics( CalamaresUtils::defaultFont() ).ascent() - 2, 18 ); static const int LABEL_PARTITION_SQUARE_MARGIN = qMax( QFontMetrics( CalamaresUtils::defaultFont() ).ascent() - 2, 18 );

5
src/modules/partition/tests/CreateLayoutsTests.cpp
View File

@ -19,6 +19,8 @@
#include <QtTest/QtTest> #include <QtTest/QtTest>
using namespace CalamaresUtils::Units;
class PartitionTable; class PartitionTable;
class SmartStatus; class SmartStatus;
@ -27,9 +29,6 @@ QTEST_GUILESS_MAIN( CreateLayoutsTests )
static CalamaresUtils::Partition::KPMManager* kpmcore = nullptr; static CalamaresUtils::Partition::KPMManager* kpmcore = nullptr;
static Calamares::JobQueue* jobqueue = nullptr; static Calamares::JobQueue* jobqueue = nullptr;
using CalamaresUtils::operator""_MiB;
using CalamaresUtils::operator""_GiB;
#define LOGICAL_SIZE 512 #define LOGICAL_SIZE 512
CreateLayoutsTests::CreateLayoutsTests() CreateLayoutsTests::CreateLayoutsTests()

5
src/modules/partition/tests/PartitionJobTests.cpp
View File

@ -28,8 +28,7 @@
QTEST_GUILESS_MAIN( PartitionJobTests ) QTEST_GUILESS_MAIN( PartitionJobTests )
using namespace Calamares; using namespace Calamares;
using CalamaresUtils::operator""_MiB; using namespace CalamaresUtils::Units;
using CalamaresUtils::Partition::isPartitionFreeSpace;
class PartitionMounter class PartitionMounter
{ {
@ -104,7 +103,7 @@ static Partition*
firstFreePartition( PartitionNode* parent ) firstFreePartition( PartitionNode* parent )
{ {
for ( auto child : parent->children() ) for ( auto child : parent->children() )
if ( isPartitionFreeSpace( child ) ) if ( CalamaresUtils::Partition::isPartitionFreeSpace( child ) )
{ {
return child; return child;
} }