kpmcore/ prefix in #includes is no longer required.

CMakeLists.txt

@@ -22,9 +22,9 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 set(KDE_INSTALL_USE_QT_SYS_PATHS ON CACHE BOOL "Install mkspecs files, Plugins and Imports to the Qt 5 install dir" FORCE)
 
 set(QT_MIN_VERSION "5.4.1")
-set(VERSION_MAJOR "1")
-set(VERSION_MINOR "9")
-set(VERSION_RELEASE "50")
+set(VERSION_MAJOR "2")
+set(VERSION_MINOR "0")
+set(VERSION_RELEASE "0")
 set(VERSION_SUFFIX "")
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}${VERSION_SUFFIX})
 add_definitions(-D'VERSION="${VERSION}"') #"
@@ -73,11 +73,11 @@ add_definitions(
 )
 
 find_package(PkgConfig REQUIRED)
-find_package(KPMcore CONFIG REQUIRED)
+find_package(KPMcore 2.0.0 CONFIG REQUIRED)
 pkg_check_modules(BLKID REQUIRED blkid)
 pkg_check_modules(LIBATASMART REQUIRED libatasmart)
 
-include_directories(${Qt5Core_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} lib/ src/)
+include_directories(${Qt5Core_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} ${KPMCORE_INCLUDE_DIR} lib/ src/)
 
 add_subdirectory(src)
 add_subdirectory(icons)

src/config/advancedpagewidget.cpp

@@ -17,9 +17,9 @@
 
 #include "config/advancedpagewidget.h"
 
-#include <kpmcore/backend/corebackendmanager.h>
+#include <backend/corebackendmanager.h>
 
-#include <kpmcore/util/helpers.h>
+#include <util/helpers.h>
 
 #include <QComboBox>
 

src/config/advancedpagewidget.h

@@ -21,7 +21,7 @@
 
 #include "ui_configurepageadvanced.h"
 
-#include <kpmcore/fs/filesystem.h>
+#include <fs/filesystem.h>
 
 #include <QWidget>
 

src/config/configureoptionsdialog.cpp

@@ -20,14 +20,14 @@
 #include "config/filesystemcolorspagewidget.h"
 #include "config/advancedpagewidget.h"
 
-#include <kpmcore/backend/corebackendmanager.h>
+#include <backend/corebackendmanager.h>
 
-#include <kpmcore/core/operationstack.h>
+#include <core/operationstack.h>
 
-#include <kpmcore/fs/filesystem.h>
-#include <kpmcore/fs/filesystemfactory.h>
+#include <fs/filesystem.h>
+#include <fs/filesystemfactory.h>
 
-#include <kpmcore/util/helpers.h>
+#include <util/helpers.h>
 #include "util/guihelpers.h"
 
 #include "ui_configurepagefilesystemcolors.h"

src/config/generalpagewidget.cpp

@@ -17,10 +17,10 @@
 
 #include "config/generalpagewidget.h"
 
-#include <kpmcore/backend/corebackendmanager.h>
-#include <kpmcore/fs/filesystemfactory.h>
+#include <backend/corebackendmanager.h>
+#include <fs/filesystemfactory.h>
 
-#include <kpmcore/util/helpers.h>
+#include <util/helpers.h>
 #include "util/guihelpers.h"
 
 #include <config.h>

src/config/generalpagewidget.h

@@ -21,7 +21,7 @@
 
 #include "ui_configurepagegeneral.h"
 
-#include <kpmcore/fs/filesystem.h>
+#include <fs/filesystem.h>
 
 #include <QWidget>
 

src/gui/applyprogressdialog.cpp

@@ -20,14 +20,14 @@
 #include "gui/applyprogressdialogwidget.h"
 #include "gui/applyprogressdetailswidget.h"
 
-#include <kpmcore/core/operationrunner.h>
+#include <core/operationrunner.h>
 
-#include <kpmcore/ops/operation.h>
+#include <ops/operation.h>
 
-#include <kpmcore/jobs/job.h>
+#include <jobs/job.h>
 
-#include <kpmcore/util/report.h>
-#include <kpmcore/util/htmlreport.h>
+#include <util/report.h>
+#include <util/htmlreport.h>
 
 #include <QApplication>
 #include <QCloseEvent>

src/gui/createpartitiontabledialog.cpp

