[vlmc-devel] mac: Q_WS_MAC and QT_MAC_USE_COCOA are deprecated

[Hugo Beauzée-Luyssen]

vlmc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Feb 11 02:45:40 2014 +0200| [a04473955bd8e43019a50934e341cf77eb9f1008] | committer: Hugo Beauzée-Luyssen

mac: Q_WS_MAC and QT_MAC_USE_COCOA are deprecated

> http://git.videolan.org/gitweb.cgi/vlmc.git/?a=commit;h=a04473955bd8e43019a50934e341cf77eb9f1008
---

 src/Gui/LanguageHelper.cpp        |    4 ++--
 src/Gui/preview/PreviewWidget.cpp |    2 +-
 src/Gui/preview/RenderWidget.h    |    4 ++--
 src/Gui/preview/RenderWidget.mm   |    2 +-
 src/Gui/wizard/ProjectWizard.cpp  |    2 +-
 src/LibVLCpp/VLCMediaPlayer.cpp   |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Gui/LanguageHelper.cpp b/src/Gui/LanguageHelper.cpp
index 88515bd..8f56d4c 100644
--- a/src/Gui/LanguageHelper.cpp
+++ b/src/Gui/LanguageHelper.cpp
@@ -69,7 +69,7 @@ LanguageHelper::languageChanged( const QString &lang  )
     {
         m_translator->load( TS_PREFIX + QLocale::system().name(), ":/ts/" );
         m_qtTranslator->load( "qt_" + QLocale::system().name(),
-#if defined( Q_OS_WIN32 ) || defined( Q_WS_MAC )
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
                               qApp->applicationDirPath() + "/ts/" );
 #else
                               QLibraryInfo::location( QLibraryInfo::TranslationsPath ) );
@@ -79,7 +79,7 @@ LanguageHelper::languageChanged( const QString &lang  )
     {
         m_translator->load( TS_PREFIX + lang, ":/ts/" );
         m_qtTranslator->load( "qt_" + lang,
-#if defined( Q_OS_WIN32 ) || defined( Q_WS_MAC )
+#if defined( Q_OS_WIN32 ) || defined( Q_OS_MAC )
                               qApp->applicationDirPath() + "/ts/" );
 #else
                               QLibraryInfo::location( QLibraryInfo::TranslationsPath ) );
diff --git a/src/Gui/preview/PreviewWidget.cpp b/src/Gui/preview/PreviewWidget.cpp
index 973e3b5..f70e83e 100644
--- a/src/Gui/preview/PreviewWidget.cpp
+++ b/src/Gui/preview/PreviewWidget.cpp
@@ -78,7 +78,7 @@ PreviewWidget::setRenderer( GenericRenderer *renderer )
 
     m_renderer->setRenderWidget( m_ui->renderWidget );
 
-#if defined ( Q_WS_MAC )
+#if defined ( Q_OS_MAC )
     /* Releases the NSView in the RenderWidget*/
     m_ui->renderWidget->release();
 #endif
diff --git a/src/Gui/preview/RenderWidget.h b/src/Gui/preview/RenderWidget.h
index 37748ec..53a9737 100644
--- a/src/Gui/preview/RenderWidget.h
+++ b/src/Gui/preview/RenderWidget.h
@@ -26,7 +26,7 @@
 #include <QtGlobal>
 #include <QWidget>
 
-#if defined( Q_WS_MAC ) && defined( QT_MAC_USE_COCOA )
+#if defined( Q_OS_MAC )
 #include <QMacCocoaViewContainer>
 
 #ifdef __OBJC__
@@ -45,7 +45,7 @@ class RenderWidget : public QWidget
     Q_OBJECT
 
 public:
-#if defined( Q_WS_MAC ) && defined( QT_MAC_USE_COCOA )
+#if defined( Q_OS_MAC )
     RenderWidget( QWidget* parent = NULL );
     NativeNSViewRef id() const;
     void release();
diff --git a/src/Gui/preview/RenderWidget.mm b/src/Gui/preview/RenderWidget.mm
index ecc50f6..9c5e6bb 100644
--- a/src/Gui/preview/RenderWidget.mm
+++ b/src/Gui/preview/RenderWidget.mm
@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include <QtGlobal>
-#if defined( Q_WS_MAC ) && defined( QT_MAC_USE_COCOA )
+#if defined( Q_OS_MAC )
 
 #include "RenderWidget.h"
 #include <QPalette>
diff --git a/src/Gui/wizard/ProjectWizard.cpp b/src/Gui/wizard/ProjectWizard.cpp
index e53ab6c..f4235df 100644
--- a/src/Gui/wizard/ProjectWizard.cpp
+++ b/src/Gui/wizard/ProjectWizard.cpp
@@ -37,7 +37,7 @@ ProjectWizard::ProjectWizard( QWidget* parent )
 {
     // Create Wizard
 
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
     setWizardStyle( QWizard::ModernStyle );
 #endif
 
diff --git a/src/LibVLCpp/VLCMediaPlayer.cpp b/src/LibVLCpp/VLCMediaPlayer.cpp
index 4bdca7d..367d8d4 100644
--- a/src/LibVLCpp/VLCMediaPlayer.cpp
+++ b/src/LibVLCpp/VLCMediaPlayer.cpp
@@ -277,7 +277,7 @@ MediaPlayer::isSeekable()
 void
 MediaPlayer::setDrawable( void* drawable )
 {
-#if defined ( Q_WS_MAC )
+#if defined ( Q_OS_MAC )
     libvlc_media_player_set_nsobject( m_internalPtr, drawable );
 #elif defined ( Q_OS_UNIX )
     libvlc_media_player_set_xwindow( m_internalPtr, reinterpret_cast<intptr_t>( drawable ) );