[locale] Convenience function for TZ splitting

src/modules/locale/GeoIP.cpp

@@ -18,6 +18,23 @@
 
 #include "GeoIP.h"
 
+#include "utils/Logger.h"
+
 GeoIP::~GeoIP()
 {
 }
+
+GeoIP::RegionZonePair
+GeoIP::splitTZString( const QString& timezoneString )
+{
+    QStringList tzParts = timezoneString.split( '/', QString::SkipEmptyParts );
+    if ( tzParts.size() >= 2 )
+    {
+        cDebug() << "GeoIP reporting" << timezoneString;
+        QString region = tzParts.takeFirst();
+        QString zone = tzParts.join( '/' );
+        return qMakePair( region, zone );
+    }
+
+    return qMakePair( QString(), QString() );
+}

src/modules/locale/GeoIP.h

@@ -36,6 +36,8 @@ struct GeoIP
 {
     using RegionZonePair = QPair<QString, QString>;
 
+    virtual ~GeoIP();
+
     /** @brief Handle a (successful) request by interpreting the data.
      *
      * Should return a ( <zone>, <region> ) pair, e.g.
@@ -47,7 +49,8 @@ struct GeoIP
      */
     virtual RegionZonePair processReply( QNetworkReply* ) = 0;
 
-    virtual ~GeoIP();
+    /** @brief Splits a region/zone string into a pair. */
+    static RegionZonePair splitTZString( const QString& s );
 } ;
 
 #endif

src/modules/locale/GeoIPFreeGeoIP.cpp

@@ -44,15 +44,7 @@ FreeGeoIP::processReply( QNetworkReply* reply )
             if ( map.contains( "time_zone" ) &&
                 !map.value( "time_zone" ).toString().isEmpty() )
             {
-                QString timezoneString = map.value( "time_zone" ).toString();
+                return splitTZString( map.value( "time_zone" ).toString() );
-                QStringList tzParts = timezoneString.split( '/', QString::SkipEmptyParts );
-                if ( tzParts.size() >= 2 )
-                {
-                    cDebug() << "GeoIP reporting" << timezoneString;
-                    QString region = tzParts.takeFirst();
-                    QString zone = tzParts.join( '/' );
-                    return qMakePair( region, zone );
-                }
             }
         }
     }