From 17bdee86da84c6718fc1bbe8cedf5bdf07240837 Mon Sep 17 00:00:00 2001 From: Andre de la Rocha 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 Reviewed-by: Michael Winkelmann --- examples/winextras/musicplayer/musicplayer.cpp | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) (limited to 'examples/winextras/musicplayer/musicplayer.cpp') 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(&QMediaPlayer::error), + connect(&mediaPlayer, QOverload::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] -- cgit v1.2.3