From 910c17ade90772f74f75a76225715160907edbbf Mon Sep 17 00:00:00 2001 From: Patrick von Reth Date: Mon, 31 Mar 2014 17:30:54 +0200 Subject: [PATCH] replaced Q_WS_WIN with Q_OS_WIN --- src/libtomahawk-widgets/PlaylistDelegate.cpp | 2 +- src/libtomahawk/ActionCollection.cpp | 6 +++--- .../kdsingleapplicationguard.cpp | 12 ++++++------ .../kdsingleapplicationguard.h | 2 +- src/libtomahawk/utils/TomahawkUtils.cpp | 2 +- src/libtomahawk/utils/TomahawkUtilsGui.cpp | 6 +++--- src/tomahawk/TomahawkTrayIcon.cpp | 2 +- src/tomahawk/TomahawkWindow.cpp | 4 ++-- src/tomahawk/widgets/SplashWidget.cpp | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/libtomahawk-widgets/PlaylistDelegate.cpp b/src/libtomahawk-widgets/PlaylistDelegate.cpp index 72fa7cc6a..836733b98 100644 --- a/src/libtomahawk-widgets/PlaylistDelegate.cpp +++ b/src/libtomahawk-widgets/PlaylistDelegate.cpp @@ -161,7 +161,7 @@ PlaylistDelegate::paint( QPainter* painter, const QStyleOptionViewItem& option, QRect rectText = option.rect.adjusted( option.fontMetrics.height() * 5.5, boldFontMetrics.height() + 6, -leftEdge - 10, -8 ); #ifdef Q_WS_MAC rectText.adjust( 0, 1, 0, 0 ); -#elif defined Q_WS_WIN +#elif defined Q_OS_WIN rectText.adjust( 0, 2, 0, 0 ); #endif diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index 617fc5ca9..3d333a54a 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -138,7 +138,7 @@ ActionCollection::initActions() m_actionCollection[ "legalInfo" ]->setMenuRole( QAction::ApplicationSpecificRole ); m_actionCollection[ "openLogfile" ] = new QAction( tr( "&View Logfile" ), this ); m_actionCollection[ "openLogfile" ]->setMenuRole( QAction::ApplicationSpecificRole ); - #if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) || defined( Q_WS_WIN ) + #if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) || defined( Q_OS_WIN ) m_actionCollection[ "checkForUpdates" ] = new QAction( tr( "Check For Updates..." ), this ); m_actionCollection[ "checkForUpdates" ]->setMenuRole( QAction::ApplicationSpecificRole ); #endif @@ -184,7 +184,7 @@ ActionCollection::createMenuBar( QWidget *parent ) #if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) helpMenu->addAction( m_actionCollection[ "checkForUpdates" ] ); -#elif defined( Q_WS_WIN ) +#elif defined( Q_OS_WIN ) helpMenu->addSeparator(); helpMenu->addAction( m_actionCollection[ "checkForUpdates" ] ); #endif @@ -249,7 +249,7 @@ ActionCollection::createCompactMenu( QWidget *parent ) #if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) compactMenu->addAction( m_actionCollection[ "checkForUpdates" ] ); -#elif defined( Q_WS_WIN ) +#elif defined( Q_OS_WIN ) compactMenu->addSeparator(); compactMenu->addAction( m_actionCollection[ "checkForUpdates" ] ); #endif diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp index cd76f8811..d8e98b193 100644 --- a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp +++ b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.cpp @@ -19,12 +19,12 @@ #include #include -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN #include #include #endif -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #include #ifndef _SSIZE_T_DEFINED typedef signed int ssize_t; @@ -633,7 +633,7 @@ void KDSingleApplicationGuard::Instance::raise() } -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN // static void KDSingleApplicationGuard::SIGINT_handler( int sig ) { @@ -735,7 +735,7 @@ void KDSingleApplicationGuard::Private::create( const QStringList & arguments ) // if another instance crashed, the shared memory segment is still there on Unix // the following lines trigger deletion in that case -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN mem.attach(); mem.detach(); #endif @@ -767,7 +767,7 @@ void KDSingleApplicationGuard::Private::create( const QStringList & arguments ) { const KDLockedSharedMemoryPointer< InstanceRegister > instances( &mem ); initialized = instances->isValid(); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN ::Sleep(20); #else usleep(20000); @@ -815,7 +815,7 @@ void KDSingleApplicationGuard::Private::create( const QStringList & arguments ) instances->info[ 0 ] = ProcessInfo( NoCommand, arguments, QCoreApplication::applicationPid() ); } -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN ::signal( SIGINT, SIGINT_handler ); #endif diff --git a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h index 7b744e110..169b0d3d7 100644 --- a/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h +++ b/src/libtomahawk/thirdparty/kdsingleapplicationguard/kdsingleapplicationguard.h @@ -67,7 +67,7 @@ protected: /*! \reimp */ bool event( QEvent * event ); private: -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN static void SIGINT_handler( int ); #endif diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp index b3f83a1a7..ba02b10f7 100644 --- a/src/libtomahawk/utils/TomahawkUtils.cpp +++ b/src/libtomahawk/utils/TomahawkUtils.cpp @@ -133,7 +133,7 @@ appConfigDir() return QDir( "/tmp" ); } -#elif defined(Q_WS_WIN) +#elif defined(Q_OS_WIN) throw "TODO"; return QDir( "c:\\" ); //TODO refer to Qt documentation to get code to do this diff --git a/src/libtomahawk/utils/TomahawkUtilsGui.cpp b/src/libtomahawk/utils/TomahawkUtilsGui.cpp index 93b81f42e..747c2515c 100644 --- a/src/libtomahawk/utils/TomahawkUtilsGui.cpp +++ b/src/libtomahawk/utils/TomahawkUtilsGui.cpp @@ -46,7 +46,7 @@ #include #endif -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN #include #include #include @@ -282,7 +282,7 @@ bringToFront() XSendEvent( QX11Info::display(), RootWindow( QX11Info::display(), DefaultScreen( QX11Info::display() ) ), False, SubstructureRedirectMask | SubstructureNotifyMask, &e ); } -#elif defined(Q_WS_WIN) +#elif defined(Q_OS_WIN) { qDebug() << Q_FUNC_INFO; @@ -940,7 +940,7 @@ drawCompositedPopup( QWidget* widget, qreal opacity ) { bool compositingWorks = true; -#if defined(Q_WS_WIN) //HACK: Windows refuses to perform compositing so we must fake it +#if defined(Q_OS_WIN) //HACK: Windows refuses to perform compositing so we must fake it compositingWorks = false; #elif defined(Q_WS_X11) if ( !QX11Info::isCompositingManagerRunning() ) diff --git a/src/tomahawk/TomahawkTrayIcon.cpp b/src/tomahawk/TomahawkTrayIcon.cpp index c23a0ad08..73e6a1344 100644 --- a/src/tomahawk/TomahawkTrayIcon.cpp +++ b/src/tomahawk/TomahawkTrayIcon.cpp @@ -200,7 +200,7 @@ TomahawkTrayIcon::refreshToolTip() tip = tr( "Currently not playing." ); } - #ifdef Q_WS_WIN + #ifdef Q_OS_WIN // Good old crappy Win32 tip.replace( "&", "&&&" ); #endif diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 5134adb66..e061354a1 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -82,7 +82,7 @@ #include "config.h" -#if defined( Q_WS_WIN ) +#if defined( Q_OS_WIN ) #if defined ( WITH_QtSparkle ) #include #endif @@ -484,7 +484,7 @@ TomahawkWindow::setupUpdateCheck() #if defined( Q_OS_MAC ) && defined( HAVE_SPARKLE ) connect( ActionCollection::instance()->getAction( "checkForUpdates" ), SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) ); - #elif defined( Q_WS_WIN ) && defined( WITH_QtSparkle ) + #elif defined( Q_OS_WIN ) && defined( WITH_QtSparkle ) QUrl updaterUrl; if ( qApp->arguments().contains( "--debug" ) ) diff --git a/src/tomahawk/widgets/SplashWidget.cpp b/src/tomahawk/widgets/SplashWidget.cpp index 203f99ffc..4481c8d11 100644 --- a/src/tomahawk/widgets/SplashWidget.cpp +++ b/src/tomahawk/widgets/SplashWidget.cpp @@ -33,7 +33,7 @@ SplashWidget::SplashWidget() { //In 2014 there are still operating systems that cannot do transparency bool compositingWorks = true; -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) compositingWorks = false; #elif defined(Q_WS_X11) if ( !QX11Info::isCompositingManagerRunning() )