X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Flyxtime.h;h=8fa58733fb6eb044d13c33b8ee05c48dea7b7341;hb=bf56e2c8e1afa857cd5e313c19948040e41b8227;hp=a84e391bfe4019059db581785906d3a3e1314f74;hpb=848c89564fce9c4bfec79b915746dc6bc47abc3d;p=lyx.git

diff --git a/src/support/lyxtime.h b/src/support/lyxtime.h
index a84e391bfe..8fa58733fb 100644
--- a/src/support/lyxtime.h
+++ b/src/support/lyxtime.h
@@ -5,7 +5,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author John Levon
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -16,19 +16,34 @@
 #include <time.h>
 #include <string>
 
+#include "strfwd.h"
 
-namespace lyx {
 
-typedef time_t time_type;
+namespace lyx {
+namespace support {
 
-time_type current_time();
+time_t current_time();
 
 /** Returns a locale-dependent formatting of the date
- *  and time encoded in \c time. The \p fmt string
+ *  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 asctime(gmtime()).
  */
-std::string const formatted_time(time_type t, std::string const & fmt);
+time_t from_asctime_utc(std::string t);
 
-}; // namespace lyx
+} // namespace support
+} // namespace lyx
 
 #endif // LYXTIME_H