anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-24 13:48:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backport one more deprecation fix

Browse Source
This commit is contained in:
Juergen Spitzmueller 2021-03-13 10:16:40 +01:00
parent 548c165ae0
commit 67b829bf09
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/support/ConsoleApplicationPrivate.h
View File

@ -15,6 +15,9 @@
#include <QCoreApplication>
#include <QDateTime>
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
#include <QRandomGenerator>
#endif
#include <QTimer>
#include <string>
@ -38,7 +41,11 @@ public:
setOrganizationDomain("lyx.org");
setApplicationName(toqstr(app));
#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
QRandomGenerator(QDateTime::currentDateTime().toSecsSinceEpoch());
#else
qsrand(QDateTime::currentDateTime().toTime_t());
#endif
}
int execute()
{

4
src/support/FileName.cpp
View File

@ -507,7 +507,11 @@ 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
}

13
src/support/lyxtime.cpp
View File

@ -43,11 +43,20 @@ string const formatted_time(time_t t, string const & fmt)
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 +79,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