@@ -18,7 +18,7 @@
 #include "gui/createpartitiontabledialog.h"
 #include "gui/createpartitiontablewidget.h"
 
-#include <kpmcore/core/device.h>
+#include <core/device.h>
 
 #include <QDialogButtonBox>
 #include <QPushButton>

src/gui/createpartitiontabledialog.h

@@ -21,7 +21,7 @@
 
 #include "gui/createpartitiontablewidget.h"
 
-#include <kpmcore/core/partitiontable.h>
+#include <core/partitiontable.h>
 
 #include <QDialog>
 

src/gui/devicepropsdialog.cpp

@@ -20,12 +20,12 @@
 
 #include "gui/smartdialog.h"
 
-#include <kpmcore/core/device.h>
-#include <kpmcore/core/partitiontable.h>
-#include <kpmcore/core/smartstatus.h>
+#include <core/device.h>
+#include <core/partitiontable.h>
+#include <core/smartstatus.h>
 
-#include <kpmcore/util/capacity.h>
-#include <kpmcore/util/helpers.h>
+#include <util/capacity.h>
+#include <util/helpers.h>
 
 #include <KLocalizedString>
 #include <KSharedConfig>

src/gui/editmountpointdialog.cpp

@@ -18,7 +18,7 @@
 #include "gui/editmountpointdialog.h"
 #include "gui/editmountpointdialogwidget.h"
 
-#include <kpmcore/core/partition.h>
+#include <core/partition.h>
 
 #include <KMessageBox>
 #include <KGuiItem>

src/gui/editmountpointdialogwidget.cpp

@@ -18,10 +18,10 @@
 #include "gui/editmountpointdialogwidget.h"
 #include "gui/editmountoptionsdialog.h"
 
-#include <kpmcore/core/partition.h>
-#include <kpmcore/core/mountentry.h>
+#include <core/partition.h>
+#include <core/mountentry.h>
 
-#include <kpmcore/fs/filesystem.h>
+#include <fs/filesystem.h>
 
 #include <KLocalizedString>
 #include <KIOCore/KMountPoint>

src/gui/filesystemsupportdialog.cpp

@@ -18,8 +18,8 @@
 #include "gui/filesystemsupportdialog.h"
 #include "gui/filesystemsupportdialogwidget.h"
 
-#include <kpmcore/fs/filesystem.h>
-#include <kpmcore/fs/filesystemfactory.h>
+#include <fs/filesystem.h>
+#include <fs/filesystemfactory.h>
 
 #include <QDialogButtonBox>
 #include <QDialog>

src/gui/infopane.cpp

@@ -17,13 +17,13 @@
 
 #include "gui/infopane.h"
 
-#include <kpmcore/core/device.h>
-#include <kpmcore/core/partition.h>
+#include <core/device.h>
+#include <core/partition.h>
 
-#include <kpmcore/fs/filesystem.h>
-#include <kpmcore/fs/luks.h>
+#include <fs/filesystem.h>
+#include <fs/luks.h>
 
-#include <kpmcore/util/capacity.h>
+#include <util/capacity.h>
 
 #include <QDockWidget>
 #include <QFontDatabase>

src/gui/insertdialog.cpp

@@ -19,11 +19,11 @@
 #include "gui/sizedialogwidget.h"
 #include "gui/sizedetailswidget.h"
 
-#include <kpmcore/core/partition.h>
+#include <core/partition.h>
 
-#include <kpmcore/fs/filesystem.h>
+#include <fs/filesystem.h>
 
-#include <kpmcore/ops/resizeoperation.h>
+#include <ops/resizeoperation.h>
 
 #include <KConfigGroup>
 #include <KSharedConfig>

src/gui/listdevices.cpp

@@ -17,10 +17,10 @@
 
 #include "gui/listdevices.h"
 
-#include <kpmcore/core/device.h>
+#include <core/device.h>
 
-#include <kpmcore/util/globallog.h>
-#include <kpmcore/util/capacity.h>
+#include <util/globallog.h>
+#include <util/capacity.h>
 
 #include <KIconLoader>
 

src/gui/listdevices.h

@@ -19,7 +19,7 @@
 
 #define LISTDEVICES__H
 
-#include <kpmcore/core/operationstack.h>
+#include <core/operationstack.h>
 
 #include "ui_listdevicesbase.h"
 

src/gui/listoperations.cpp

@@ -17,10 +17,10 @@
 
 #include "gui/listoperations.h"
 
