From a2d47cdec4cc538ff873d3f9f9cc4e392b2ff209 Mon Sep 17 00:00:00 2001 From: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> Date: Sun, 8 Sep 2019 15:40:49 +0200 Subject: [PATCH] Qt: Fixed numerous deprecated calls by adapting newer ones Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com> --- src/gui/activityitemdelegate.cpp | 10 +++++----- src/gui/generalsettings.cpp | 3 ++- src/gui/openfilemanager.cpp | 3 ++- src/gui/wizard/slideshow.cpp | 2 +- src/libsync/configfile.cpp | 3 ++- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/gui/activityitemdelegate.cpp b/src/gui/activityitemdelegate.cpp index 7d71374427..84b207f64a 100644 --- a/src/gui/activityitemdelegate.cpp +++ b/src/gui/activityitemdelegate.cpp @@ -106,7 +106,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & // subject text rect QRect actionTextBox = actionIconRect; - int actionTextBoxWidth = fm.width(actionText); + int actionTextBoxWidth = fm.horizontalAdvance(actionText); actionTextBox.setTop(option.rect.top() + margin + offset/2); actionTextBox.setHeight(fm.height()); actionTextBox.setLeft(actionIconRect.right() + margin); @@ -114,7 +114,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & // message text rect QRect messageTextBox = actionTextBox; - int messageTextWidth = fm.width(messageText); + int messageTextWidth = fm.horizontalAdvance(messageText); int messageTextTop = option.rect.top() + fm.height() + margin; if(actionText.isEmpty()) messageTextTop = option.rect.top() + margin + offset/2; messageTextBox.setTop(messageTextTop); @@ -129,7 +129,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & // time box rect QRect timeBox = messageTextBox; QString timeStr = tr("%1").arg(timeText); - int timeTextWidth = fm.width(timeStr); + int timeTextWidth = fm.horizontalAdvance(timeStr); int timeTop = option.rect.top() + fm.height() + fm.height() + margin + offset/2; if(messageText.isEmpty() || actionText.isEmpty()) timeTop = option.rect.top() + fm.height() + margin; @@ -180,7 +180,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & if(objectType == _remote_share) primaryButton.text = tr("Accept"); if(objectType == _call) primaryButton.text = tr("Join"); - primaryButton.rect.setLeft(left - margin * 2 - fm.width(primaryButton.text)); + primaryButton.rect.setLeft(left - margin * 2 - fm.horizontalAdvance(primaryButton.text)); // save info to be able to filter mouse clicks _buttonHeight = buttonSize; @@ -196,7 +196,7 @@ void ActivityItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem & // Primary button will be 'open browser' primaryButton.text = tr("Open Browser"); - primaryButton.rect.setLeft(left - margin * 2 - fm.width(primaryButton.text)); + primaryButton.rect.setLeft(left - margin * 2 - fm.horizontalAdvance(primaryButton.text)); // save info to be able to filter mouse clicks _buttonHeight = buttonSize; diff --git a/src/gui/generalsettings.cpp b/src/gui/generalsettings.cpp index dd42358349..e8669aa3db 100644 --- a/src/gui/generalsettings.cpp +++ b/src/gui/generalsettings.cpp @@ -34,6 +34,7 @@ #include #include #include +#include namespace OCC { @@ -79,7 +80,7 @@ GeneralSettings::GeneralSettings(QWidget *parent) // Hide on non-Windows, or WindowsVersion < 10. // The condition should match the default value of ConfigFile::showInExplorerNavigationPane. #ifdef Q_OS_WIN - if (QSysInfo::windowsVersion() < QSysInfo::WV_WINDOWS10) + if (QOperatingSystemVersion::current < QOperatingSystemVersion::Windows10) #endif _ui->showInExplorerNavigationPaneCheckBox->setVisible(false); diff --git a/src/gui/openfilemanager.cpp b/src/gui/openfilemanager.cpp index e466bdc49c..a62d23b3fb 100644 --- a/src/gui/openfilemanager.cpp +++ b/src/gui/openfilemanager.cpp @@ -21,6 +21,7 @@ #include #include #include +#include namespace OCC { @@ -89,7 +90,7 @@ void showInFileManager(const QString &localPath) { if (Utility::isWindows()) { #ifdef Q_OS_WIN - if (QSysInfo::windowsVersion() <= QSysInfo::WV_2003) { + if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows7) { return; } #endif diff --git a/src/gui/wizard/slideshow.cpp b/src/gui/wizard/slideshow.cpp index 721adaad3d..e4c3b5f9b1 100644 --- a/src/gui/wizard/slideshow.cpp +++ b/src/gui/wizard/slideshow.cpp @@ -88,7 +88,7 @@ QSize SlideShow::sizeHint() const QFontMetrics fm = fontMetrics(); QSize labelSize(0, fm.height()); for (const QString &label : _labels) { - labelSize.setWidth(std::max(fm.width(label), labelSize.width())); + labelSize.setWidth(std::max(fm.horizontalAdvance(label), labelSize.width())); } QSize pixmapSize; for (const QPixmap &pixmap : _pixmaps) { diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 4a71dc9a98..4ab439a1a5 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #define DEFAULT_REMOTE_POLL_INTERVAL 5000 // default remote poll time in milliseconds #define DEFAULT_MAX_LOG_LINES 20000 @@ -174,7 +175,7 @@ bool ConfigFile::showInExplorerNavigationPane() const { const bool defaultValue = #ifdef Q_OS_WIN - QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS10 + QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::Windows10) #else false #endif