Fix deprecation warning (from|toTime_t)

diff --git a/src/frontends/qt/GuiApplication.cpp b/src/frontends/qt/GuiApplication.cpp
index 0ed875ff779361f8aaabc5a7ae7bb918e8e98cef..e500fa003c0175a30690b0dd2be3e0e2ad82c07a 100644 (file)
--- a/src/frontends/qt/GuiApplication.cpp
+++ b/src/frontends/qt/GuiApplication.cpp
@@ -1089,7 +1089,7 @@ GuiApplication::GuiApplication(int & argc, char ** argv)
 #endif
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
-       QRandomGenerator(QDateTime::currentDateTime().toTime_t());
+       QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch());
 #else
        qsrand(QDateTime::currentDateTime().toTime_t());
 #endif

diff --git a/src/frontends/qt/GuiChanges.cpp b/src/frontends/qt/GuiChanges.cpp
index eda161d0d54fc67ee0c82e2cb249239d5ceb106f..b2f809b026a5bd9c620f339dd060552d09e551d7 100644 (file)
--- a/src/frontends/qt/GuiChanges.cpp
+++ b/src/frontends/qt/GuiChanges.cpp
@@ -70,9 +70,15 @@ void GuiChanges::updateContents()
                        text += inserted ? qt_("Inserted by %1").arg(author)
                                         : qt_("Deleted by %1").arg(author);
 
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+               QString const date =
+                       QLocale().toString(QDateTime::fromSecsSinceEpoch(c.changetime),
+                                       QLocale::LongFormat);
+#else
                QString const date =
                        QLocale().toString(QDateTime::fromTime_t(c.changetime),
                                        QLocale::LongFormat);
+#endif
                if (!date.isEmpty()) {
                        if (!author.isEmpty())
                                text += qt_(" on[[date]] %1").arg(date);

diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 819d8ff62e55ec92eb8858ecdb556642b8787a87..61b39adc12719e826b90f107d171f3a714cc05e9 100644 (file)
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -297,7 +297,11 @@ vector<pair<string,docstring>> InsetInfoParams::getArguments(Buffer const * buf,
                string const dt = split(name, '@');
                QDate date;
                if (itype == "moddate")
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+                       date = QDateTime::fromSecsSinceEpoch(buf->fileName().lastModified()).date();
+#else
                        date = QDateTime::fromTime_t(buf->fileName().lastModified()).date();
+#endif
                else if (itype == "fixdate" && !dt.empty()) {
                        QDate const gdate = QDate::fromString(toqstr(dt), Qt::ISODate);
                        date = (gdate.isValid()) ? gdate : QDate::currentDate();
@@ -323,7 +327,11 @@ vector<pair<string,docstring>> InsetInfoParams::getArguments(Buffer const * buf,
                string const tt = split(name, '@');
                QTime time;
                if (itype == "modtime")
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+                       time = QDateTime::fromSecsSinceEpoch(buf->fileName().lastModified()).time();
+#else
                        time = QDateTime::fromTime_t(buf->fileName().lastModified()).time();
+#endif
                else if (itype == "fixtime" && !tt.empty()) {
                        QTime const gtime = QTime::fromString(toqstr(tt), Qt::ISODate);
                        time = (gtime.isValid()) ? gtime : QTime::currentTime();
@@ -1149,7 +1157,11 @@ void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype, bool cons
                                ? split(params_.name, date_format, '@') : string();
                QDate date;
                if (params_.type == InsetInfoParams::MODDATE_INFO)
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+                       date = QDateTime::fromSecsSinceEpoch(buffer().fileName().lastModified()).date();
+#else
                        date = QDateTime::fromTime_t(buffer().fileName().lastModified()).date();
+#endif
                else if (params_.type == InsetInfoParams::FIXDATE_INFO && !date_specifier.empty())
                        date = QDate::fromString(toqstr(date_specifier), Qt::ISODate);
                else
@@ -1166,7 +1178,11 @@ void InsetInfo::updateBuffer(ParIterator const & it, UpdateType utype, bool cons
                                ? split(params_.name, time_format, '@') : string();
                QTime time;
                if (params_.type == InsetInfoParams::MODTIME_INFO)
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+                       time = QDateTime::fromSecsSinceEpoch(buffer().fileName().lastModified()).time();
+#else
                        time = QDateTime::fromTime_t(buffer().fileName().lastModified()).time();
+#endif
                else if (params_.type == InsetInfoParams::FIXTIME_INFO && !time_specifier.empty())
                        time = QTime::fromString(toqstr(time_specifier), Qt::ISODate);
                else

diff --git a/src/support/ConsoleApplicationPrivate.h b/src/support/ConsoleApplicationPrivate.h
index 097a02d8a6be7821be3bf0e87b5650f26ca811cc..347f9ad62f06acc33674c7267f9aac0bae94fb53 100644 (file)
--- a/src/support/ConsoleApplicationPrivate.h
+++ b/src/support/ConsoleApplicationPrivate.h
@@ -42,7 +42,7 @@ public:
                setApplicationName(toqstr(app));
 
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
-               QRandomGenerator(QDateTime::currentDateTime().toTime_t());
+               QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch());
 #else
                qsrand(QDateTime::currentDateTime().toTime_t());
 #endif

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index 5295741e1abc9faafc404695d73356edcc6583ff..69e0211c5f42953575c015934e0a11459693d2d3 100644 (file)
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
@@ -519,7 +519,12 @@ time_t FileName::lastModified() const
        // been touched between the object creation and now, we refresh the file
        // information.
        d->refresh();
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
+       return d->fi.lastModified().toSecsSinceEpoch();
+#else
        return d->fi.lastModified().toTime_t();
+#endif
+       
 }
 
 

diff --git a/src/support/lyxtime.cpp b/src/support/lyxtime.cpp
index c155ed428d531426c66e16eb21777ff72c327aa4..87e05d59479c9c308339b7d85ca748f2f8b05ca4 100644 (file)
--- a/src/support/lyxtime.cpp
+++ b/src/support/lyxtime.cpp
@@ -34,11 +34,20 @@ time_t current_time()
 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);
 }
 
@@ -61,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