From 906aeec5d3f98ee485e2f534b75e1a54d438c5d7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 25 Nov 2019 11:49:41 +0100
Subject: [PATCH] [locale] Replace #define with a static const
- TZ_DATA_FILE is only used in one place
---
src/modules/locale/timezonewidget/localeconst.h | 1 -
src/modules/locale/timezonewidget/localeglobal.cpp | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/modules/locale/timezonewidget/localeconst.h b/src/modules/locale/timezonewidget/localeconst.h
index 3bac6adde..2de1b0dac 100644
--- a/src/modules/locale/timezonewidget/localeconst.h
+++ b/src/modules/locale/timezonewidget/localeconst.h
@@ -25,7 +25,6 @@
#define LOCALESDIR "/usr/share/i18n/locales"
-#define TZ_DATA_FILE "/usr/share/zoneinfo/zone.tab"
#define USER_IMAGES_PATH "/usr/share/pixmaps/faces"
diff --git a/src/modules/locale/timezonewidget/localeglobal.cpp b/src/modules/locale/timezonewidget/localeglobal.cpp
index 6303ffdcb..683b2bebc 100644
--- a/src/modules/locale/timezonewidget/localeglobal.cpp
+++ b/src/modules/locale/timezonewidget/localeglobal.cpp
@@ -131,6 +131,8 @@ LocaleGlobal::initLocales() {
void
LocaleGlobal::initLocations() {
+ static const char TZ_DATA_FILE[] = "/usr/share/zoneinfo/zone.tab";
+
locations.clear();
QFile file(TZ_DATA_FILE);