Updated copyright year.

[mutilities/MUtilities.git] / src / Version.cpp

diff --git a/src/Version.cpp b/src/Version.cpp
index b55e528..762e1c8 100644 (file)
--- a/src/Version.cpp
+++ b/src/Version.cpp
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // MuldeR's Utilities for Qt
-// Copyright (C) 2004-2014 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2022 LoRd_MuldeR <MuldeR2@GMX.de>
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -19,24 +19,29 @@
 // http://www.gnu.org/licenses/lgpl-2.1.txt
 //////////////////////////////////////////////////////////////////////////////////
 
-#pragma once
-
+//MUtils
 #include <MUtils/Version.h>
-
 #include <MUtils/Global.h>
 #include <MUtils/Exception.h>
+#include <MUtils/OSSupport.h>
+
+//Internal
+#define MUTILS_INC_CONFIG 1
+#include "Config.h"
 
 ///////////////////////////////////////////////////////////////////////////////
+// HELPER FUNCTIONS
+///////////////////////////////////////////////////////////////////////////////
 
 static const char *g_months_lut[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 
-static int month2int(const char *str)
+static int month_str2int(const char *str)
 {
        int ret = 0;
 
        for(int j = 0; j < 12; j++)
        {
-               if(!_strcmpi(str, g_months_lut[j]))
+               if(!_strnicmp(str, g_months_lut[j], 3))
                {
                        ret = j+1;
                        break;
@@ -46,36 +51,78 @@ static int month2int(const char *str)
        return ret;
 }
 
-const QDate MUtils::Version::build_date(const char *const raw_date)
+static const QDate decode_date_str(const char *const date_str) //Mmm dd yyyy
 {
        int date[3] = {0, 0, 0};
-       char temp_m[4], temp_d[3], temp_y[5];
-
-       temp_m[0] = raw_date[0x0];
-       temp_m[1] = raw_date[0x1];
-       temp_m[2] = raw_date[0x2];
-       temp_m[3] = 0x00;
-
-       temp_d[0] = raw_date[0x4];
-       temp_d[1] = raw_date[0x5];
-       temp_d[2] = 0x00;
-
-       temp_y[0] = raw_date[0x7];
-       temp_y[1] = raw_date[0x8];
-       temp_y[2] = raw_date[0x9];
-       temp_y[3] = raw_date[0xA];
-       temp_y[4] = 0x00;
-               
-       date[0] = atoi(temp_y);
-       date[1] = month2int(temp_m);
-       date[2] = atoi(temp_d);
-
-       if(!((date[0] > 0) && (date[1] > 0) && (date[2] > 0)))
+
+       if(sscanf_s(date_str, "%*3s %2d %4d", &date[2], &date[0]) != 2)
        {
                MUTILS_THROW("Internal error: Date format could not be recognized!");
        }
-       
+
+       if((date[1] = month_str2int(date_str)) < 1)
+       {
+               MUTILS_THROW("Internal error: Date format could not be recognized!");
+       }
+
+       //qWarning("MUtils::Version::build_date: y=%d, m=%d, d=%d", date[0], date[1], date[2]);
        return QDate(date[0], date[1], date[2]);
 }
 
+static const QTime decode_time_str(const char *const time_str) //hh:mm:ss
+{
+       int time[3] = {0, 0, 0};
+
+       if(sscanf_s(time_str, "%2d:%2d:%2d", &time[0], &time[1], &time[2]) != 3)
+       {
+               MUTILS_THROW("Internal error: Time format could not be recognized!");
+       }
+
+       //qWarning("MUtils::Version::build_date: h=%d, m=%d, s=%d", time[0], time[1], time[2]);
+       return QTime(time[0], time[1], time[2]);
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// LIB VERSION
+///////////////////////////////////////////////////////////////////////////////
+
+const QDate MUtils::Version::lib_build_date(void)
+{
+       static const char *const BUILD_DATE = __DATE__;
+       return decode_date_str(BUILD_DATE);
+}
+
+const QTime MUtils::Version::lib_build_time(void)
+{
+       static const char *const BUILD_TIME = __TIME__;
+       return decode_time_str(BUILD_TIME);
+}
+
+const quint32 &MUtils::Version::lib_version_major(void)
+{
+       static const quint32 VERSION_MAJOR = VER_MUTILS_MAJOR;
+       return VERSION_MAJOR;
+}
+
+const quint32 &MUtils::Version::lib_version_minor(void)
+{
+       static const quint32 VERSION_MINOR = (10 * VER_MUTILS_MINOR_HI) + VER_MUTILS_MINOR_LO;
+       return VERSION_MINOR;
+}
+
+
+///////////////////////////////////////////////////////////////////////////////
+// APP VERSION
+///////////////////////////////////////////////////////////////////////////////
+
+const QDate MUtils::Version::app_build_date(const char *const date_str)
+{
+       return decode_date_str(date_str);
+}
+
+const QTime MUtils::Version::app_build_time(const char *const time_str)
+{
+       return decode_time_str(time_str);
+}
+
 ///////////////////////////////////////////////////////////////////////////////