mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-25 05:45:42 +03:00
Qt: Fixed numerous deprecated calls by adapting newer ones
Signed-off-by: Dominique Fuchs <32204802+DominiqueFuchs@users.noreply.github.com>
This commit is contained in:
parent
ba74c24d8f
commit
a2d47cdec4
5 changed files with 12 additions and 9 deletions
|
@ -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;
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
#include <QNetworkProxy>
|
||||
#include <QDir>
|
||||
#include <QScopedValueRollback>
|
||||
#include <QOperatingSystemVersion>
|
||||
|
||||
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);
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
#include <QUrl>
|
||||
#include <QDesktopServices>
|
||||
#include <QApplication>
|
||||
#include <QOperatingSystemVersion>
|
||||
|
||||
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
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include <QSettings>
|
||||
#include <QNetworkProxy>
|
||||
#include <QStandardPaths>
|
||||
#include <QOperatingSystemVersion>
|
||||
|
||||
#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
|
||||
|
|
Loading…
Reference in a new issue