From c0710cabe4700eff45427b82f41ab6b72b8b070d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 12 Apr 2019 11:21:18 +0200
Subject: [PATCH] [partition] [fsresizer] Adjust to new #define

 - Using KPMCORE4API is clearer than just relying on a version number
---
 src/modules/fsresizer/ResizeFSJob.cpp              | 2 +-
 src/modules/partition/core/DeviceList.cpp          | 2 +-
 src/modules/partition/core/KPMHelpers.h            | 2 +-
 src/modules/partition/core/PartitionCoreModule.cpp | 4 ++--
 src/modules/partition/gui/ChoicePage.cpp           | 4 ++--
 src/modules/partition/gui/PartitionPage.cpp        | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/modules/fsresizer/ResizeFSJob.cpp b/src/modules/fsresizer/ResizeFSJob.cpp
index fa197e476..d2cfaf6ed 100644
--- a/src/modules/fsresizer/ResizeFSJob.cpp
+++ b/src/modules/fsresizer/ResizeFSJob.cpp
@@ -120,7 +120,7 @@ ResizeFSJob::PartitionMatch
 ResizeFSJob::findPartition( CoreBackend* backend )
 {
     using DeviceList = QList< Device* >;
-#ifdef WITH_KPMCOREGT33
+#ifdef WITH_KPMCORE4API
     DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag(0) );
 #else
     DeviceList devices = backend->scanDevices( /* excludeReadOnly */ true );
diff --git a/src/modules/partition/core/DeviceList.cpp b/src/modules/partition/core/DeviceList.cpp
index cef1c0414..b65473cf6 100644
--- a/src/modules/partition/core/DeviceList.cpp
+++ b/src/modules/partition/core/DeviceList.cpp
@@ -107,7 +107,7 @@ QList< Device* > getDevices( DeviceType which, qint64 minimumSize )
     bool writableOnly = (which == DeviceType::WritableOnly);
 
     CoreBackend* backend = CoreBackendManager::self()->backend();
-#ifdef WITH_KPMCOREGT33
+#ifdef WITH_KPMCORE4API
     DeviceList devices = backend->scanDevices( /* not includeReadOnly, not includeLoopback */ ScanFlag(0) );
 #else
     DeviceList devices = backend->scanDevices( /* excludeReadOnly */ true );
diff --git a/src/modules/partition/core/KPMHelpers.h b/src/modules/partition/core/KPMHelpers.h
index f1b8bd8a9..aa279b1fb 100644
--- a/src/modules/partition/core/KPMHelpers.h
+++ b/src/modules/partition/core/KPMHelpers.h
@@ -33,7 +33,7 @@ class Partition;
 class PartitionNode;
 class PartitionRole;
 
-#ifdef WITH_KPMCOREGT33
+#ifdef WITH_KPMCORE4API
 #define KPM_PARTITION_FLAG(x) PartitionTable::Flag::x
 #define KPM_PARTITION_STATE(x) Partition::State::x
 #define KPM_PARTITION_FLAG_ESP PartitionTable::Flag::Boot
diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index f183d6c40..df331f04b 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -683,7 +683,7 @@ PartitionCoreModule::scanForLVMPVs()
         }
     }
 
-#ifdef WITH_KPMCOREGT33
+#ifdef WITH_KPMCORE4API
     VolumeManagerDevice::scanDevices( physicalDevices );
 
     for ( auto p : LVM::pvList::list() )
@@ -724,7 +724,7 @@ PartitionCoreModule::scanForLVMPVs()
                     if ( innerFS && innerFS->type() == FileSystem::Type::Lvm2_PV )
                         m_lvmPVs << p;
                 }
-#ifdef WITH_KPMCOREGT33
+#ifdef WITH_KPMCORE4API
                 else if ( p->fileSystem().type() == FileSystem::Type::Luks2 )
                 {
                     // Encrypted LVM PVs
diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 10f73964f..edeee11a6 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -51,7 +51,7 @@
 
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
-#ifdef WITH_KPMCOREGT33
+#ifdef WITH_KPMCORE4API
 #include <kpmcore/core/softwareraid.h>
 #endif
 
@@ -1224,7 +1224,7 @@ ChoicePage::setupActions()
     bool atLeastOneIsMounted = false;  // Suppress 'erase' if so
     bool isInactiveRAID = false;
 
-#ifdef WITH_KPMCOREGT33
+#ifdef WITH_KPMCORE4API
     if ( currentDevice->type() == Device::Type::SoftwareRAID_Device &&
          static_cast< SoftwareRAID* >(currentDevice)->status() == SoftwareRAID::Status::Inactive )
     {
diff --git a/src/modules/partition/gui/PartitionPage.cpp b/src/modules/partition/gui/PartitionPage.cpp
index 5f16e9dc1..22398bddb 100644
--- a/src/modules/partition/gui/PartitionPage.cpp
+++ b/src/modules/partition/gui/PartitionPage.cpp
@@ -49,7 +49,7 @@
 // KPMcore
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
-#ifdef WITH_KPMCOREGT33
+#ifdef WITH_KPMCORE4API
 #include <kpmcore/core/softwareraid.h>
 #endif
 #include <kpmcore/ops/deactivatevolumegroupoperation.h>
@@ -162,7 +162,7 @@ PartitionPage::updateButtons()
         {
             createTable = true;
 
-#ifdef WITH_KPMCOREGT33
+#ifdef WITH_KPMCORE4API
             if ( device->type() == Device::Type::SoftwareRAID_Device &&
                  static_cast< SoftwareRAID* >(device)->status() == SoftwareRAID::Status::Inactive )
             {