From a1b1ebcd29fc0e6b8c1e0b892a07a44a281b1616 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Wed, 1 May 2019 06:31:31 -0400 Subject: [PATCH] [locale] Compile with moved GeoIP handling --- src/modules/locale/LocaleViewStep.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp index d321b8501..104abbfc2 100644 --- a/src/modules/locale/LocaleViewStep.cpp +++ b/src/modules/locale/LocaleViewStep.cpp @@ -19,18 +19,19 @@ #include "LocaleViewStep.h" -#include "GeoIP.h" -#include "GeoIPJSON.h" -#ifdef HAVE_XML -#include "GeoIPXML.h" -#endif -#include "GlobalStorage.h" -#include "JobQueue.h" #include "LocalePage.h" - #include "timezonewidget/localeglobal.h" #include "widgets/WaitingWidget.h" +#include "GlobalStorage.h" +#include "JobQueue.h" + +#include "geoip/GeoIP.h" +#include "geoip/GeoIPJSON.h" +#ifdef HAVE_XML +#include "geoip/GeoIPXML.h" +#endif + #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" #include "utils/Variant.h"