From 45a31a302224efddeb3d71478be411eb6c0bae28 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 13 Feb 2020 13:54:04 +0100 Subject: [PATCH] [partition] Tidy includes - sort includes a little - remove superfluous includes - update copyright --- src/modules/partition/gui/CreatePartitionDialog.cpp | 7 ++----- src/modules/partition/gui/EditExistingPartitionDialog.cpp | 6 +----- src/modules/partition/gui/ReplaceWidget.cpp | 3 +-- src/modules/partition/jobs/CreatePartitionJob.cpp | 5 +---- src/modules/partition/jobs/FillGlobalStorageJob.cpp | 5 ----- src/modules/partition/jobs/FormatPartitionJob.cpp | 6 ++---- src/modules/partition/jobs/SetPartitionFlagsJob.cpp | 4 +--- 7 files changed, 8 insertions(+), 28 deletions(-) diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp index 7af7bb6f0..e69137740 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp @@ -20,7 +20,8 @@ * along with Calamares. If not, see . */ -#include "gui/CreatePartitionDialog.h" +#include "CreatePartitionDialog.h" +#include "ui_CreatePartitionDialog.h" #include "core/ColorUtils.h" #include "core/PartitionInfo.h" @@ -29,22 +30,18 @@ #include "gui/PartitionDialogHelpers.h" #include "gui/PartitionSizeController.h" -#include "ui_CreatePartitionDialog.h" - #include "GlobalStorage.h" #include "JobQueue.h" #include "partition/PartitionQuery.h" #include "partition/FileSystem.h" #include "utils/Logger.h" -// KPMcore #include #include #include #include #include -// Qt #include #include #include diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp index 3fce50395..37868c7ff 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp @@ -23,28 +23,24 @@ */ #include "EditExistingPartitionDialog.h" +#include "ui_EditExistingPartitionDialog.h" #include "core/ColorUtils.h" #include "core/PartitionCoreModule.h" #include "core/PartitionInfo.h" #include "core/PartUtils.h" -#include "core/KPMHelpers.h" #include "gui/PartitionDialogHelpers.h" #include "gui/PartitionSizeController.h" -#include "ui_EditExistingPartitionDialog.h" - #include "GlobalStorage.h" #include "JobQueue.h" #include "partition/FileSystem.h" #include "utils/Logger.h" -// KPMcore #include #include #include -// Qt #include #include #include diff --git a/src/modules/partition/gui/ReplaceWidget.cpp b/src/modules/partition/gui/ReplaceWidget.cpp index 5b276c7fa..728b33c36 100644 --- a/src/modules/partition/gui/ReplaceWidget.cpp +++ b/src/modules/partition/gui/ReplaceWidget.cpp @@ -2,7 +2,7 @@ * * Copyright 2014-2015, Teo Mrnjavac * Copyright 2014, Aurélien Gâteau - * Copyright 2019, Adriaan de Groot + * Copyright 2019-2020, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,7 +22,6 @@ #include "ui_ReplaceWidget.h" #include "core/DeviceModel.h" -#include "core/KPMHelpers.h" #include "core/PartitionCoreModule.h" #include "core/PartitionActions.h" #include "core/PartitionInfo.h" diff --git a/src/modules/partition/jobs/CreatePartitionJob.cpp b/src/modules/partition/jobs/CreatePartitionJob.cpp index 9aa5f310d..afa7b3ecc 100644 --- a/src/modules/partition/jobs/CreatePartitionJob.cpp +++ b/src/modules/partition/jobs/CreatePartitionJob.cpp @@ -18,15 +18,12 @@ * along with Calamares. If not, see . */ -#include "jobs/CreatePartitionJob.h" - -#include "core/KPMHelpers.h" +#include "CreatePartitionJob.h" #include "partition/FileSystem.h" #include "utils/Logger.h" #include "utils/Units.h" -// KPMcore #include #include #include diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp index c62629959..e5f4078dd 100644 --- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp +++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp @@ -26,20 +26,15 @@ #include "Branding.h" #include "GlobalStorage.h" #include "JobQueue.h" - #include "partition/FileSystem.h" #include "partition/PartitionIterator.h" #include "utils/Logger.h" -#include "Branding.h" - -// KPMcore #include #include #include #include -// Qt #include #include #include diff --git a/src/modules/partition/jobs/FormatPartitionJob.cpp b/src/modules/partition/jobs/FormatPartitionJob.cpp index dbe01adff..b8af7493d 100644 --- a/src/modules/partition/jobs/FormatPartitionJob.cpp +++ b/src/modules/partition/jobs/FormatPartitionJob.cpp @@ -2,6 +2,7 @@ * * Copyright 2014, Aurélien Gâteau * Copyright 2015-2016, Teo Mrnjavac + * Copyright 2020, Adriaan de Groot * * Calamares is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,14 +18,11 @@ * along with Calamares. If not, see . */ -#include "jobs/FormatPartitionJob.h" - -#include "core/KPMHelpers.h" +#include "FormatPartitionJob.h" #include "partition/FileSystem.h" #include "utils/Logger.h" -// KPMcore #include #include #include diff --git a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp index 23af290d1..7298e9bd0 100644 --- a/src/modules/partition/jobs/SetPartitionFlagsJob.cpp +++ b/src/modules/partition/jobs/SetPartitionFlagsJob.cpp @@ -1,6 +1,7 @@ /* === This file is part of Calamares - === * * Copyright 2016, Teo Mrnjavac + * Copyright 2020, Adriaan de Groot * * Based on the SetPartFlagsJob class from KDE Partition Manager, * Copyright 2008, 2010, Volker Lanz @@ -21,13 +22,10 @@ #include "SetPartitionFlagsJob.h" -#include "core/KPMHelpers.h" - #include "partition/FileSystem.h" #include "utils/Logger.h" #include "utils/Units.h" -// KPMcore #include #include #include