QT_NO_* -> TQT_NO_* renaming.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 55 insertions, 55 deletions

diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 08402bb1..23d5969a 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -89,9 +89,9 @@
 #include "ntqfileinfo.h"
 
 // Input method stuff - UNFINISHED
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 #include "ntqinputcontext.h"
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 #include "qinternal_p.h" // shared double buffer cleanup
 
 #if defined(TQT_THREAD_SUPPORT)
@@ -104,7 +104,7 @@
 
 #include "qt_x11_p.h"
 
-#if !defined(QT_NO_XFTFREETYPE)
+#if !defined(TQT_NO_XFTFREETYPE)
 // XFree86 4.0.3 implementation is missing XftInitFtLibrary forward
 extern "C" Bool XftInitFtLibrary(void);
 #endif
@@ -302,7 +302,7 @@ Window		*qt_net_virtual_root_list	= 0;
 
 
 // X11 SYNC support
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 Atom		qt_net_wm_sync_request_counter	= 0;
 Atom		qt_net_wm_sync_request     	= 0;
 #endif
@@ -319,7 +319,7 @@ static const int FocusModel_Other = 0;
 static const int FocusModel_PointerRoot = 1;
 static int qt_focus_model = -1;
 
-#ifndef QT_NO_XRANDR
+#ifndef TQT_NO_XRANDR
 // TRUE if TQt is compiled w/ XRandR support and XRandR exists on the connected
 // Display
 bool	qt_use_xrandr	= FALSE;
@@ -330,7 +330,7 @@ static int xrandr_eventbase;
 // Display
 Q_EXPORT bool tqt_use_xrender = FALSE;
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 // True if SYNC extension exists on the connected display
 bool qt_use_xsync = FALSE;
 static int xsync_eventbase;
@@ -423,7 +423,7 @@ static bool qt_x11EventFilter( XEvent* ev )
 
 
 
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
 //XIM		qt_xim			= 0;
 Q_EXPORT XIMStyle	qt_xim_style		= 0;
 Q_EXPORT XIMStyle	qt_xim_preferred_style	= 0;
@@ -666,16 +666,16 @@ TQString TQApplication::defaultInputMethod()
 }
 
 
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM_EXTENSIONS)
 /*! \internal
     Creates the application input method.
 */
 void TQApplication::create_im()
 {
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
     if ( ! qt_xim_preferred_style ) // no configured input style, use the default
 	qt_xim_preferred_style = xim_default_style;
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
 }
 
 
