From 8885611ae3d84913cb08dacc34ccc4853e4555ce Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 13 Jun 2019 12:27:21 +0200 Subject: [PATCH] [libcalamares] Fix build with non-namespaced KPMCore types --- src/libcalamares/partition/PartitionIterator.h | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/src/libcalamares/partition/PartitionIterator.h b/src/libcalamares/partition/PartitionIterator.h index 1e2a41bea..c91a452ad 100644 --- a/src/libcalamares/partition/PartitionIterator.h +++ b/src/libcalamares/partition/PartitionIterator.h @@ -44,25 +44,23 @@ namespace Partition class PartitionIterator { public: - using Partition = ::Partition; - - Partition* operator*() const; + ::Partition* operator*() const; void operator++(); bool operator==( const PartitionIterator& other ) const; bool operator!=( const PartitionIterator& other ) const; - static PartitionIterator begin( Device* device ); - static PartitionIterator begin( PartitionTable* table ); - static PartitionIterator end( Device* device ); - static PartitionIterator end( PartitionTable* table ); + static PartitionIterator begin( ::Device* device ); + static PartitionIterator begin( ::PartitionTable* table ); + static PartitionIterator end( ::Device* device ); + static PartitionIterator end( ::PartitionTable* table ); private: - PartitionIterator( PartitionTable* table ); + PartitionIterator( ::PartitionTable* table ); - PartitionTable* m_table; - Partition* m_current = nullptr; + ::PartitionTable* m_table; + ::Partition* m_current = nullptr; }; } // namespace Partition