Let paragraph::requestSpellcheck() consider contained insets

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

diff --git a/src/support/lyxtime.cpp b/src/support/lyxtime.cpp
index 5415ac4eeb034057234b363d3931d7d004ca40ba..87e05d59479c9c308339b7d85ca748f2f8b05ca4 100644 (file)
--- a/src/support/lyxtime.cpp
+++ b/src/support/lyxtime.cpp
@@ -27,27 +27,27 @@ namespace support {
 
 time_t current_time()
 {
-       return time(0);
-}
-
-
-string const formatted_time(time_t t, string const & fmt)
-{
-       struct tm * loc_tm = localtime(&t);
-       char date[50];
-       strftime(date, sizeof(date), fmt.c_str(), loc_tm);
-       return string(date);
+       return time(nullptr);
 }
 
 
 docstring formatted_datetime(time_t t, string const & fmt)
 {
        QString qres;
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+       if (fmt.empty())
+               qres = QLocale().toString(QDateTime::fromSecsSinceEpoch(t),
+                                         QLocale::ShortFormat);
+       else
+               qres = QLocale().toString(QDateTime::fromSecsSinceEpoch(t),
+                                         toqstr(fmt));
+#else
        if (fmt.empty())
                qres = QLocale().toString(QDateTime::fromTime_t(t),
                                          QLocale::ShortFormat);
        else
                qres = QLocale().toString(QDateTime::fromTime_t(t), toqstr(fmt));
+#endif
        return qstring_to_ucs4(qres);
 }
 
@@ -70,7 +70,11 @@ time_t from_asctime_utc(string t)
                return static_cast<time_t>(-1);
        }
        loc_dt.setTimeSpec(Qt::UTC);
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+       return loc_dt.toSecsSinceEpoch();
+#else
        return loc_dt.toTime_t();
+#endif
 }
 
 } // namespace support