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

[partition] Tidy includes

Browse Source 
- sort includes a little
 - remove superfluous includes
 - update copyright
This commit is contained in:
Adriaan de Groot 2020-02-13 13:54:04 +01:00
parent d931b146e3
commit 45a31a3022
7 changed files with 8 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/partition/gui/CreatePartitionDialog.cpp
View File

@ -20,7 +20,8 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#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 <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/fs/filesystemfactory.h>
#include <kpmcore/fs/luks.h>
// Qt
#include <QComboBox>
#include <QDir>
#include <QListWidgetItem>

6
src/modules/partition/gui/EditExistingPartitionDialog.cpp
View File

@ -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 <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystemfactory.h>
// Qt
#include <QComboBox>
#include <QDir>
#include <QPushButton>

3
src/modules/partition/gui/ReplaceWidget.cpp
View File

@ -2,7 +2,7 @@
*
* Copyright 2014-2015, Teo Mrnjavac <teo@kde.org>
* Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2019, Adriaan de Groot <groot@kde.org>
* Copyright 2019-2020, Adriaan de Groot <groot@kde.org>
*
* 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"

5
src/modules/partition/jobs/CreatePartitionJob.cpp
View File

@ -18,15 +18,12 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#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 <kpmcore/core/device.h>
#include <kpmcore/core/lvmdevice.h>
#include <kpmcore/core/partition.h>

5
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -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 <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/fs/luks.h>
// Qt
#include <QDebug>
#include <QDir>
#include <QFileInfo>

6
src/modules/partition/jobs/FormatPartitionJob.cpp
View File

@ -2,6 +2,7 @@
*
* Copyright 2014, Aurélien Gâteau <agateau@kde.org>
* Copyright 2015-2016, Teo Mrnjavac <teo@kde.org>
* Copyright 2020, Adriaan de Groot <groot@kde.org>
*
* 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 <http://www.gnu.org/licenses/>.
*/
#include "jobs/FormatPartitionJob.h"
#include "core/KPMHelpers.h"
#include "FormatPartitionJob.h"
#include "partition/FileSystem.h"
#include "utils/Logger.h"
// KPMcore
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/core/partitiontable.h>

4
src/modules/partition/jobs/SetPartitionFlagsJob.cpp
View File

@ -1,6 +1,7 @@
/* === This file is part of Calamares - <https://github.com/calamares> ===
*
* Copyright 2016, Teo Mrnjavac <teo@kde.org>
* Copyright 2020, Adriaan de Groot <groot@kde.org>
*
* Based on the SetPartFlagsJob class from KDE Partition Manager,
* Copyright 2008, 2010, Volker Lanz <vl@fidra.de>
@ -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 <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>