@@ -700,10 +700,10 @@ void TQApplication::close_im()
 */
 void TQApplication::create_xim()
 {
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
     if ( ! qt_xim_preferred_style ) // no configured input style, use the default
 	qt_xim_preferred_style = xim_default_style;
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
 
     TQWidgetList *list= tqApp->topLevelWidgets();
     TQWidgetListIt it(*list);
@@ -721,7 +721,7 @@ void TQApplication::create_xim()
  */
 void TQApplication::close_xim()
 {
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
     // Calling XCloseIM gives a Purify FMR error
     // XCloseIM( qt_xim );
     // We prefer a less serious memory leak
@@ -729,7 +729,7 @@ void TQApplication::close_xim()
     // if ( qt_xim )
     // 	qt_xim = 0;
 
-#endif // QT_NO_XIM
+#endif // TQT_NO_XIM
     TQWidgetList *list = tqApp->topLevelWidgets();
     TQWidgetListIt it(*list);
     while(it.current()) {
@@ -1108,7 +1108,7 @@ bool TQApplication::x11_apply_settings()
     qt_use_rtl_extensions =
     	settings.readBoolEntry("/qt/useRtlExtensions", FALSE);
 
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
     if (qt_xim_preferred_style == 0) {
         TQString ximInputStyle =
             settings.readEntry( "/qt/XIMInputStyle",
@@ -1124,7 +1124,7 @@ bool TQApplication::x11_apply_settings()
     }
 #endif
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     /*
 	The identifier name of an input method is acquired from the
 	configuration file as a default. If a environment variable
@@ -1134,7 +1134,7 @@ bool TQApplication::x11_apply_settings()
      */
     if ( getenv( "QT_IM_SWITCHER" ) )
         defaultIM = getenv( "QT_IM_SWITCHER" );
-#ifndef QT_NO_IM_EXTENSIONS
+#ifndef TQT_NO_IM_EXTENSIONS
     else
         defaultIM = settings.readEntry( "/qt/DefaultInputMethodSwitcher", "imsw-multi" );
 #endif
@@ -1742,7 +1742,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 			// ### Should we honor any others?
 		    }
 		}
-#ifndef QT_NO_XIM
+#ifndef TQT_NO_XIM
 	    } else if ( arg == "-inputstyle" ) {
 		if ( ++i < argc ) {
 		    TQCString s = TQCString(argv[i]).lower();
@@ -2060,7 +2060,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 	qt_x11_intern_atom( "UTF8_STRING", &qt_utf8_string );
         qt_x11_intern_atom( "_SGI_DESKS_MANAGER", &qt_sgi_desks_manager );
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 	qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST_COUNTER", &qt_net_wm_sync_request_counter );
 	qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST", &qt_net_wm_sync_request );
 #endif
@@ -2078,7 +2078,7 @@ void tqt_init_internal( int *argcptr, char **argv,
 	qt_get_net_supported();
 	qt_get_net_virtual_roots();
 
-#ifndef QT_NO_XRANDR
+#ifndef TQT_NO_XRANDR
 	// See if XRandR is supported on the connected display
 	int xrandr_errorbase;
 	Q_UNUSED( xrandr_eventbase );
@@ -2086,9 +2086,9 @@ void tqt_init_internal( int *argcptr, char **argv,
 	    // XRandR is supported
 	    qt_use_xrandr = TRUE;
 	}
-#endif // QT_NO_XRANDR
+#endif // TQT_NO_XRANDR
 
-#ifndef QT_NO_XRENDER
+#ifndef TQT_NO_XRENDER
 	// See if XRender is supported on the connected display
 	int xrender_eventbase, xrender_errorbase;
 	if (XRenderQueryExtension(appDpy, &xrender_eventbase, &xrender_errorbase)) {
@@ -2099,9 +2099,9 @@ void tqt_init_internal( int *argcptr, char **argv,
 					(Visual *) TQPaintDevice::x_appvisual);
 	    tqt_use_xrender = (format != 0) && (TQPaintDevice::x_appdepth != 8);
 	}
-#endif // QT_NO_XRENDER
+#endif // TQT_NO_XRENDER
 
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 	// Try to initialize SYNC extension on the connected display
 	int xsync_major, xsync_minor;
 	if ( XSyncQueryExtension( appDpy, &xsync_eventbase, &xsync_errorbase ) && 
@@ -2110,14 +2110,14 @@ void tqt_init_internal( int *argcptr, char **argv,
 	}
 #endif 
 
-#ifndef QT_NO_XKB
+#ifndef TQT_NO_XKB
 	// If XKB is detected, set the GrabsUseXKBState option so input method
 	// compositions continue to work (ie. deadkeys)
 	unsigned int state = XkbPCF_GrabsUseXKBStateMask;
 	(void) XkbSetPerClientControls(appDpy, state, &state);
 #endif
 
-#if !defined(QT_NO_XFTFREETYPE)
+#if !defined(TQT_NO_XFTFREETYPE)
 	// defined in qfont_x11.cpp
 	extern bool tqt_has_xft;
 #ifndef QT_XFT2
@@ -2141,7 +2141,7 @@ void tqt_init_internal( int *argcptr, char **argv,
                 }
             }
         }
-#endif // QT_NO_XFTFREETYPE
+#endif // TQT_NO_XFTFREETYPE
 
 	// look at the modifier mapping, and get the correct masks for alt/meta
 	// find the alt/meta masks
@@ -2220,10 +2220,10 @@ void tqt_init_internal( int *argcptr, char **argv,
 			  KeymapStateMask | EnterWindowMask | LeaveWindowMask |
 			  PropertyChangeMask );
 
-#ifndef QT_NO_XRANDR
+#ifndef TQT_NO_XRANDR
 	    if (qt_use_xrandr)
 		XRRSelectInput( appDpy, TQPaintDevice::x11AppRootWindow( screen ), True );
-#endif // QT_NO_XRANDR
+#endif // TQT_NO_XRANDR
 	}
     }
 
@@ -2246,8 +2246,8 @@ void tqt_init_internal( int *argcptr, char **argv,
 	    TQApplication::setFont( f );
 	}
 
-#if !defined(QT_NO_IM)
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM)
+#if !defined(TQT_NO_IM_EXTENSIONS)
     TQApplication::create_im();
 #else
     TQApplication::create_xim();
