flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-04 16:56:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Suppress Qt 5.15 deprecation warnings

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-05-30 14:53:44 +01:00
parent d4ee4896c1
commit 78987a678f
12 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackmisc/stringutils.cpp
View File

@@ -295,6 +295,15 @@ namespace BlackMisc
return dt;
}
QDateTime fromStringUtc(const QString& dateTimeString, const QLocale& locale, QLocale::FormatType format)
{
if (dateTimeString.isEmpty()) { return QDateTime(); }
QDateTime dt = locale.toDateTime(dateTimeString, format);
if (!dt.isValid()) { return dt; }
dt.setOffsetFromUtc(0); // must only be applied to valid timestamps
return dt;
}
QDateTime parseMultipleDateTimeFormats(const QString &dateTimeString)
{
if (dateTimeString.isEmpty()) { return QDateTime(); }
@@ -325,10 +334,10 @@ namespace BlackMisc
ts = fromStringUtc(dateTimeString, Qt::TextDate);
if (ts.isValid()) return ts;
ts = fromStringUtc(dateTimeString, Qt::DefaultLocaleLongDate);
ts = fromStringUtc(dateTimeString, QLocale(), QLocale::LongFormat);
if (ts.isValid()) return ts;
ts = fromStringUtc(dateTimeString, Qt::DefaultLocaleShortDate);
ts = fromStringUtc(dateTimeString, QLocale(), QLocale::ShortFormat);
if (ts.isValid()) return ts;
// SystemLocaleShortDate,