aiden
/
calamares
mirror of https://github.com/cutefishos/calamares
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

The Humongous Include Fixage For KPMcore Headers.

Browse Source
main
Teo Mrnjavac 9 years ago
parent 3e4b19400a
commit c2eef9ac30
30 changed files with 233 additions and 219 deletions
Show Stats Download Patch File Download Diff File

11
src/modules/partition/core/BootLoaderModel.cpp
Unescape Escape View File

@ -16,13 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <core/BootLoaderModel.h>
#include <core/PartitionInfo.h>
#include <core/PMUtils.h>
#include "core/BootLoaderModel.h"
// CalaPM
#include <core/device.h>
#include "core/PartitionInfo.h"
#include "core/PMUtils.h"
// KPMcore
#include <kpmcore/core/device.h>
static QStandardItem*
createBootLoaderItem( const QString& description, const QString& path, bool isPartition )

10
src/modules/partition/core/ColorUtils.cpp
Unescape Escape View File

@ -17,13 +17,13 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <core/ColorUtils.h>
#include "core/ColorUtils.h"
#include <core/PMUtils.h>
#include <core/PartitionIterator.h>
#include "core/PMUtils.h"
#include "core/PartitionIterator.h"
// CalaPM
#include <core/partition.h>
// KPMcore
#include <kpmcore/core/partition.h>
// Qt
#include <QColor>

8
src/modules/partition/core/DeviceModel.cpp
Unescape Escape View File

@ -16,14 +16,14 @@
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <core/DeviceModel.h>
#include "core/DeviceModel.h"
#include <core/PartitionModel.h>
#include "core/PartitionModel.h"
#include "utils/CalamaresUtilsGui.h"
// CalaPM
#include <core/device.h>
// KPMcore
#include <kpmcore/core/device.h>
// KF5
#include <KFormat>

12
src/modules/partition/core/PMUtils.cpp
Unescape Escape View File