-#include <kpmcore/ops/operation.h>
+#include <ops/operation.h>
 
-#include <kpmcore/util/globallog.h>
-#include <kpmcore/util/capacity.h>
+#include <util/globallog.h>
+#include <util/capacity.h>
 
 #include <KIconLoader>
 

src/gui/listoperations.h

@@ -19,7 +19,7 @@
 
 #define LISTOPERATIONS__H
 
-#include <kpmcore/core/operationstack.h>
+#include <core/operationstack.h>
 
 #include "ui_listoperationsbase.h"
 

src/gui/mainwindow.cpp

@@ -26,28 +26,28 @@
 
 #include "config/configureoptionsdialog.h"
 
-#include <kpmcore/backend/corebackendmanager.h>
-#include <kpmcore/backend/corebackend.h>
+#include <backend/corebackendmanager.h>
+#include <backend/corebackend.h>
 
-#include <kpmcore/core/device.h>
-#include <kpmcore/core/partition.h>
-#include <kpmcore/core/partitionalignment.h>
-#include <kpmcore/core/smartstatus.h>
+#include <core/device.h>
+#include <core/partition.h>
+#include <core/partitionalignment.h>
+#include <core/smartstatus.h>
 
-#include <kpmcore/ops/operation.h>
-#include <kpmcore/ops/createpartitiontableoperation.h>
-#include <kpmcore/ops/resizeoperation.h>
-#include <kpmcore/ops/copyoperation.h>
-#include <kpmcore/ops/deleteoperation.h>
-#include <kpmcore/ops/newoperation.h>
-#include <kpmcore/ops/backupoperation.h>
-#include <kpmcore/ops/restoreoperation.h>
-#include <kpmcore/ops/checkoperation.h>
+#include <ops/operation.h>
+#include <ops/createpartitiontableoperation.h>
+#include <ops/resizeoperation.h>
+#include <ops/copyoperation.h>
+#include <ops/deleteoperation.h>
+#include <ops/newoperation.h>
+#include <ops/backupoperation.h>
+#include <ops/restoreoperation.h>
+#include <ops/checkoperation.h>
 
-#include <kpmcore/fs/filesystem.h>
-#include <kpmcore/fs/filesystemfactory.h>
+#include <fs/filesystem.h>
+#include <fs/filesystemfactory.h>
 
-#include <kpmcore/util/helpers.h>
+#include <util/helpers.h>
 #include "util/guihelpers.h"
 
 #include <QApplication>

src/gui/mainwindow.h

@@ -19,9 +19,9 @@
 
 #define MAINWINDOW__H
 
-#include <kpmcore/core/operationrunner.h>
-#include <kpmcore/core/operationstack.h>
-#include <kpmcore/core/devicescanner.h>
+#include <core/operationrunner.h>
+#include <core/operationstack.h>
+#include <core/devicescanner.h>
 
 #include "ui_mainwindowbase.h"
 

src/gui/newdialog.cpp

@@ -19,13 +19,13 @@
 #include "gui/sizedialogwidget.h"
 #include "gui/sizedetailswidget.h"
 
-#include <kpmcore/core/partition.h>
-#include <kpmcore/core/device.h>
+#include <core/partition.h>
+#include <core/device.h>
 
-#include <kpmcore/fs/filesystemfactory.h>
+#include <fs/filesystemfactory.h>
 
-#include <kpmcore/util/capacity.h>
-#include <kpmcore/util/helpers.h>
+#include <util/capacity.h>
+#include <util/helpers.h>
 #include "util/guihelpers.h"
 
 #include <QFontDatabase>

src/gui/newdialog.h

@@ -21,9 +21,9 @@
 
 #include "gui/sizedialogbase.h"
 
-#include <kpmcore/core/partition.h>
+#include <core/partition.h>
 
-#include <kpmcore/fs/filesystem.h>
+#include <fs/filesystem.h>
 
 class Device;
 

src/gui/partitionmanagerwidget.cpp

@@ -23,30 +23,30 @@
 #include "gui/insertdialog.h"
 #include "gui/editmountpointdialog.h"
 
-#include <kpmcore/core/partition.h>
-#include <kpmcore/core/device.h>
-#include <kpmcore/core/operationstack.h>
-#include <kpmcore/core/partitiontable.h>
+#include <core/partition.h>
+#include <core/device.h>
+#include <core/operationstack.h>
+#include <core/partitiontable.h>
 
