Automated update from qt3

1 files changed, 32 insertions, 32 deletions

diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 4579b98f..72e29b14 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -419,7 +419,7 @@ static bool qt_x11EventFilter( XEvent* ev )
 {
     if ( qt_x11_event_filter  && qt_x11_event_filter( ev )  )
 	return TRUE;
-    return qApp->x11EventFilter( ev );
+    return tqApp->x11EventFilter( ev );
 }
 
 
@@ -620,7 +620,7 @@ TQWidgetList *TQApplication::icHolderWidgets()
 */
 void TQApplication::changeAllInputContext( const TQString &identifierName )
 {
-    TQWidgetList *list = qApp->icHolderWidgets();
+    TQWidgetList *list = tqApp->icHolderWidgets();
     TQWidgetListIt it(*list);
     while(it.current()) {
 	it.current()->changeInputContext( identifierName );
@@ -687,7 +687,7 @@ void TQApplication::create_im()
 */
 void TQApplication::close_im()
 {
-    TQWidgetList *list = qApp->icHolderWidgets();
+    TQWidgetList *list = tqApp->icHolderWidgets();
     TQWidgetListIt it(*list);
     while(it.current()) {
 	it.current()->destroyInputContext();
@@ -708,7 +708,7 @@ void TQApplication::create_xim()
 	qt_xim_preferred_style = xim_default_style;
 #endif // QT_NO_XIM
 
-    TQWidgetList *list= qApp->topLevelWidgets();
+    TQWidgetList *list= tqApp->topLevelWidgets();
     TQWidgetListIt it(*list);
     TQWidget * w;
     while( (w=it.current()) != 0 ) {
@@ -733,7 +733,7 @@ void TQApplication::close_xim()
     // 	qt_xim = 0;
 
 #endif // QT_NO_XIM
-    TQWidgetList *list = qApp->topLevelWidgets();
+    TQWidgetList *list = tqApp->topLevelWidgets();
     TQWidgetListIt it(*list);
     while(it.current()) {
 	it.current()->destroyInputContext();
@@ -807,7 +807,7 @@ static int qt_x_errhandler( Display *dpy, XErrorEvent *err )
 static int qt_xio_errhandler( Display * )
 {
     qWarning( "%s: Fatal IO error: client killed", appName );
-    qApp = 0;
+    tqApp = 0;
     exit( 1 );
     //### give the application a chance for a proper shutdown instead,
     //### exit(1) doesn't help.
@@ -1065,7 +1065,7 @@ bool TQApplication::x11_apply_settings()
     if (defaultcodec != "none") {
 	TQTextCodec *codec = TQTextCodec::codecForName(defaultcodec);
 	if (codec)
-	    qApp->setDefaultCodec(codec);
+	    tqApp->setDefaultCodec(codec);
     }
 
     TQStringList strut = settings.readListEntry("/qt/globalStrut");
@@ -1559,7 +1559,7 @@ void qt_x11_create_wm_client_leader()
 		     (unsigned char *)&qt_x11_wm_client_leader, 1 );
 
     // If we are session managed, inform the window manager about it
-    TQCString session = qApp->sessionId().latin1();
+    TQCString session = tqApp->sessionId().latin1();
     if ( !session.isEmpty() ) {
 	XChangeProperty( TQPaintDevice::x11AppDisplay(),
 			 qt_x11_wm_client_leader, qt_sm_client_id,
@@ -1808,7 +1808,7 @@ void qt_init_internal( int *argcptr, char **argv,
 	    if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) {
 		qWarning( "%s: cannot connect to X server %s", appName,
 			  XDisplayName(appDpyName) );
-		qApp = 0;
+		tqApp = 0;
 		exit( 1 );
 	    }
 
@@ -2206,7 +2206,7 @@ void qt_init_internal( int *argcptr, char **argv,
 #endif
 
     if( qt_is_gui_used ) {
-	qApp->setName( appName );
+	tqApp->setName( appName );
 
 	int screen;
 	for ( screen = 0; screen < appScreenCount; ++screen ) {
@@ -2398,7 +2398,7 @@ void qt_init_internal( int *argcptr, char **argv,
 		if (defaultcodec != "none") {
 		    TQTextCodec *codec = TQTextCodec::codecForName(defaultcodec);
 		    if (codec)
-			qApp->setDefaultCodec(codec);
+			tqApp->setDefaultCodec(codec);
 		}
 
 		qt_resolve_symlinks =
@@ -2623,7 +2623,7 @@ const char *tqAppName()				// get application name
     return appName;
 }
 
-const char *qAppClass()				// get application class
+const char *tqAppClass()				// get application class
 {
     return appClass;
 }
@@ -3482,7 +3482,7 @@ int TQApplication::x11ProcessEvent( XEvent* event )
 	    case XKeyRelease:
 		do {
 		    popup->close();
-		} while ( (popup = qApp->activePopupWidget()) );
+		} while ( (popup = tqApp->activePopupWidget()) );
 		return 1;
 	    }
 	}
@@ -4102,7 +4102,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event )
 		 || nextEvent.type == PropertyNotify
 		 || nextEvent.type == Expose
 		 || nextEvent.type == NoExpose ) {
-		qApp->x11ProcessEvent( &nextEvent );
+		tqApp->x11ProcessEvent( &nextEvent );
 		continue;
 	    } else if ( nextEvent.type != MotionNotify ||
 			nextEvent.xmotion.window != event->xmotion.window ||
@@ -4170,7 +4170,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event )
 
 	    // take care about grabbing. We do this here since it
 	    // is clear that we return anyway
-	    if ( qApp->inPopupMode() && popupGrabOk )
+	    if ( tqApp->inPopupMode() && popupGrabOk )
 		XAllowEvents( x11Display(), SyncPointer, CurrentTime );
 
 	    // We are only interested in ButtonPress.
@@ -4264,8 +4264,8 @@ bool TQETWidget::translateMouseEvent( const XEvent *event )
     if ( type == 0 )				// don't send event
 	return FALSE;
 
-    if ( qApp->inPopupMode() ) {			// in popup mode
-	TQWidget *popup = qApp->activePopupWidget();
+    if ( tqApp->inPopupMode() ) {			// in popup mode
+	TQWidget *popup = tqApp->activePopupWidget();
 	if ( popup != this ) {
 	    if ( testWFlags(WType_Popup) && rect().contains(pos) )
 		popup = this;
@@ -4334,7 +4334,7 @@ bool TQETWidget::translateMouseEvent( const XEvent *event )
 	if ( releaseAfter )
 	    qt_button_down = 0;
 
-	if ( qApp->inPopupMode() ) { // still in popup mode
+	if ( tqApp->inPopupMode() ) { // still in popup mode
 	    if ( popupGrabOk )
 		XAllowEvents( dpy, SyncPointer, CurrentTime );
 	} else {
@@ -4394,7 +4394,7 @@ bool TQETWidget::translateWheelEvent( int global_x, int global_y, int delta, int
 {
     // send the event to the widget or its ancestors
     {
-	TQWidget* popup = qApp->activePopupWidget();
+	TQWidget* popup = tqApp->activePopupWidget();
 	if ( popup && topLevelWidget() != popup )
 	    popup->close();
 	TQWheelEvent e( mapFromGlobal(TQPoint( global_x, global_y)),
@@ -4405,8 +4405,8 @@ bool TQETWidget::translateWheelEvent( int global_x, int global_y, int delta, int
 
     // send the event to the widget that has the focus or its ancestors, if different
     TQWidget *w = this;
-    if ( w != qApp->focusWidget() && ( w = qApp->focusWidget() ) ) {
-	TQWidget* popup = qApp->activePopupWidget();
+    if ( w != tqApp->focusWidget() && ( w = tqApp->focusWidget() ) ) {
+	TQWidget* popup = tqApp->activePopupWidget();
 	if ( popup && w != popup )
 	    popup->hide();
 	TQWheelEvent e( mapFromGlobal(TQPoint( global_x, global_y)),
@@ -6366,7 +6366,7 @@ static void sm_performSaveYourself( TQSessionManagerData* smd )
     smd->sessionKey  = TQString::number( tv.tv_sec ) + "_" + TQString::number(tv.tv_usec);
 
     // tell the session manager about our program in best POSIX style
-    sm_setProperty( SmProgram, TQString( qApp->argv()[0] ) );
+    sm_setProperty( SmProgram, TQString( tqApp->argv()[0] ) );
     // tell the session manager about our user as well.
     struct passwd* entry = getpwuid( geteuid() );
     if ( entry )
@@ -6374,8 +6374,8 @@ static void sm_performSaveYourself( TQSessionManagerData* smd )
 
     // generate a restart and discard command that makes sense
     TQStringList restart;
-    restart  << qApp->argv()[0] << "-session" << smd->sessionId + "_" + smd->sessionKey;
-    if (qstricmp(tqAppName(), qAppClass()) != 0)
+    restart  << tqApp->argv()[0] << "-session" << smd->sessionId + "_" + smd->sessionKey;
+    if (qstricmp(tqAppName(), tqAppClass()) != 0)
 	restart << "-name" << tqAppName();
     sm->setRestartCommand( restart );
     TQStringList discard;
@@ -6383,15 +6383,15 @@ static void sm_performSaveYourself( TQSessionManagerData* smd )
 
     switch ( sm_saveType ) {
     case SmSaveBoth:
-	qApp->commitData( *sm );
+	tqApp->commitData( *sm );
 	if ( sm_isshutdown && sm_cancel)
 	    break; // we cancelled the shutdown, no need to save state
     // fall through
     case SmSaveLocal:
-	qApp->saveState( *sm );
+	tqApp->saveState( *sm );
 	break;
     case SmSaveGlobal:
-	qApp->commitData( *sm );
+	tqApp->commitData( *sm );
 	break;
     default:
 	break;
@@ -6438,7 +6438,7 @@ static void sm_dieCallback( SmcConn smcConn, SmPointer /* clientData  */)
 	return;
     resetSmState();
     TQEvent quitEvent(TQEvent::Quit);
-    TQApplication::sendEvent(qApp, &quitEvent);
+    TQApplication::sendEvent(tqApp, &quitEvent);
 }
 
 static void sm_shutdownCancelledCallback( SmcConn smcConn, SmPointer /* clientData */)
@@ -6446,7 +6446,7 @@ static void sm_shutdownCancelledCallback( SmcConn smcConn, SmPointer /* clientDa
     if (smcConn != smcConnection )
 	return;
     if ( sm_waitingForInteraction )
-	qApp->exit_loop();
+	tqApp->exit_loop();
     resetSmState();
 }
 
@@ -6462,7 +6462,7 @@ static void sm_interactCallback( SmcConn smcConn, SmPointer /* clientData */ )
     if (smcConn != smcConnection )
 	return;
     if ( sm_waitingForInteraction )
-	qApp->exit_loop();
+	tqApp->exit_loop();
 }
 
 static void sm_saveYourselfPhase2Callback( SmcConn smcConn, SmPointer clientData )
@@ -6570,7 +6570,7 @@ bool TQSessionManager::allowsInteraction()
 							sm_interactCallback, (SmPointer*) this );
     }
     if ( sm_waitingForInteraction ) {
-	qApp->enter_loop();
+	tqApp->enter_loop();
 	sm_waitingForInteraction = FALSE;
 	if ( sm_smActive ) { // not cancelled
 	    sm_interactionActive = TRUE;
@@ -6594,7 +6594,7 @@ bool TQSessionManager::allowsErrorInteraction()
 							sm_interactCallback, (SmPointer*) this );
     }
     if ( sm_waitingForInteraction ) {
-	qApp->enter_loop();
+	tqApp->enter_loop();
 	sm_waitingForInteraction = FALSE;
 	if ( sm_smActive ) { // not cancelled
 	    sm_interactionActive = TRUE;