From 17bdee86da84c6718fc1bbe8cedf5bdf07240837 Mon Sep 17 00:00:00 2001
From: Andre de la Rocha <andre.rocha@qt.io>
Date: Wed, 25 Oct 2017 15:35:30 +0200
Subject: Revamp Qt Windows Extras examples

Use nullptr, member initialization, new connect syntax, QStringLiteral, etc.

Change-Id: I1404701fcc227f8133bc22548ea1cee02eab4ed9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Michael Winkelmann <michael.winkelmann@qt.io>
---
 examples/winextras/musicplayer/main.cpp         |  2 +-
 examples/winextras/musicplayer/musicplayer.cpp  | 26 +++++++++++++------------
 examples/winextras/musicplayer/volumebutton.cpp | 22 +++++++++++----------
 3 files changed, 27 insertions(+), 23 deletions(-)

(limited to 'examples/winextras/musicplayer')

diff --git a/examples/winextras/musicplayer/main.cpp b/examples/winextras/musicplayer/main.cpp
index 1386da5..3b101cf 100644
--- a/examples/winextras/musicplayer/main.cpp
+++ b/examples/winextras/musicplayer/main.cpp
@@ -95,7 +95,7 @@ int main(int argc, char *argv[])
     QCoreApplication::setApplicationName(QStringLiteral("MusicPlayer"));
     QCoreApplication::setApplicationVersion( QLatin1String(QT_VERSION_STR));
     QCoreApplication::setOrganizationName(QStringLiteral("QtWinExtras"));
-    QCoreApplication::setOrganizationDomain("qt-project.org");
+    QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org"));
     QGuiApplication::setApplicationDisplayName(QStringLiteral("QtWinExtras Music Player"));
 
     if (!associateFileTypes())
diff --git a/examples/winextras/musicplayer/musicplayer.cpp b/examples/winextras/musicplayer/musicplayer.cpp
index 6093976..b5b0acb 100644
--- a/examples/winextras/musicplayer/musicplayer.cpp
+++ b/examples/winextras/musicplayer/musicplayer.cpp
@@ -56,8 +56,7 @@ MusicPlayer::MusicPlayer(QWidget *parent) : QWidget(parent)
     connect(&mediaPlayer, &QMediaPlayer::durationChanged, this, &MusicPlayer::updateDuration);
     connect(&mediaPlayer, &QMediaObject::metaDataAvailableChanged, this, &MusicPlayer::updateInfo);
 
-    typedef void(QMediaPlayer::*ErrorSignal)(QMediaPlayer::Error);
-    connect(&mediaPlayer, static_cast<ErrorSignal>(&QMediaPlayer::error),
+    connect(&mediaPlayer, QOverload<QMediaPlayer::Error>::of(&QMediaPlayer::error),
             this, &MusicPlayer::handleError);
     connect(&mediaPlayer, &QMediaPlayer::stateChanged,
             this, &MusicPlayer::updateState);
@@ -173,17 +172,20 @@ void MusicPlayer::mouseReleaseEvent(QMouseEvent *event)
 //! [1]
 void MusicPlayer::stylize()
 {
-    if (QtWin::isCompositionEnabled()) {
-        QtWin::extendFrameIntoClientArea(this, -1, -1, -1, -1);
-        setAttribute(Qt::WA_TranslucentBackground, true);
-        setAttribute(Qt::WA_NoSystemBackground, false);
-        setStyleSheet(QStringLiteral("MusicPlayer { background: transparent; }"));
-    } else {
-        QtWin::resetExtendedFrame(this);
-        setAttribute(Qt::WA_TranslucentBackground, false);
-        setStyleSheet(QStringLiteral("MusicPlayer { background: %1; }").arg(QtWin::realColorizationColor().name()));
+    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows8) {
+        // Set styling options relevant only to Windows 7.
+        if (QtWin::isCompositionEnabled()) {
+            QtWin::extendFrameIntoClientArea(this, -1, -1, -1, -1);
+            setAttribute(Qt::WA_TranslucentBackground, true);
+            setAttribute(Qt::WA_NoSystemBackground, false);
+            setStyleSheet(QStringLiteral("MusicPlayer { background: transparent; }"));
+        } else {
+            QtWin::resetExtendedFrame(this);
+            setAttribute(Qt::WA_TranslucentBackground, false);
+            setStyleSheet(QStringLiteral("MusicPlayer { background: %1; }").arg(QtWin::realColorizationColor().name()));
+        }
+        volumeButton->stylize();
     }
-    volumeButton->stylize();
 }
 //! [1]
 
diff --git a/examples/winextras/musicplayer/volumebutton.cpp b/examples/winextras/musicplayer/volumebutton.cpp
index 44be5cf..9682b6e 100644
--- a/examples/winextras/musicplayer/volumebutton.cpp
+++ b/examples/winextras/musicplayer/volumebutton.cpp
@@ -60,8 +60,7 @@ VolumeButton::VolumeButton(QWidget *parent) :
     label->setNum(100);
     label->setMinimumWidth(label->sizeHint().width());
 
-    typedef void(QLabel::*IntSlot)(int);
-    connect(slider, &QAbstractSlider::valueChanged, label, static_cast<IntSlot>(&QLabel::setNum));
+    connect(slider, &QAbstractSlider::valueChanged, label, QOverload<int>::of(&QLabel::setNum));
 
     QBoxLayout *popupLayout = new QHBoxLayout(popup);
     popupLayout->setMargin(2);
@@ -101,14 +100,17 @@ void VolumeButton::setVolume(int volume)
 //! [0]
 void VolumeButton::stylize()
 {
-    if (QtWin::isCompositionEnabled()) {
-        QtWin::enableBlurBehindWindow(menu);
-        QString css("QMenu { border: 1px solid %1; border-radius: 2px; background: transparent; }");
-        menu->setStyleSheet(css.arg(QtWin::realColorizationColor().name()));
-    } else {
-        QtWin::disableBlurBehindWindow(menu);
-        QString css("QMenu { border: 1px solid black; background: %1; }");
-        menu->setStyleSheet(css.arg(QtWin::realColorizationColor().name()));
+    if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows8) {
+        // Set styling options relevant only to Windows 7.
+        if (QtWin::isCompositionEnabled()) {
+            QtWin::enableBlurBehindWindow(menu);
+            QString css("QMenu { border: 1px solid %1; border-radius: 2px; background: transparent; }");
+            menu->setStyleSheet(css.arg(QtWin::realColorizationColor().name()));
+        } else {
+            QtWin::disableBlurBehindWindow(menu);
+            QString css("QMenu { border: 1px solid black; background: %1; }");
+            menu->setStyleSheet(css.arg(QtWin::realColorizationColor().name()));
+        }
     }
 }
 //! [0]
-- 
cgit v1.2.3