-#include <kpmcore/fs/filesystemfactory.h>
+#include <fs/filesystemfactory.h>
 
-#include <kpmcore/gui/partwidget.h>
+#include <gui/partwidget.h>
 
-#include <kpmcore/ops/deleteoperation.h>
-#include <kpmcore/ops/resizeoperation.h>
-#include <kpmcore/ops/newoperation.h>
-#include <kpmcore/ops/copyoperation.h>
-#include <kpmcore/ops/checkoperation.h>
-#include <kpmcore/ops/backupoperation.h>
-#include <kpmcore/ops/restoreoperation.h>
-#include <kpmcore/ops/setfilesystemlabeloperation.h>
-#include <kpmcore/ops/setpartflagsoperation.h>
-#include <kpmcore/ops/createfilesystemoperation.h>
+#include <ops/deleteoperation.h>
+#include <ops/resizeoperation.h>
+#include <ops/newoperation.h>
+#include <ops/copyoperation.h>
+#include <ops/checkoperation.h>
+#include <ops/backupoperation.h>
+#include <ops/restoreoperation.h>
+#include <ops/setfilesystemlabeloperation.h>
+#include <ops/setpartflagsoperation.h>
+#include <ops/createfilesystemoperation.h>
 
-#include <kpmcore/util/globallog.h>
-#include <kpmcore/util/capacity.h>
-#include <kpmcore/util/report.h>
-#include <kpmcore/util/helpers.h>
+#include <util/globallog.h>
+#include <util/capacity.h>
+#include <util/report.h>
+#include <util/helpers.h>
 #include "util/guihelpers.h"
 
 #include <QCursor>

src/gui/partitionmanagerwidget.h

@@ -19,8 +19,8 @@
 
 #define PARTITIONMANAGERWIDGET__H
 
-#include <kpmcore/core/operationstack.h>
-#include <kpmcore/core/operationrunner.h>
+#include <core/operationstack.h>
+#include <core/operationrunner.h>
 
 #include "ui_partitionmanagerwidgetbase.h"
 

src/gui/partpropsdialog.cpp

@@ -18,13 +18,13 @@
 #include "gui/partpropsdialog.h"
 #include "gui/partpropswidget.h"
 
-#include <kpmcore/core/partition.h>
-#include <kpmcore/core/device.h>
+#include <core/partition.h>
+#include <core/device.h>
 
-#include <kpmcore/fs/filesystemfactory.h>
+#include <fs/filesystemfactory.h>
 
-#include <kpmcore/util/capacity.h>
-#include <kpmcore/util/helpers.h>
+#include <util/capacity.h>
+#include <util/helpers.h>
 #include "util/guihelpers.h"
 
 #include <QComboBox>

src/gui/partpropsdialog.h

@@ -19,10 +19,10 @@
 
 #define PARTPROPSDIALOG__H
 
-#include <kpmcore/fs/filesystem.h>
+#include <fs/filesystem.h>
 
-#include <kpmcore/core/partition.h>
-#include <kpmcore/core/partitiontable.h>
+#include <core/partition.h>
+#include <core/partitiontable.h>
 
 #include <QDialog>
 

src/gui/parttablewidget.cpp

@@ -19,9 +19,9 @@
 #include "util/guihelpers.h"
 #include "mainwindow.h"
 
-#include <kpmcore/core/partitiontable.h>
+#include <core/partitiontable.h>
 
-#include <kpmcore/gui/partwidget.h>
+#include <gui/partwidget.h>
 
 #include <QApplication>
 #include <QMouseEvent>

src/gui/parttablewidget.h

@@ -19,7 +19,7 @@
 
 #define PARTTABLEWIDGET__H
 
-#include <kpmcore/gui/partwidgetbase.h>
+#include <gui/partwidgetbase.h>
 
 #include <QList>
 #include <QLabel>

src/gui/resizedialog.cpp

@@ -18,14 +18,14 @@
 #include "gui/resizedialog.h"
 #include "gui/sizedialogwidget.h"
 
-#include <kpmcore/core/partition.h>
-#include <kpmcore/core/device.h>
+#include <core/partition.h>
+#include <core/device.h>
 
-#include <kpmcore/fs/filesystem.h>
+#include <fs/filesystem.h>
 
