Remove original Q_WS_* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/103/head
Michele Calgaro 3 months ago
parent facf04e60c
commit 77697cb46c
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -598,36 +598,27 @@ body { background: #ffffff; color: black; }
*/ */
#if defined(Q_OS_MAC9) #if defined(Q_OS_MAC9)
# define Q_WS_MAC9
# define TQ_WS_MAC9 # define TQ_WS_MAC9
#elif defined(Q_OS_MSDOS) #elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
# define TQ_WS_WIN16 # define TQ_WS_WIN16
# error "TQt requires Win32 and does not work with Windows 3.x" # error "TQt requires Win32 and does not work with Windows 3.x"
#elif defined(_WIN32_X11_) #elif defined(_WIN32_X11_)
# define Q_WS_X11
# define TQ_WS_X11 # define TQ_WS_X11
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
# define Q_WS_WIN32
# define TQ_WS_WIN32 # define TQ_WS_WIN32
# if defined(Q_OS_WIN64) # if defined(Q_OS_WIN64)
# define Q_WS_WIN64
# define TQ_WS_WIN64 # define TQ_WS_WIN64
# endif # endif
#elif defined(Q_OS_OS2) #elif defined(Q_OS_OS2)
# define Q_WS_PM
# define TQ_WS_PM # define TQ_WS_PM
# error "TQt does not work with OS/2 Presentation Manager or Workplace Shell" # error "TQt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
# if defined(TQWS) # if defined(TQWS)
# define Q_WS_QWS
# define TQ_WS_QWS # define TQ_WS_QWS
# define TQT_NO_QWS_IM # define TQT_NO_QWS_IM
# elif defined(Q_OS_MACX) # elif defined(Q_OS_MACX)
# define Q_WS_MACX
# define TQ_WS_MACX # define TQ_WS_MACX
# else # else
# define Q_WS_X11
# define TQ_WS_X11 # define TQ_WS_X11
# endif # endif
#endif #endif
@ -636,12 +627,10 @@ body { background: #ffffff; color: black; }
#endif #endif
#if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32) #if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32)
# define Q_WS_WIN
# define TQ_WS_WIN # define TQ_WS_WIN
#endif #endif
#if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) &amp;&amp; !defined(TQ_WS_QWS) &amp;&amp; !defined(TQ_WS_X11) #if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) &amp;&amp; !defined(TQ_WS_QWS) &amp;&amp; !defined(TQ_WS_X11)
# define Q_WS_MAC
# define TQ_WS_MAC # define TQ_WS_MAC
#endif #endif

@ -564,36 +564,27 @@
*/ */
#if defined(Q_OS_MAC9) #if defined(Q_OS_MAC9)
# define Q_WS_MAC9
# define TQ_WS_MAC9 # define TQ_WS_MAC9
#elif defined(Q_OS_MSDOS) #elif defined(Q_OS_MSDOS)
# define Q_WS_WIN16
# define TQ_WS_WIN16 # define TQ_WS_WIN16
# error "TQt requires Win32 and does not work with Windows 3.x" # error "TQt requires Win32 and does not work with Windows 3.x"
#elif defined(_WIN32_X11_) #elif defined(_WIN32_X11_)
# define Q_WS_X11
# define TQ_WS_X11 # define TQ_WS_X11
#elif defined(Q_OS_WIN32) #elif defined(Q_OS_WIN32)
# define Q_WS_WIN32
# define TQ_WS_WIN32 # define TQ_WS_WIN32
# if defined(Q_OS_WIN64) # if defined(Q_OS_WIN64)
# define Q_WS_WIN64
# define TQ_WS_WIN64 # define TQ_WS_WIN64
# endif # endif
#elif defined(Q_OS_OS2) #elif defined(Q_OS_OS2)
# define Q_WS_PM
# define TQ_WS_PM # define TQ_WS_PM
# error "TQt does not work with OS/2 Presentation Manager or Workplace Shell" # error "TQt does not work with OS/2 Presentation Manager or Workplace Shell"
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
# if defined(TQWS) # if defined(TQWS)
# define Q_WS_QWS
# define TQ_WS_QWS # define TQ_WS_QWS
# define TQT_NO_QWS_IM # define TQT_NO_QWS_IM
# elif defined(Q_OS_MACX) # elif defined(Q_OS_MACX)
# define Q_WS_MACX
# define TQ_WS_MACX # define TQ_WS_MACX
# else # else
# define Q_WS_X11
# define TQ_WS_X11 # define TQ_WS_X11
# endif # endif
#endif #endif
@ -602,12 +593,10 @@
#endif #endif
#if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32) #if defined(TQ_WS_WIN16) || defined(TQ_WS_WIN32)
# define Q_WS_WIN
# define TQ_WS_WIN # define TQ_WS_WIN
#endif #endif
#if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) && !defined(TQ_WS_QWS) && !defined(TQ_WS_X11) #if (defined(TQ_WS_MAC9) || defined(TQ_WS_MACX)) && !defined(TQ_WS_QWS) && !defined(TQ_WS_X11)
# define Q_WS_MAC
# define TQ_WS_MAC # define TQ_WS_MAC
#endif #endif

Loading…
Cancel
Save