Yet another deprecation fix (this is the last one I am aware of)

[lyx.git] / src / support / lyxtime.h

diff --git a/src/support/lyxtime.h b/src/support/lyxtime.h
index fcb22bd135c8ab6bb88bffe9ca755bddf48caf79..8fa58733fb6eb044d13c33b8ee05c48dea7b7341 100644 (file)
--- a/src/support/lyxtime.h
+++ b/src/support/lyxtime.h
@@ -16,6 +16,8 @@
 #include <time.h>
 #include <string>
 
+#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_gmtime(std::string t);
+time_t from_asctime_utc(std::string t);
 
 } // namespace support
 } // namespace lyx