X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Flyxtime.h;h=8fa58733fb6eb044d13c33b8ee05c48dea7b7341;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=620965aebc46ceb9d484275e385c363aa3985348;hpb=0dee3eff18078be7b931a3a409197f3f4dcc43b4;p=lyx.git diff --git a/src/support/lyxtime.h b/src/support/lyxtime.h index 620965aebc..8fa58733fb 100644 --- a/src/support/lyxtime.h +++ b/src/support/lyxtime.h @@ -16,6 +16,8 @@ #include #include +#include "strfwd.h" + namespace lyx { namespace support { @@ -25,16 +27,21 @@ time_t current_time(); /** Returns a locale-dependent formatting of the date *  and time encoded in \c time. The \p fmt string * holds the formatting arguments of \c strftime. + * Prefer the function formatted_datetime below. */ std::string const formatted_time(time_t t, std::string const & fmt); +/** Returns a locale-dependent formatting of the date and time encoded in \c t + * The \p fmt string holds the formatting arguments of QDateTime::toString(). + * If fmt is empty then the formatting of the date and time is itself according + * to the locale. + */ +docstring formatted_datetime(time_t t, std::string const & fmt = ""); + /** - * Inverse of ctime(). - * Since ctime() outputs the local time, the caller needs to ensure that the - * time zone and daylight saving time are the same as when \p t was created - * by ctime(). + * Inverse of asctime(gmtime()). */ -time_t from_ctime(std::string t); +time_t from_asctime_utc(std::string t); } // namespace support } // namespace lyx