From aa6924aad6698e91713e61b51b3c838f06fcbaff Mon Sep 17 00:00:00 2001 From: Thilo Graf Date: Wed, 14 Oct 2020 08:32:54 +0200 Subject: [PATCH] imageinfo: outsource build date info init into own member --- src/gui/imageinfo.cpp | 25 +++++++++++++++---------- src/gui/imageinfo.h | 1 + 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 81f561f05..4f3208c7d 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -307,15 +307,6 @@ void CImageInfo::InitInfoData() config.loadConfig(VERSION_FILE); - string builddate = ""; -#ifdef BUILT_DATE - builddate = BUILT_DATE; -#else - builddate = config.getString("builddate", "").c_str(); -#endif - if (builddate.empty()) - builddate = PACKAGE_VERSION_DATE; - string version_string = config.getString("version", ""); #ifdef IMAGE_VERSION @@ -358,7 +349,8 @@ void CImageInfo::InitInfoData() //kernel initKernelInfo(); - v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_DATE), builddate}); + //build date + initBuildDateInfo(); //creator string creator = config.getString("creator", ""); @@ -385,6 +377,19 @@ void CImageInfo::InitInfoData() initSupportInfo(); } +void CImageInfo::initBuildDateInfo() +{ + string builddate = ""; +#ifdef BUILT_DATE + builddate = BUILT_DATE; +#else + builddate = config.getString("builddate", "").c_str(); +#endif + if (builddate.empty()) + builddate = PACKAGE_VERSION_DATE; + v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_DATE), builddate}); +} + void CImageInfo::initHalInfo() { #if USE_STB_HAL diff --git a/src/gui/imageinfo.h b/src/gui/imageinfo.h index 7628232a7..29f0cba3b 100644 --- a/src/gui/imageinfo.h +++ b/src/gui/imageinfo.h @@ -58,6 +58,7 @@ class CImageInfo : public CMenuTarget void InitMinitv(); void InitInfos(); void InitBuildInfos(); + void initBuildDateInfo(); void initKernelInfo(); void initHalInfo(); void InitInfoText(const std::string& text);