actual 45.0.1 macOS fix

psemiletov · Jul 4, 2018 · d714b99 · d714b99
1 parent 69c8f1e
commit d714b99
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/document.cpp b/document.cpp
@@ -318,7 +318,7 @@ CDox::~CDox()
   qstring_save (recent_list_fname, recent_files.join ("\n"));
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
   delete joystick;
 #endif
 #endif
@@ -1044,7 +1044,7 @@ CDox::CDox()
   timer->setInterval (100);
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
   joystick = new CJoystick (0, this);
 
   if (joystick->initialized)
@@ -2794,7 +2794,7 @@ void CSyntaxHighlighter::highlightBlock (const QString &text)
 */
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
 bool CDox::event (QEvent *ev)
 {
 

diff --git a/document.h b/document.h
@@ -49,7 +49,7 @@ code from qwriter:
 #endif
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
 #include "myjoystick.h"
 #endif
 #endif
@@ -328,7 +328,7 @@ class CDox: public QObject
   QString recent_list_fname;
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
   CJoystick *joystick;
 #endif 
 #endif
@@ -340,7 +340,7 @@ class CDox: public QObject
   ~CDox();
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !!defined (Q_OS_MACOS)
   bool event (QEvent *ev);
   void handle_joystick_event (CJoystickAxisEvent *ev);
 #endif

diff --git a/myjoystick.cpp b/myjoystick.cpp
@@ -3,7 +3,7 @@
 #include "myjoystick.h"
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
 
 #include <QDebug>
 #include <QApplication>

diff --git a/myjoystick.h b/myjoystick.h
@@ -6,7 +6,7 @@
 #include <QObject>
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
 
 #include <iostream>
 #include <unistd.h>

diff --git a/rvln.cpp b/rvln.cpp
@@ -2314,7 +2314,7 @@ void rvln::cb_altmenu_stateChanged (int state)
 }
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
 void rvln::cb_use_joystick_stateChanged (int state)
 {
   bool b;
@@ -2587,7 +2587,7 @@ void rvln::createOptions()
   cb_wasd->setCheckState (Qt::CheckState (settings->value ("wasd", "0").toInt()));
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS   
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)   
   cb_use_joystick = new QCheckBox (tr ("Use joystick as cursor keys"), tab_options);
   cb_use_joystick->setCheckState (Qt::CheckState (settings->value ("use_joystick", "0").toInt()));
   connect (cb_use_joystick, SIGNAL(stateChanged (int)),
@@ -2695,7 +2695,7 @@ void rvln::createOptions()
   page_common_layout->addWidget (cb_wasd);
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
   page_common_layout->addWidget (cb_use_joystick);
 #endif
 #endif
@@ -8405,7 +8405,7 @@ void rvln::leaving_tune()
   settings->setValue ("wasd", cb_wasd->checkState());
 
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
   settings->setValue ("use_joystick", cb_use_joystick->checkState());
 #endif  
 #endif

diff --git a/rvln.h b/rvln.h
@@ -696,7 +696,7 @@ main window callbacks
 prefs window callbacks
 *************************/
 #if defined(Q_OS_UNIX)
-#ifndef Q_OS_MACOS
+#if !defined (Q_OS_MAC) || !defined (Q_OS_MACOS)
   void cb_use_joystick_stateChanged (int state);
 #endif
 #endif