From 73bfc6ca32fb88816aa2cda163eaa367adaa4b17 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 7 Sep 2021 11:38:54 +0200
Subject: [PATCH] [libcalamares] Use structured bindings to unpack a std::pair

---
 src/libcalamares/locale/Translation.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libcalamares/locale/Translation.cpp b/src/libcalamares/locale/Translation.cpp
index 0a2e594be..4afb1bbc8 100644
--- a/src/libcalamares/locale/Translation.cpp
+++ b/src/libcalamares/locale/Translation.cpp
@@ -56,11 +56,11 @@ Translation::Translation( const QString& locale, LabelFormat format, QObject* pa
     , m_locale( getLocale( locale ) )
     , m_localeId( locale.isEmpty() ? m_locale.name() : locale )
 {
-    auto special = specialCase( locale );
+    auto [ _, name ] = specialCase( locale );
 
     QString longFormat = QObject::tr( "%1 (%2)" );
 
-    QString languageName = special.second ? *special.second : m_locale.nativeLanguageName();
+    QString languageName = name ? *name : m_locale.nativeLanguageName();
     QString englishName = m_locale.languageToString( m_locale.language() );
 
     if ( languageName.isEmpty() )
@@ -87,8 +87,8 @@ Translation::getLocale( const QString& localeName )
         return QLocale();
     }
 
-    auto special = specialCase( localeName );
-    return special.first ? *special.first : QLocale( localeName );
+    auto [ locale, _ ] = specialCase( localeName );
+    return locale ? *locale : QLocale( localeName );
 }
 
 }  // namespace Locale