anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix deprecation warning (from|toTime_t)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2021-03-12 10:32:03 +01:00
parent 26459a2cf5
commit 10f4f2113a
6 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt/GuiApplication.cpp
View File

@ -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

6
src/frontends/qt/GuiChanges.cpp
View File

@ -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);

16
src/insets/InsetInfo.cpp
View File

@ -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

2
src/support/ConsoleApplicationPrivate.h
View File

@ -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

5
src/support/FileName.cpp
View File

@ -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
}

13
src/support/lyxtime.cpp
View File

@ -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