iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix deprecation: QSysInfo::MV_10_8 obsolete

Browse Source
This commit is contained in:
John Regan
2021-07-20 13:01:43 -04:00
parent 8d6d3645fa
commit 3d8a4cdca5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/interfacesettings.cpp
View File

@@ -41,7 +41,7 @@
#include <QDBusConnectionInterface>
#endif
#include <QSystemTrayIcon>
#include <QSysInfo>
#include <QOperatingSystemVersion>
#include <QStyleFactory>
#include <algorithm>
@@ -132,7 +132,7 @@ InterfaceSettings::InterfaceSettings(QWidget *p)
bool enableTrayItem=Utils::useSystemTray();
#ifdef Q_OS_MAC
// OSX always displays an entry in the taskbar - and the tray seems to confuse things.
bool enableNotifications=QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8;
bool enableNotifications=QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 8);
#else
#ifdef QT_QTDBUS_FOUND
// We have dbus, check that org.freedesktop.Notifications exists

8
mac/macnotify.mm
View File

@@ -24,7 +24,7 @@
#include "macnotify.h"
#include "config.h"
#include <QString>
#include <QSysInfo>
#include <QOperatingSystemVersion>
#ifdef QT_MAC_EXTRAS_FOUND
#include <qmacfunctions.h>
#include <QImage>
@@ -50,12 +50,12 @@ class UserNotificationItemClass
public:
UserNotificationItemClass() {
item = [UserNotificationItem alloc];
if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
if(QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 8)) {
[[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:item];
}
}
~UserNotificationItemClass() {
if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
if(QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 8)) {
[[NSUserNotificationCenter defaultUserNotificationCenter] setDelegate:nil];
}
[item release];
@@ -65,7 +65,7 @@ public:
void MacNotify::showMessage(const QString &title, const QString &text, const QImage &img)
{
if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_8) {
if(QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 8)) {
static UserNotificationItemClass *n=0;
if (!n) {
n=new UserNotificationItemClass();

4
support/configdialog.cpp
View File

@@ -46,7 +46,7 @@
#include <QAbstractItemView>
#include <QTimer>
#include <QPropertyAnimation>
#include <QSysInfo>
#include <QOperatingSystemVersion>
#include <QDesktopWidget>
#include "icon.h"
#include "osxstyle.h"
@@ -91,7 +91,7 @@ public:
QColor col(Qt::black);
QRect r(rect());
if (QSysInfo::MacintoshVersion > QSysInfo::MV_10_9) {
if (QOperatingSystemVersion::current() >= QOperatingSystemVersion(QOperatingSystemVersion::MacOS, 10, 9)) {
col.setAlphaF(0.1);
p.setClipRect(r);
p.setRenderHint(QPainter::Antialiasing, true);