@@ -2414,7 +2414,7 @@ void tqt_init_internal( int *argcptr, char **argv,
     }
 
 
-#ifndef QT_NO_STYLE
+#ifndef TQT_NO_STYLE
     // run-time search for default style
 void TQApplication::x11_initialize_style()
 {
@@ -2506,8 +2506,8 @@ void tqt_cleanup()
 	XCloseDevice( appDpy, devEraser );
 #endif
 
-#if !defined(QT_NO_IM)
-#if !defined(QT_NO_IM_EXTENSIONS)
+#if !defined(TQT_NO_IM)
+#if !defined(TQT_NO_IM_EXTENSIONS)
     TQApplication::close_im();
 #else
     TQApplication::close_xim();
@@ -2825,7 +2825,7 @@ void TQApplication::setMainWidget( TQWidget *mainWidget )
     }
 }
 
-#ifndef QT_NO_CURSOR
+#ifndef TQT_NO_CURSOR
 
 /*****************************************************************************
   TQApplication cursor stack
@@ -3252,10 +3252,10 @@ int TQApplication::x11ClientMessage(TQWidget* w, XEvent* event, bool passive_onl
 			amw->setActiveWindow();
 		    }
 		}
-#ifndef QT_NO_WHATSTHIS
+#ifndef TQT_NO_WHATSTHIS
 	    } else if ( a == qt_net_wm_context_help ) {
 		TQWhatsThis::enterWhatsThisMode();
-#endif // QT_NO_WHATSTHIS
+#endif // TQT_NO_WHATSTHIS
 	    } else if ( a == qt_net_wm_ping ) {
 		// avoid send/reply loops
 		Window root = TQPaintDevice::x11AppRootWindow( w->x11Screen() );
@@ -3264,7 +3264,7 @@ int TQApplication::x11ClientMessage(TQWidget* w, XEvent* event, bool passive_onl
 		    XSendEvent( event->xclient.display, event->xclient.window,
 				False, SubstructureNotifyMask|SubstructureRedirectMask, event );
 		}
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 	    } else if (a == qt_net_wm_sync_request ) {
 		    widget->handleSyncRequest( event );
 #endif
@@ -3374,7 +3374,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 	}
     }
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     // Filtering input events by the input context. It has to be taken
     // place before any other key event consumers such as eventfilters
     // and accelerators because some input methods require quite
@@ -3383,7 +3383,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
     // filtering opportunity first to ensure all input methods work
     // properly regardless of application design.
 
-// #ifndef QT_NO_IM_EXTENSIONS
+// #ifndef TQT_NO_IM_EXTENSIONS
     if( keywidget && keywidget->isEnabled() && keywidget->isInputMethodEnabled() ) {
 // #else
 //    if( keywidget && keywidget->isEnabled() ) {
@@ -3423,7 +3423,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 		return TRUE;
 	}
     } else
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
     {
 	if ( XFilterEvent( event, None ) )
 	    return TRUE;
@@ -3472,7 +3472,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 	return 0;
     }
 
-#ifndef QT_NO_XRANDR
+#ifndef TQT_NO_XRANDR
     // XRandR doesn't care if TQt doesn't know about the widget, so handle XRandR stuff before the !widget check below
     if (event->type == xrandr_eventbase + RRScreenChangeNotify
 	|| ( event->type == ConfigureNotify && event->xconfigure.window == TQPaintDevice::x11AppRootWindow())) {
@@ -3504,7 +3504,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 	    }
 	}
     }
-#endif // QT_NO_XRANDR
+#endif // TQT_NO_XRANDR
 
     if ( !widget ) {				// don't know this windows
 	TQWidget* popup = TQApplication::activePopupWidget();
@@ -5044,7 +5044,7 @@ static void deleteKeyDicts()
     textDict = 0;
 }
 
-#if !defined(QT_NO_XIM)
+#if !defined(TQT_NO_XIM)
 static const unsigned short katakanaKeysymsToUnicode[] = {
     0x0000, 0x3002, 0x300C, 0x300D, 0x3001, 0x30FB, 0x30F2, 0x30A1,
     0x30A3, 0x30A5, 0x30A7, 0x30A9, 0x30E3, 0x30E5, 0x30E7, 0x30C3,
@@ -5231,7 +5231,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count,
 
     type = (event->type == XKeyPress)
            ? TQEvent::KeyPress : TQEvent::KeyRelease;
-#if defined(QT_NO_XIM)
+#if defined(TQT_NO_XIM)
 
     count = XLookupString( &xkeyevent, chars.data(), chars.size(), &key, 0 );
 
@@ -5337,7 +5337,7 @@ bool TQETWidget::translateKeyEventInternal( const XEvent *event, int& count,
 	    ascii = (char)(s-256);
 	}
     }
-#endif // !QT_NO_XIM
+#endif // !TQT_NO_XIM
 
     state = qt_x11_translateButtonState( keystate );
 
@@ -5615,13 +5615,13 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab )
 	translateKeyEventInternal( event, count, text, state, ascii, code, type );
     }
 
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
     TQInputContext *qic = getInputContext();
 #endif
 
     // compress keys
     if ( !text.isEmpty() && testWState(WState_CompressKeys) &&
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 	 // Ordinary input methods require discrete key events to work
 	 // properly, so key compression has to be disabled when input
 	 // context exists.
@@ -5642,7 +5642,7 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab )
 	 // such as key repeat mechanism is required to implement such
 	 // feature.
 	 ! qic &&
-#endif // QT_NO_IM
+#endif // TQT_NO_IM
 	 // do not compress keys if the key event we just got above matches
 	 // one of the key ranges used to compute stopCompression
 	 ! ( ( code >= Key_Escape && code <= Key_SysReq ) ||
@@ -5702,10 +5702,10 @@ bool TQETWidget::translateKeyEvent( const XEvent *event, bool grab )
     // autorepeat compression makes sense for all widgets (Windows
     // does it automatically .... )
     if ( event->type == XKeyPress && text.length() <= 1
-#ifndef QT_NO_IM
+#ifndef TQT_NO_IM
 	 // input methods need discrete key events
 	 && ! qic
-#endif// QT_NO_IM
+#endif// TQT_NO_IM
 	 ) {
 	XEvent dummy;
 
@@ -5917,7 +5917,7 @@ bool TQETWidget::translateScrollDoneEvent( const XEvent *event )
 #if defined(Q_C_CALLBACKS)
 extern "C" {
 #endif
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
 static Bool qt_net_wm_sync_request_scanner(Display*, XEvent* event, XPointer arg)
 {
     return (event->type == ClientMessage && event->xclient.window == *(Window*)arg
@@ -5983,7 +5983,7 @@ bool TQETWidget::translateConfigEvent( const XEvent *event )
                 }
                 ++compressed_configs;
             }
-#ifndef QT_NO_XSYNC
+#ifndef TQT_NO_XSYNC
             // _NET_WM_SYNC_REQUEST compression 
             Window wid = winId();
             while ( compressed_configs &&
@@ -6234,7 +6234,7 @@ bool TQApplication::isEffectEnabled( TQt::UIEffect effect )
   Session management support
  *****************************************************************************/
 
-#ifndef QT_NO_SM_SUPPORT
+#ifndef TQT_NO_SM_SUPPORT
 
 #include <X11/SM/SMlib.h>
 
@@ -6712,4 +6712,4 @@ void TQSessionManager::requestPhase2()
 }
 
 
-#endif // QT_NO_SM_SUPPORT
+#endif // TQT_NO_SM_SUPPORT