From 98c7cec732ba76349c3b06bc076b91fadcd68625 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 25 Oct 2020 18:52:38 +0100
Subject: [PATCH] CMake: restore NOTREACHED, without the macro-mess

- gcc (up to at least version 10) is worse at recognizing that all
  cases have been handled, so it complains about all the switches
  that cover enum values.
---
 src/calamares/CalamaresWindow.cpp                     | 1 +
 src/libcalamares/partition/PartitionSize.cpp          | 7 ++++++-
 src/libcalamares/utils/Yaml.cpp                       | 1 +
 src/modules/netinstall/Config.cpp                     | 1 +
 src/modules/packagechooser/PackageChooserViewStep.cpp | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index b062c0b4d..a141317e0 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -271,6 +271,7 @@ flavoredWidget( Calamares::Branding::PanelFlavor flavor,
     case Calamares::Branding::PanelFlavor::None:
         return nullptr;
     }
+    __builtin_unreachable();
 }
 
 /** @brief Adds widgets to @p layout if they belong on this @p side
diff --git a/src/libcalamares/partition/PartitionSize.cpp b/src/libcalamares/partition/PartitionSize.cpp
index 82444da6a..ddd3be2ef 100644
--- a/src/libcalamares/partition/PartitionSize.cpp
+++ b/src/libcalamares/partition/PartitionSize.cpp
@@ -139,6 +139,7 @@ PartitionSize::toBytes( qint64 totalSectors, qint64 sectorSize ) const
     case SizeUnit::GiB:
         return toBytes();
     }
+    __builtin_unreachable();
 }
 
 qint64
@@ -175,7 +176,7 @@ PartitionSize::toBytes( qint64 totalBytes ) const
     case SizeUnit::GiB:
         return toBytes();
     }
-
+    __builtin_unreachable();
 }
 
 qint64
@@ -206,6 +207,7 @@ PartitionSize::toBytes() const
     case SizeUnit::GiB:
         return CalamaresUtils::GiBtoBytes( static_cast< unsigned long long >( value() ) );
     }
+    __builtin_unreachable();
 }
 
 bool
@@ -231,6 +233,7 @@ PartitionSize::operator<( const PartitionSize& other ) const
     case SizeUnit::GiB:
         return ( toBytes() < other.toBytes() );
     }
+    __builtin_unreachable();
 }
 
 bool
@@ -256,6 +259,7 @@ PartitionSize::operator>( const PartitionSize& other ) const
     case SizeUnit::GiB:
         return ( toBytes() > other.toBytes() );
     }
+    __builtin_unreachable();
 }
 
 bool
@@ -281,6 +285,7 @@ PartitionSize::operator==( const PartitionSize& other ) const
     case SizeUnit::GiB:
         return ( toBytes() == other.toBytes() );
     }
+    __builtin_unreachable();
 }
 
 }  // namespace Partition
diff --git a/src/libcalamares/utils/Yaml.cpp b/src/libcalamares/utils/Yaml.cpp
index f999b8bb0..dd7523ae4 100644
--- a/src/libcalamares/utils/Yaml.cpp
+++ b/src/libcalamares/utils/Yaml.cpp
@@ -52,6 +52,7 @@ yamlToVariant( const YAML::Node& node )
     case YAML::NodeType::Undefined:
         return QVariant();
     }
+    __builtin_unreachable();
 }
 
 
diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp
index 92cdcb2bf..e69b3c2a4 100644
--- a/src/modules/netinstall/Config.cpp
+++ b/src/modules/netinstall/Config.cpp
@@ -43,6 +43,7 @@ Config::status() const
     case Status::FailedNetworkError:
         return tr( "Network Installation. (Disabled: Unable to fetch package lists, check your network connection)" );
     }
+    __builtin_unreachable();
 }
 
 
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index b649e6431..d576f2753 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -110,6 +110,7 @@ PackageChooserViewStep::isNextEnabled() const
         // exactly one OR one or more
         return m_widget->hasSelection();
     }
+    __builtin_unreachable();
 }