From 7b70d3fc6f77a47124f3b06160f17ade79269c6c Mon Sep 17 00:00:00 2001 From: Ladislav Michl Date: Sun, 21 Jan 2024 17:14:47 +0100 Subject: [PATCH] Base: Move currentDateTimeString out of TimeInfo currentDateTimeString does not have anything in common with TimeInfo class, move it into Tools. --- src/App/Document.cpp | 4 ++-- src/Base/TimeInfo.cpp | 8 -------- src/Base/TimeInfo.h | 1 - src/Base/Tools.cpp | 9 +++++++++ src/Base/Tools.h | 2 ++ src/Mod/Cloud/App/AppCloud.cpp | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/App/Document.cpp b/src/App/Document.cpp index 0c7009717b..14c5a67bb6 100644 --- a/src/App/Document.cpp +++ b/src/App/Document.cpp @@ -798,7 +798,7 @@ Document::Document(const char* documentName) #ifdef FC_LOGUPDATECHAIN Console().Log("+App::Document: %p\n", this); #endif - std::string CreationDateString = Base::TimeInfo::currentDateTimeString(); + std::string CreationDateString = Base::Tools::currentDateTimeString(); std::string Author = App::GetApplication() .GetParameterGroupByPath("User parameter:BaseApp/Preferences/Document") ->GetASCII("prefAuthor", ""); @@ -1606,7 +1606,7 @@ bool Document::save () TipName.setValue(Tip.getValue()->getNameInDocument()); } - std::string LastModifiedDateString = Base::TimeInfo::currentDateTimeString(); + std::string LastModifiedDateString = Base::Tools::currentDateTimeString(); LastModifiedDate.setValue(LastModifiedDateString.c_str()); // set author if needed bool saveAuthor = App::GetApplication().GetParameterGroupByPath diff --git a/src/Base/TimeInfo.cpp b/src/Base/TimeInfo.cpp index 0fd6bb9fe9..e8b29aaef1 100644 --- a/src/Base/TimeInfo.cpp +++ b/src/Base/TimeInfo.cpp @@ -77,14 +77,6 @@ void TimeInfo::setTime_t(int64_t seconds) timebuffer.time = seconds; } -std::string TimeInfo::currentDateTimeString() -{ - return QDateTime::currentDateTime() - .toTimeSpec(Qt::OffsetFromUTC) - .toString(Qt::ISODate) - .toStdString(); -} - std::string TimeInfo::diffTime(const TimeInfo& timeStart, const TimeInfo& timeEnd) { std::stringstream str; diff --git a/src/Base/TimeInfo.h b/src/Base/TimeInfo.h index ae9164d41d..350ef2d09c 100644 --- a/src/Base/TimeInfo.h +++ b/src/Base/TimeInfo.h @@ -81,7 +81,6 @@ public: bool operator>=(const TimeInfo& time) const; bool operator>(const TimeInfo& time) const; - static std::string currentDateTimeString(); static std::string diffTime(const TimeInfo& timeStart, const TimeInfo& timeEnd = TimeInfo()); static float diffTimeF(const TimeInfo& timeStart, const TimeInfo& timeEnd = TimeInfo()); bool isNull() const; diff --git a/src/Base/Tools.cpp b/src/Base/Tools.cpp index 54a494c7fd..6875fa8f4f 100644 --- a/src/Base/Tools.cpp +++ b/src/Base/Tools.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #endif @@ -365,6 +366,14 @@ std::string Base::Tools::joinList(const std::vector& vec, const std return str.str(); } +std::string Base::Tools::currentDateTimeString() +{ + return QDateTime::currentDateTime() + .toTimeSpec(Qt::OffsetFromUTC) + .toString(Qt::ISODate) + .toStdString(); +} + // ---------------------------------------------------------------------------- using namespace Base; diff --git a/src/Base/Tools.h b/src/Base/Tools.h index 4f2c957b4b..d45777c962 100644 --- a/src/Base/Tools.h +++ b/src/Base/Tools.h @@ -346,6 +346,8 @@ struct BaseExport Tools * @return */ static std::string joinList(const std::vector& vec, const std::string& sep = ", "); + + static std::string currentDateTimeString(); }; diff --git a/src/Mod/Cloud/App/AppCloud.cpp b/src/Mod/Cloud/App/AppCloud.cpp index bdbc52485f..8da272a57d 100644 --- a/src/Mod/Cloud/App/AppCloud.cpp +++ b/src/Mod/Cloud/App/AppCloud.cpp @@ -1359,7 +1359,7 @@ bool Cloud::Module::cloudSave(const char* BucketName) doc->TipName.setValue(doc->Tip.getValue()->getNameInDocument()); } - std::string LastModifiedDateString = Base::TimeInfo::currentDateTimeString(); + std::string LastModifiedDateString = Base::Tools::currentDateTimeString(); doc->LastModifiedDate.setValue(LastModifiedDateString.c_str()); // set author if needed bool saveAuthor = App::GetApplication()