From 5e51787f9af4fd86450fab9e787b4037a772bca3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 13 Feb 2024 11:10:37 +0900 Subject: Replace Q_WS_* defines with TQ_WS_* equivalents Signed-off-by: Michele Calgaro (cherry picked from commit 03aa7238b34bb438632b6d572b008e32960f0895) --- tdecore/kkeynative_x11.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'tdecore/kkeynative_x11.cpp') diff --git a/tdecore/kkeynative_x11.cpp b/tdecore/kkeynative_x11.cpp index d5ecb24da..8ab457a26 100644 --- a/tdecore/kkeynative_x11.cpp +++ b/tdecore/kkeynative_x11.cpp @@ -23,7 +23,7 @@ #include #include -#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 +#if defined(TQ_WS_X11) || defined(TQ_WS_WIN) || defined(TQ_WS_MACX) // Only compile this module if we're compiling for X11, mac or win32 #include "kkeynative.h" #include "kkeyserver_x11.h" @@ -34,7 +34,7 @@ #include #include -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #define XK_MISCELLANY #define XK_XKB_KEYS #include @@ -56,7 +56,7 @@ static KKeyNative* gx_pkey = 0; KKeyNative::KKeyNative() { clear(); } KKeyNative::KKeyNative( const KKey& key ) { init( key ); } KKeyNative::KKeyNative( const KKeyNative& key ) { init( key ); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 KKeyNative::KKeyNative( const XEvent* pEvent ) { init( pEvent ); } #endif @@ -77,7 +77,7 @@ void KKeyNative::clear() m_sym = 0; } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 bool KKeyNative::init( const XEvent* pEvent ) { KeySym keySym; @@ -91,11 +91,11 @@ bool KKeyNative::init( const XEvent* pEvent ) bool KKeyNative::init( const KKey& key ) { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN m_sym = key.sym(); m_code = m_sym; //key.keyCodeQt(); m_mod = key.m_mod; -#elif !defined(Q_WS_WIN) && !defined(Q_WS_MACX) +#elif !defined(TQ_WS_WIN) && !defined(TQ_WS_MACX) // Get any extra mods required by the sym. // E.g., XK_Plus requires SHIFT on the en layout. m_sym = key.sym(); @@ -167,7 +167,7 @@ KKeyNative& KKeyNative::null() KKey KKeyNative::key() const { -#ifdef Q_WS_WIN +#ifdef TQ_WS_WIN return KKey( m_sym, m_mod ); #else uint modSpec; @@ -192,7 +192,7 @@ int KKeyNative::keyCodeQt() const bool KKeyNative::keyboardHasWinKey() { return KKeyServer::keyboardHasWinKey(); } -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 uint KKeyNative::modX( KKey::ModFlag modFlag ) { return KKeyServer::modX( modFlag ); } uint KKeyNative::accelModMaskX() { return KKeyServer::accelModMaskX(); } uint KKeyNative::modXNumLock() { return KKeyServer::modXNumLock(); } @@ -201,4 +201,4 @@ uint KKeyNative::modXScrollLock() { return KKeyServer::modXScrollLo uint KKeyNative::modXModeSwitch() { return KKeyServer::modXModeSwitch(); } #endif -#endif // Q_WS_X11 +#endif // TQ_WS_X11 -- cgit v1.2.1