From ea5f25951ca26b7dff7845f61ff23a86ceac249c Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Fri, 30 Aug 2013 22:16:58 +0200 Subject: [PATCH] s/Q_WS_X11/Q_OS_LINUX/ at some locations --- src/libtomahawk/TomahawkSettings.cpp | 2 +- src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp | 2 +- src/tomahawk/TomahawkWindow.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libtomahawk/TomahawkSettings.cpp b/src/libtomahawk/TomahawkSettings.cpp index f38d4ed2b..9649f732a 100644 --- a/src/libtomahawk/TomahawkSettings.cpp +++ b/src/libtomahawk/TomahawkSettings.cpp @@ -701,7 +701,7 @@ TomahawkSettings::scannerPaths() const { QString musicLocation; -#if defined(Q_WS_X11) +#if defined(Q_OS_LINUX) musicLocation = QDir::homePath() + QLatin1String("/Music"); #endif diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp index 6ca02f615..c71880dbc 100644 --- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp +++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp @@ -72,7 +72,7 @@ LastFmInfoPlugin::init() //HACK work around a bug in liblastfm---it doesn't create its config dir, so when it // tries to write the track cache, it fails silently. until we have a fixed version, do this // code taken from Amarok (src/services/lastfm/ScrobblerAdapter.cpp) -#ifdef Q_WS_X11 +#ifdef Q_OS_LINUX QString lpath = QDir::home().filePath( ".local/share/Last.fm" ); QDir ldir = QDir( lpath ); if( !ldir.exists() ) diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp index 9ca96eb00..645b2d97c 100644 --- a/src/tomahawk/TomahawkWindow.cpp +++ b/src/tomahawk/TomahawkWindow.cpp @@ -993,7 +993,7 @@ void TomahawkWindow::onAudioEngineError( AudioEngine::AudioErrorCode /* error */ ) { QString msg; - #ifdef Q_WS_X11 + #ifdef Q_OS_LINUX msg = tr( "Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped. Make sure you have a suitable Phonon backend and required plugins installed." ); #else msg = tr( "Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped." );