From 78987a678fe856a8025b4400ce55a1c15721c62e Mon Sep 17 00:00:00 2001 From: Mat Sutcliffe Date: Sat, 30 May 2020 14:53:44 +0100 Subject: [PATCH] Suppress Qt 5.15 deprecation warnings --- mkspecs/features/warnings.pri | 3 +++ src/blackcore/vatsim/vatsimdatafilereader.cpp | 2 +- src/blackgui/components/hotkeydialog.cpp | 2 +- src/blackgui/components/maininfoareacomponent.ui | 4 ++-- src/blackgui/components/settingsfontcomponent.ui | 2 +- src/blackgui/models/actionmodel.cpp | 2 +- src/blackmisc/logcategorylist.cpp | 2 +- .../simulation/xplane/aircraftmodelloaderxplane.cpp | 4 ++-- src/blackmisc/stringutils.cpp | 13 +++++++++++-- src/blackmisc/stringutils.h | 4 ++++ src/blackmisc/test/testserviceinterface.h | 2 +- src/swiftguistandard/swiftguistd.ui | 2 +- 12 files changed, 29 insertions(+), 13 deletions(-) diff --git a/mkspecs/features/warnings.pri b/mkspecs/features/warnings.pri index 3a6187e8e..f5ebe5d86 100644 --- a/mkspecs/features/warnings.pri +++ b/mkspecs/features/warnings.pri @@ -28,6 +28,9 @@ swiftConfig(allowNoisyWarnings) { QMAKE_CXXFLAGS_WARN_ON *= /wd4251 /wd4275 /wd4514 /wd4800 /wd4097 /wd4706 /wd4710 /wd4530 } } +else { + DEFINES *= QT_NO_DEPRECATED_WARNINGS +} # gcc 5 can warn about missing override keyword, # gcc 6 can do it without thousands of warnings in qt headers diff --git a/src/blackcore/vatsim/vatsimdatafilereader.cpp b/src/blackcore/vatsim/vatsimdatafilereader.cpp index f5e510bd9..6b59936bb 100644 --- a/src/blackcore/vatsim/vatsimdatafilereader.cpp +++ b/src/blackcore/vatsim/vatsimdatafilereader.cpp @@ -265,7 +265,7 @@ namespace BlackCore { // ; !CLIENTS section const int i = currentLine.lastIndexOf(' '); - const QVector attributes = currentLine.midRef(i).trimmed().split(':', QString::SkipEmptyParts); + const QVector attributes = currentLine.midRef(i).trimmed().split(':', Qt::SkipEmptyParts); for (const QStringRef &attr : attributes) { clientSectionAttributes.push_back(attr.toString().trimmed().toLower()); } section = SectionNone; // reset diff --git a/src/blackgui/components/hotkeydialog.cpp b/src/blackgui/components/hotkeydialog.cpp index ac47715c7..59685df56 100644 --- a/src/blackgui/components/hotkeydialog.cpp +++ b/src/blackgui/components/hotkeydialog.cpp @@ -388,7 +388,7 @@ namespace BlackGui void CHotkeyDialog::selectAction() { if (m_actionHotkey.getAction().isEmpty()) { return; } - const QStringList tokens = m_actionHotkey.getAction().split("/", QString::SkipEmptyParts); + const QStringList tokens = m_actionHotkey.getAction().split("/", Qt::SkipEmptyParts); QModelIndex parentIndex = QModelIndex(); for (const QString &token : tokens) diff --git a/src/blackgui/components/maininfoareacomponent.ui b/src/blackgui/components/maininfoareacomponent.ui index e2758097b..b7d0423c7 100644 --- a/src/blackgui/components/maininfoareacomponent.ui +++ b/src/blackgui/components/maininfoareacomponent.ui @@ -24,7 +24,7 @@ - QDockWidget::AllDockWidgetFeatures + QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable Qt::NoDockWidgetArea @@ -96,7 +96,7 @@ - QDockWidget::AllDockWidgetFeatures + QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable Qt::NoDockWidgetArea diff --git a/src/blackgui/components/settingsfontcomponent.ui b/src/blackgui/components/settingsfontcomponent.ui index 25abf4125..b43e42802 100644 --- a/src/blackgui/components/settingsfontcomponent.ui +++ b/src/blackgui/components/settingsfontcomponent.ui @@ -117,7 +117,7 @@ - QComboBox::AdjustToMinimumContentsLength + QComboBox::AdjustToContents diff --git a/src/blackgui/models/actionmodel.cpp b/src/blackgui/models/actionmodel.cpp index c2143da39..1e52c0e96 100644 --- a/src/blackgui/models/actionmodel.cpp +++ b/src/blackgui/models/actionmodel.cpp @@ -109,7 +109,7 @@ namespace BlackGui for (const QString &actionPath : as_const(keys)) { QString currentPath; - const QStringList tokens = actionPath.split("/", QString::SkipEmptyParts); + const QStringList tokens = actionPath.split("/", Qt::SkipEmptyParts); CActionItem *parentItem = m_rootItem.data(); for (const auto &token : tokens) { diff --git a/src/blackmisc/logcategorylist.cpp b/src/blackmisc/logcategorylist.cpp index 0fbca7d21..9a1ac2408 100644 --- a/src/blackmisc/logcategorylist.cpp +++ b/src/blackmisc/logcategorylist.cpp @@ -52,7 +52,7 @@ namespace BlackMisc CLogCategoryList CLogCategoryList::fromQString(const QString &string) { - return fromQStringList(string.split("|", QString::SkipEmptyParts)); + return fromQStringList(string.split("|", Qt::SkipEmptyParts)); } bool CLogCategoryList::anyStartWith(const QString &prefix) const diff --git a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp index 581fa64f9..6caa7beb2 100644 --- a/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp +++ b/src/blackmisc/simulation/xplane/aircraftmodelloaderxplane.cpp @@ -435,7 +435,7 @@ namespace BlackMisc QFileInfo fileInfo(fullPath); QStringList dirNames; - dirNames.append(relativePath.split('/', QString::SkipEmptyParts)); + dirNames.append(relativePath.split('/', Qt::SkipEmptyParts)); // Replace the first one being the package name with the package root dir QString packageRootDir = package.path.mid(package.path.lastIndexOf('/') + 1); dirNames.replace(0, packageRootDir); @@ -540,7 +540,7 @@ namespace BlackMisc } QStringList dirNames; - dirNames.append(relativePath.split('/', QString::SkipEmptyParts)); + dirNames.append(relativePath.split('/', Qt::SkipEmptyParts)); // Replace the first one being the package name with the package root dir QString packageRootDir = package.path.mid(package.path.lastIndexOf('/') + 1); dirNames.replace(0, packageRootDir); diff --git a/src/blackmisc/stringutils.cpp b/src/blackmisc/stringutils.cpp index 9dffb3d79..c2e85e797 100644 --- a/src/blackmisc/stringutils.cpp +++ b/src/blackmisc/stringutils.cpp @@ -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, diff --git a/src/blackmisc/stringutils.h b/src/blackmisc/stringutils.h index a6f94ee1e..245ff4af6 100644 --- a/src/blackmisc/stringutils.h +++ b/src/blackmisc/stringutils.h @@ -286,6 +286,10 @@ namespace BlackMisc //! \remark potentially slow, so only to be used when format is unknown BLACKMISC_EXPORT QDateTime fromStringUtc(const QString &dateTimeString, Qt::DateFormat format = Qt::TextDate); + //! Same as QDateTime::fromString but QDateTime will be set to UTC + //! \remark potentially slow, so only to be used when format is unknown + BLACKMISC_EXPORT QDateTime fromStringUtc(const QString &dateTimeString, const QLocale &locale, QLocale::FormatType format); + //! Parse multiple date time formats //! \remark potentially slow, so only to be used when format is unknown //! \remark TZ is UTC diff --git a/src/blackmisc/test/testserviceinterface.h b/src/blackmisc/test/testserviceinterface.h index 4dc7327dc..2aebcbe12 100644 --- a/src/blackmisc/test/testserviceinterface.h +++ b/src/blackmisc/test/testserviceinterface.h @@ -394,7 +394,7 @@ namespace BlackMisc if (!equal) { errors++; - if (verbose) { ts << "I: " << in.toQString() << endl << "O: " << out.toQString() << Qt::endl; } + if (verbose) { ts << "I: " << in.toQString() << Qt::endl << "O: " << out.toQString() << Qt::endl; } } return equal; } diff --git a/src/swiftguistandard/swiftguistd.ui b/src/swiftguistandard/swiftguistd.ui index 0a53a9076..9360ed023 100644 --- a/src/swiftguistandard/swiftguistd.ui +++ b/src/swiftguistandard/swiftguistd.ui @@ -304,7 +304,7 @@ - QDockWidget::AllDockWidgetFeatures + QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable Qt::TopDockWidgetArea