@ -17,14 +17,14 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <core/PMUtils.h>
#include "core/PMUtils.h"
#include <core/PartitionInfo.h>
#include <core/PartitionIterator.h>
#include "core/PartitionInfo.h"
#include "core/PartitionIterator.h"
// CalaPM
#include <core/partition.h>
#include <fs/filesystemfactory.h>
// KPMcore
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystemfactory.h>
namespace PMUtils
{

4
src/modules/partition/core/PMUtils.h
Unescape Escape View File

@ -19,8 +19,8 @@
#ifndef PMUTILS_H
#define PMUTILS_H
// CalaPM
#include <fs/filesystem.h>
// KPMcore
#include <kpmcore/fs/filesystem.h>
// Qt
#include <QList>

12
src/modules/partition/core/PartitionCoreModule.cpp
Unescape Escape View File

@ -37,13 +37,13 @@
#include <Typedefs.h>
#include <utils/Logger.h>
// CalaPM
// KPMcore
#include <CalaPM.h>
#include <core/device.h>
#include <core/partition.h>
#include <backend/corebackend.h>
#include <backend/corebackendmanager.h>
#include <fs/filesystemfactory.h>
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/backend/corebackend.h>
#include <kpmcore/backend/corebackendmanager.h>
#include <kpmcore/fs/filesystemfactory.h>
// Qt
#include <QStandardItemModel>

8
src/modules/partition/core/PartitionCoreModule.h
Unescape Escape View File

@ -20,11 +20,11 @@
#ifndef PARTITIONCOREMODULE_H
#define PARTITIONCOREMODULE_H
#include <core/PartitionModel.h>
#include <Typedefs.h>
#include "core/PartitionModel.h"
#include "Typedefs.h"
// CalaPM
#include <core/partitiontable.h>
// KPMcore
#include <kpmcore/core/partitiontable.h>
// Qt
#include <QList>

7
src/modules/partition/core/PartitionInfo.cpp
Unescape Escape View File

@ -15,10 +15,11 @@
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <core/PartitionInfo.h>
// CalaPM
#include <core/partition.h>
#include "core/PartitionInfo.h"
// KPMcore
#include <kpmcore/core/partition.h>
// Qt
#include <QVariant>

8
src/modules/partition/core/PartitionIterator.cpp
Unescape Escape View File

@ -19,10 +19,10 @@
#include <core/PartitionIterator.h>
// CalaPM
#include <core/device.h>
#include <core/partition.h>
#include <core/partitiontable.h>
// KPMcore
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/core/partitiontable.h>
PartitionIterator::PartitionIterator( PartitionTable* table )
: m_table( table )

19
src/modules/partition/core/PartitionModel.cpp
Unescape Escape View File

@ -15,18 +15,19 @@
* You should have received a copy of the GNU General Public License
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <core/PartitionModel.h>
#include <core/ColorUtils.h>
#include <core/PartitionInfo.h>
#include <core/PMUtils.h>
#include <utils/Logger.h>
#include "core/PartitionModel.h"
#include "core/ColorUtils.h"
#include "core/PartitionInfo.h"
#include "core/PMUtils.h"
#include "utils/Logger.h"
// CalaPM
#include <core/device.h>
#include <core/partition.h>
#include <core/partitiontable.h>
#include <fs/filesystem.h>
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/core/partitiontable.h>
#include <kpmcore/fs/filesystem.h>
// KF5
#include <KFormat>

6
src/modules/partition/gui/AlongsidePage.cpp
Unescape Escape View File

@ -22,8 +22,6 @@
#include "core/PartitionCoreModule.h"
#include "core/DeviceModel.h"
#include "core/PMUtils.h"
#include "core/device.h"
#include "core/partition.h"
#include "core/PartitionInfo.h"
#include "core/PartitionIterator.h"
#include "gui/PartitionSplitterWidget.h"
@ -36,6 +34,10 @@
#include "utils/Retranslator.h"
#include "Branding.h"
// KPMcore
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <QBoxLayout>
#include <QComboBox>
#include <QLabel>

24
src/modules/partition/gui/CreatePartitionDialog.cpp
Unescape Escape View File

@ -16,24 +16,24 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <gui/CreatePartitionDialog.h>
#include "gui/CreatePartitionDialog.h"
#include <core/ColorUtils.h>
#include <core/PartitionInfo.h>
#include <core/PMUtils.h>
#include <gui/PartitionSizeController.h>
#include "core/ColorUtils.h"
#include "core/PartitionInfo.h"
#include "core/PMUtils.h"
#include "gui/PartitionSizeController.h"
#include <ui_CreatePartitionDialog.h>
#include "ui_CreatePartitionDialog.h"
#include <utils/Logger.h>
#include "utils/Logger.h"
#include "GlobalStorage.h"
#include "JobQueue.h"
// CalaPM
#include <core/device.h>
#include <core/partition.h>
#include <fs/filesystem.h>
#include <fs/filesystemfactory.h>
// KPMcore
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/fs/filesystemfactory.h>
// Qt
#include <QComboBox>

5
src/modules/partition/gui/CreatePartitionDialog.h
Unescape Escape View File

@ -19,11 +19,12 @@
#ifndef CREATEPARTITIONDIALOG_H
#define CREATEPARTITIONDIALOG_H
// KPMcore
#include <kpmcore/core/partitionrole.h>
#include <QDialog>
#include <QScopedPointer>
// CalaPM
#include <core/partitionrole.h>
class Device;
class Partition;

8
src/modules/partition/gui/EraseDiskPage.cpp
Unescape Escape View File

@ -20,11 +20,8 @@
#include "core/DeviceModel.h"
#include "core/PartitionCoreModule.h"
#include "core/partition.h"
#include "core/PMUtils.h"
#include "core/PartitionInfo.h"
#include "core/device.h"
#include "fs/filesystem.h"
#include "gui/PartitionPreview.h"
#include "utils/CalamaresUtilsGui.h"
@ -34,6 +31,11 @@
#include "GlobalStorage.h"
#include "JobQueue.h"
// KPMcore
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>
#include <QBoxLayout>
#include <QDir>
#include <QFormLayout>

26
src/modules/partition/gui/PartitionPage.cpp
Unescape Escape View File

@ -19,23 +19,23 @@
#include "PartitionPage.h"
// Local
#include <core/BootLoaderModel.h>
#include <core/DeviceModel.h>
#include <core/PartitionCoreModule.h>
#include <core/PartitionModel.h>
#include <core/PMUtils.h>
#include <gui/CreatePartitionDialog.h>
#include <gui/EditExistingPartitionDialog.h>
#include "core/BootLoaderModel.h"
#include "core/DeviceModel.h"
#include "core/PartitionCoreModule.h"
#include "core/PartitionModel.h"
#include "core/PMUtils.h"
#include "gui/CreatePartitionDialog.h"
#include "gui/EditExistingPartitionDialog.h"
#include <ui_PartitionPage.h>
#include <ui_CreatePartitionTableDialog.h>
// CalaPM
#include <core/device.h>
#include <core/partition.h>
#include "ui_PartitionPage.h"
#include "ui_CreatePartitionTableDialog.h"
#include "utils/Retranslator.h"
// KPMcore
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
// Qt
#include <QDebug>
#include <QHeaderView>

12
src/modules/partition/gui/PartitionSizeController.cpp
Unescape Escape View File

@ -16,17 +16,17 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <gui/PartitionSizeController.h>
#include "gui/PartitionSizeController.h"
#include <core/ColorUtils.h>
#include <core/PMUtils.h>
#include "core/ColorUtils.h"
#include "core/PMUtils.h"
// Qt
#include <QSpinBox>
// CalaPM
#include <core/device.h>
#include <gui/partresizerwidget.h>
// KPMcore
#include <kpmcore/core/device.h>
#include <kpmcore/gui/partresizerwidget.h>
// stdc++
#include <limits>

4
src/modules/partition/gui/PartitionSizeController.h
Unescape Escape View File

@ -19,8 +19,8 @@
#ifndef PARTITIONSIZECONTROLLER_H
#define PARTITIONSIZECONTROLLER_H
// CalaPM
#include <core/partition.h>
// KPMcore
#include <kpmcore/core/partition.h>
// Qt
#include <QColor>

29
src/modules/partition/gui/PartitionViewStep.cpp
Unescape Escape View File

@ -17,20 +17,18 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <gui/PartitionViewStep.h>
#include <core/DeviceModel.h>
#include <core/PartitionCoreModule.h>
#include <core/PartitionModel.h>
#include <core/PMUtils.h>
#include "core/partition.h"
#include "core/device.h"
#include <gui/ChoicePage.h>
#include <gui/EraseDiskPage.h>
#include <gui/AlongsidePage.h>
#include <gui/PartitionPage.h>
#include <gui/ReplacePage.h>
#include <gui/PartitionPreview.h>
#include "gui/PartitionViewStep.h"
#include "core/DeviceModel.h"
#include "core/PartitionCoreModule.h"
#include "core/PartitionModel.h"
#include "core/PMUtils.h"
#include "gui/ChoicePage.h"
#include "gui/EraseDiskPage.h"
#include "gui/AlongsidePage.h"
#include "gui/PartitionPage.h"
#include "gui/ReplacePage.h"
#include "gui/PartitionPreview.h"
#include "CalamaresVersion.h"
#include "utils/CalamaresUtilsGui.h"
@ -42,6 +40,9 @@
#include "Job.h"
#include "Branding.h"
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
// Qt
#include <QApplication>
#include <QFormLayout>

29
src/modules/partition/gui/ReplacePage.cpp
Unescape Escape View File

@ -20,20 +20,21 @@
#include "ReplacePage.h"
#include "ui_ReplacePage.h"
#include <core/PartitionCoreModule.h>
#include <core/device.h>
#include <core/DeviceModel.h>
#include <core/partition.h>
#include <fs/filesystem.h>
#include <core/PMUtils.h>
#include <core/PartitionInfo.h>
#include <JobQueue.h>
#include <GlobalStorage.h>
#include <utils/Retranslator.h>
#include <utils/CalamaresUtilsGui.h>
#include <utils/Logger.h>
#include <Branding.h>
#include "core/PartitionCoreModule.h"
#include "core/PMUtils.h"
#include "core/PartitionInfo.h"
#include "core/DeviceModel.h"
#include "JobQueue.h"
#include "GlobalStorage.h"
#include "utils/Retranslator.h"
#include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h"
#include "Branding.h"
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>
#include <QDir>
#include <QProcess>

10
src/modules/partition/jobs/CheckFileSystemJob.cpp
Unescape Escape View File

@ -16,12 +16,12 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <jobs/CheckFileSystemJob.h>
#include "jobs/CheckFileSystemJob.h"
// CalaPM
#include <core/partition.h>
#include <fs/filesystem.h>
#include <util/report.h>
// KPMcore
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/util/report.h>
CheckFileSystemJob::CheckFileSystemJob( Partition* partition )
: PartitionJob( partition )

14
src/modules/partition/jobs/ClearMountsJob.cpp
Unescape Escape View File

@ -18,12 +18,14 @@
#include "ClearMountsJob.h"
#include <core/device.h>
#include <core/partition.h>
#include <core/PartitionInfo.h>
#include <core/PartitionIterator.h>
#include <util/report.h>
#include <utils/Logger.h>
#include "core/PartitionInfo.h"
#include "core/PartitionIterator.h"
#include "utils/Logger.h"
// KPMcore
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/util/report.h>
#include <QProcess>
#include <QStringList>

6
src/modules/partition/jobs/ClearTempMountsJob.cpp
Unescape Escape View File

@ -18,8 +18,10 @@
#include "ClearTempMountsJob.h"
#include <util/report.h>
#include <utils/Logger.h>
#include "utils/Logger.h"
// KPMcore
#include <kpmcore/util/report.h>
#include <QFile>
#include <QProcess>

30
src/modules/partition/jobs/CreatePartitionJob.cpp
Unescape Escape View File

@ -17,21 +17,21 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <jobs/CreatePartitionJob.h>
#include <utils/Logger.h>
// CalaPM
#include <backend/corebackend.h>
#include <backend/corebackendmanager.h>
#include <backend/corebackenddevice.h>
#include <backend/corebackendpartition.h>
#include <backend/corebackendpartitiontable.h>
#include <core/device.h>
#include <core/partition.h>
#include <core/partitiontable.h>
#include <fs/filesystem.h>
#include <util/report.h>
#include "jobs/CreatePartitionJob.h"
#include "utils/Logger.h"
// KPMcore
#include <kpmcore/backend/corebackend.h>
#include <kpmcore/backend/corebackendmanager.h>
#include <kpmcore/backend/corebackenddevice.h>
#include <kpmcore/backend/corebackendpartition.h>
#include <kpmcore/backend/corebackendpartitiontable.h>
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/core/partitiontable.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/util/report.h>
// Qt
#include <QScopedPointer>

30
src/modules/partition/jobs/CreatePartitionTableJob.cpp
Unescape Escape View File

@ -17,21 +17,21 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <jobs/CreatePartitionTableJob.h>
#include <utils/Logger.h>
// CalaPM
#include <backend/corebackend.h>
#include <backend/corebackendmanager.h>
#include <backend/corebackenddevice.h>
#include <backend/corebackendpartition.h>
#include <backend/corebackendpartitiontable.h>
#include <core/device.h>
#include <core/partition.h>
#include <core/partitiontable.h>
#include <fs/filesystem.h>
#include <util/report.h>
#include "jobs/CreatePartitionTableJob.h"
#include "utils/Logger.h"
// KPMcore
#include <kpmcore/backend/corebackend.h>
#include <kpmcore/backend/corebackendmanager.h>
#include <kpmcore/backend/corebackenddevice.h>
#include <kpmcore/backend/corebackendpartition.h>
#include <kpmcore/backend/corebackendpartitiontable.h>
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/core/partitiontable.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/util/report.h>
// Qt
#include <QScopedPointer>

4
src/modules/partition/jobs/CreatePartitionTableJob.h
Unescape Escape View File

@ -22,8 +22,8 @@
#include <Job.h>
// CalaPM
#include <core/partitiontable.h>
// KPMcore
#include <kpmcore/core/partitiontable.h>
class Device;

24
src/modules/partition/jobs/DeletePartitionJob.cpp
Unescape Escape View File

@ -17,18 +17,18 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <jobs/DeletePartitionJob.h>
// CalaPM
#include <backend/corebackend.h>
#include <backend/corebackendmanager.h>
#include <backend/corebackenddevice.h>
#include <backend/corebackendpartitiontable.h>
#include <core/device.h>
#include <core/partition.h>
#include <core/partitiontable.h>
#include <fs/filesystem.h>
#include <util/report.h>
#include "jobs/DeletePartitionJob.h"
// KPMcore
#include <kpmcore/backend/corebackend.h>
#include <kpmcore/backend/corebackendmanager.h>
#include <kpmcore/backend/corebackenddevice.h>
#include <kpmcore/backend/corebackendpartitiontable.h>
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/core/partitiontable.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/util/report.h>
DeletePartitionJob::DeletePartitionJob( Device* device, Partition* partition )
: PartitionJob( partition )

18
src/modules/partition/jobs/FillGlobalStorageJob.cpp
Unescape Escape View File

@ -17,20 +17,20 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <jobs/FillGlobalStorageJob.h>
#include "jobs/FillGlobalStorageJob.h"
#include <GlobalStorage.h>
#include <JobQueue.h>
#include <core/PartitionInfo.h>
#include <core/PartitionIterator.h>
#include <core/PMUtils.h>
#include "GlobalStorage.h"
#include "JobQueue.h"
#include "core/PartitionInfo.h"
#include "core/PartitionIterator.h"
#include "core/PMUtils.h"
#include "Branding.h"
#include "utils/Logger.h"
// CalaPM
#include <core/device.h>
#include <core/partition.h>
#include <fs/filesystem.h>
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>
// Qt
#include <QDebug>

30
src/modules/partition/jobs/FormatPartitionJob.cpp
Unescape Escape View File

@ -17,21 +17,21 @@
* along with Calamares. If not, see <http://www.gnu.org/licenses/>.
*/
#include <jobs/FormatPartitionJob.h>
#include <utils/Logger.h>
// CalaPM
#include <backend/corebackend.h>
#include <backend/corebackendmanager.h>
#include <backend/corebackenddevice.h>
#include <backend/corebackendpartition.h>
#include <backend/corebackendpartitiontable.h>
#include <core/device.h>
#include <core/partition.h>
#include <core/partitiontable.h>
#include <fs/filesystem.h>
#include <util/report.h>
#include "jobs/FormatPartitionJob.h"
#include "utils/Logger.h"
// KPMcore
#include <kpmcore/backend/corebackend.h>
#include <kpmcore/backend/corebackendmanager.h>
#include <kpmcore/backend/corebackenddevice.h>
#include <kpmcore/backend/corebackendpartition.h>
#include <kpmcore/backend/corebackendpartitiontable.h>
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/core/partitiontable.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/util/report.h>
// Qt
#include <QScopedPointer>

14
src/modules/partition/jobs/MoveFileSystemJob.cpp
Unescape Escape View File

@ -44,13 +44,13 @@
#include <utils/Logger.h>
// CalaPM
#include <core/copysourcedevice.h>
#include <core/copytargetdevice.h>
#include <core/device.h>
#include <core/partition.h>
#include <fs/filesystem.h>
#include <util/report.h>
// KPMcore
#include <kpmcore/core/copysourcedevice.h>
#include <kpmcore/core/copytargetdevice.h>
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/fs/filesystem.h>
#include <kpmcore/util/report.h>
MoveFileSystemJob::MoveFileSystemJob( Device* device, Partition* partition, qint64 oldFirstSector, qint64 newFirstSector, qint64 length )
: PartitionJob( partition )

30
src/modules/partition/jobs/ResizePartitionJob.cpp
Unescape Escape View File

@ -39,21 +39,21 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <jobs/ResizePartitionJob.h>
#include <jobs/CheckFileSystemJob.h>
#include <jobs/MoveFileSystemJob.h>
#include <utils/Logger.h>
// CalaPM
#include <backend/corebackend.h>
#include <backend/corebackendmanager.h>
#include <backend/corebackenddevice.h>
#include <backend/corebackendpartition.h>
#include <backend/corebackendpartitiontable.h>
#include <core/device.h>
#include <core/partition.h>
#include <util/report.h>
#include "jobs/ResizePartitionJob.h"
#include "jobs/CheckFileSystemJob.h"
#include "jobs/MoveFileSystemJob.h"
#include "utils/Logger.h"
// KPMcore
#include <kpmcore/backend/corebackend.h>
#include <kpmcore/backend/corebackendmanager.h>
#include <kpmcore/backend/corebackenddevice.h>
#include <kpmcore/backend/corebackendpartition.h>
#include <kpmcore/backend/corebackendpartitiontable.h>
#include <kpmcore/core/device.h>
#include <kpmcore/core/partition.h>
#include <kpmcore/util/report.h>
// Qt
#include <QScopedPointer>

Write Preview
Loading…
Cancel
Save