From 2c94cbdb14cf63e4d7ab593dce34de12d6dba608 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 13 May 2019 12:25:14 +0200
Subject: [PATCH] [libcalamares] namespace A::B is a C++17 extension

---
 src/libcalamares/geoip/GeoIPJSON.cpp | 7 ++++---
 src/libcalamares/geoip/GeoIPJSON.h   | 5 ++++-
 src/libcalamares/geoip/GeoIPXML.h    | 5 ++++-
 src/libcalamares/geoip/Handler.cpp   | 6 ++++--
 src/libcalamares/geoip/Handler.h     | 6 ++++--
 src/libcalamares/geoip/Interface.cpp | 5 ++++-
 src/libcalamares/geoip/Interface.h   | 6 ++++--
 7 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/libcalamares/geoip/GeoIPJSON.cpp b/src/libcalamares/geoip/GeoIPJSON.cpp
index 61b9fd8d6..4b7562d7e 100644
--- a/src/libcalamares/geoip/GeoIPJSON.cpp
+++ b/src/libcalamares/geoip/GeoIPJSON.cpp
@@ -25,7 +25,9 @@
 
 #include <QByteArray>
 
-namespace CalamaresUtils::GeoIP
+namespace CalamaresUtils
+{
+namespace GeoIP
 {
 
 GeoIPJSON::GeoIPJSON(const QString& attribute)
@@ -88,6 +90,5 @@ GeoIPJSON::processReply( const QByteArray& data )
     return splitTZString( rawReply( data ) );
 }
 
-
-
+}
 }  // namespace
diff --git a/src/libcalamares/geoip/GeoIPJSON.h b/src/libcalamares/geoip/GeoIPJSON.h
index 584825d70..4d7ded631 100644
--- a/src/libcalamares/geoip/GeoIPJSON.h
+++ b/src/libcalamares/geoip/GeoIPJSON.h
@@ -21,7 +21,9 @@
 
 #include "Interface.h"
 
-namespace CalamaresUtils::GeoIP
+namespace CalamaresUtils
+{
+namespace GeoIP
 {
 /** @brief GeoIP lookup for services that return JSON.
  *
@@ -46,5 +48,6 @@ public:
     virtual QString rawReply(const QByteArray & ) override;
 } ;
 
+}
 }  // namespace
 #endif
diff --git a/src/libcalamares/geoip/GeoIPXML.h b/src/libcalamares/geoip/GeoIPXML.h
index 7dee2ecbe..356e88b12 100644
--- a/src/libcalamares/geoip/GeoIPXML.h
+++ b/src/libcalamares/geoip/GeoIPXML.h
@@ -21,7 +21,9 @@
 
 #include "Interface.h"
 
-namespace CalamaresUtils::GeoIP
+namespace CalamaresUtils
+{
+namespace GeoIP
 {
 /** @brief GeoIP lookup with XML data
  *
@@ -46,5 +48,6 @@ public:
     virtual QString rawReply(const QByteArray & ) override;
 } ;
 
+}
 }  // namespace
 #endif
diff --git a/src/libcalamares/geoip/Handler.cpp b/src/libcalamares/geoip/Handler.cpp
index 1e8b03b26..4add3eb13 100644
--- a/src/libcalamares/geoip/Handler.cpp
+++ b/src/libcalamares/geoip/Handler.cpp
@@ -47,7 +47,9 @@ handlerTypes()
     return names;
 }
 
-namespace CalamaresUtils::GeoIP
+namespace CalamaresUtils
+{
+namespace GeoIP
 {
 
 Handler::Handler()
@@ -179,5 +181,5 @@ Handler::queryRaw() const
         } );
 }
 
-
+}
 }  // namespace
diff --git a/src/libcalamares/geoip/Handler.h b/src/libcalamares/geoip/Handler.h
index 92e5f326e..5c3207b60 100644
--- a/src/libcalamares/geoip/Handler.h
+++ b/src/libcalamares/geoip/Handler.h
@@ -25,8 +25,9 @@
 #include <QString>
 #include <QVariantMap>
 
-namespace CalamaresUtils {}
-namespace CalamaresUtils::GeoIP
+namespace CalamaresUtils 
+{
+namespace GeoIP
 {
 
 /** @brief Handle one complete GeoIP lookup.
@@ -86,6 +87,7 @@ private:
     const QString m_selector;
 };
 
+}
 }  // namespace
 #endif
 
diff --git a/src/libcalamares/geoip/Interface.cpp b/src/libcalamares/geoip/Interface.cpp
index 50aa04683..36e680aab 100644
--- a/src/libcalamares/geoip/Interface.cpp
+++ b/src/libcalamares/geoip/Interface.cpp
@@ -20,7 +20,9 @@
 
 #include "utils/Logger.h"
 
-namespace CalamaresUtils::GeoIP
+namespace CalamaresUtils
+{
+namespace GeoIP
 {
 
 Interface::Interface(const QString& e)
@@ -51,4 +53,5 @@ splitTZString( const QString& tz )
     return RegionZonePair( QString(), QString() );
 }
 
+}
 }  // namespace
diff --git a/src/libcalamares/geoip/Interface.h b/src/libcalamares/geoip/Interface.h
index 4b2ff3a5a..7db8c4c91 100644
--- a/src/libcalamares/geoip/Interface.h
+++ b/src/libcalamares/geoip/Interface.h
@@ -27,8 +27,9 @@
 
 class QByteArray;
 
-namespace CalamaresUtils {}
-namespace CalamaresUtils::GeoIP
+namespace CalamaresUtils 
+{
+namespace GeoIP
 {
 /** @brief A Region, Zone pair of strings
  *
@@ -94,5 +95,6 @@ protected:
     QString m_element;  // string for selecting from data
 } ;
 
+}
 }  // namespace
 #endif