-#include <kpmcore/ops/resizeoperation.h>
+#include <ops/resizeoperation.h>
 
-#include <kpmcore/util/capacity.h>
+#include <util/capacity.h>
 
 #include <KConfigGroup>
 #include <KLocalizedString>

src/gui/sizedialogbase.cpp

@@ -21,14 +21,14 @@
 
 #include "util/guihelpers.h"
 
-#include <kpmcore/core/partitiontable.h>
-#include <kpmcore/core/device.h>
-#include <kpmcore/core/partition.h>
-#include <kpmcore/core/partitionalignment.h>
+#include <core/partitiontable.h>
+#include <core/device.h>
+#include <core/partition.h>
+#include <core/partitionalignment.h>
 
-#include <kpmcore/gui/partresizerwidget.h>
+#include <gui/partresizerwidget.h>
 
-#include <kpmcore/util/capacity.h>
+#include <util/capacity.h>
 
 #include <KLocalizedString>
 

src/gui/sizedialogbase.h

@@ -18,7 +18,7 @@
 
 #define SIZEDIALOGBASE__H
 
-#include <kpmcore/util/capacity.h>
+#include <util/capacity.h>
 
 #include <qglobal.h>
 #include <QDebug>

src/gui/smartdialog.cpp

@@ -18,12 +18,12 @@
 #include "gui/smartdialog.h"
 #include "gui/smartdialogwidget.h"
 
-#include <kpmcore/core/device.h>
-#include <kpmcore/core/smartstatus.h>
-#include <kpmcore/core/smartattribute.h>
+#include <core/device.h>
+#include <core/smartstatus.h>
+#include <core/smartattribute.h>
 
-#include <kpmcore/util/helpers.h>
-#include <kpmcore/util/htmlreport.h>
+#include <util/helpers.h>
+#include <util/htmlreport.h>
 
 #include <QDialogButtonBox>
 #include <QFileDialog>

src/gui/smartdialogwidget.cpp

@@ -17,7 +17,7 @@
 
 #include "gui/smartdialogwidget.h"
 
-#include <kpmcore/util/helpers.h>
+#include <util/helpers.h>
 
 #include <KLocalizedString>
 

src/gui/treelog.cpp

@@ -19,8 +19,8 @@
 
 #include "gui/partitionmanagerwidget.h"
 
-#include <kpmcore/util/globallog.h>
-#include <kpmcore/util/helpers.h>
+#include <util/globallog.h>
+#include <util/helpers.h>
 
 #include <QDateTime>
 #include <QDebug>

src/gui/treelog.h

@@ -21,7 +21,7 @@
 
 #include "ui_treelogbase.h"
 
-#include <kpmcore/util/globallog.h>
+#include <util/globallog.h>
 
 #include <QWidget>
 

src/main.cpp

@@ -17,10 +17,10 @@
 
 #include "gui/mainwindow.h"
 
-#include <kpmcore/backend/corebackend.h>
-#include <kpmcore/backend/corebackendmanager.h>
+#include <backend/corebackend.h>
+#include <backend/corebackendmanager.h>
 
-#include <kpmcore/util/helpers.h>
+#include <util/helpers.h>
 #include "util/guihelpers.h"
 
 #include <QApplication>

src/partitionmanager.kcfg

@@ -4,8 +4,8 @@
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 		xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
 	<kcfgfile arg="true"/>
-	<include>kpmcore/fs/filesystem.h</include>
-	<include>kpmcore/util/capacity.h</include>
+	<include>fs/filesystem.h</include>
+	<include>util/capacity.h</include>
 	<group name="KDE Partition Manager">
 		<entry name="treePartitionColumnWidths" type="IntList" hidden="true">
 			<default>140,90,90,90,0,90,90,0,0,0,0,0</default>

src/util/guihelpers.cpp

@@ -17,7 +17,7 @@
 
 #include "util/guihelpers.h"
 
-#include <kpmcore/backend/corebackendmanager.h>
+#include <backend/corebackendmanager.h>
 
 #include <QApplication>
 #include <QFileInfo>

src/util/guihelpers.h

@@ -19,8 +19,8 @@
 
 #define GUIHELPERS__H
 
-#include <kpmcore/fs/filesystem.h>
-#include <kpmcore/util/capacity.h>
+#include <fs/filesystem.h>
+#include <util/capacity.h>
 
 class QString;
 class QIcon;