Automated update from qt3

1 files changed, 36 insertions, 36 deletions

diff --git a/src/kernel/qapplication.cpp b/src/kernel/qapplication.cpp
index c15f19ab4..149048905 100644
--- a/src/kernel/qapplication.cpp
+++ b/src/kernel/qapplication.cpp
@@ -95,7 +95,7 @@
   or more windows at any time.
 
   The TQApplication object is accessible through the global pointer \c
-  qApp. Its main areas of responsibility are:
+  tqApp. Its main areas of responsibility are:
   \list
 
   \i It initializes the application with the user's desktop settings
@@ -323,7 +323,7 @@ void qt_init( Display* dpy, TQt::HANDLE, TQt::HANDLE );
 #endif
 Q_EXPORT bool qt_tryModalHelper( TQWidget *widget, TQWidget **rettop );
 
-TQApplication *qApp = 0;			// global application object
+TQApplication *tqApp = 0;			// global application object
 
 TQStyle   *TQApplication::app_style      = 0;	// default application style
 bool      qt_explicit_app_style	       = FALSE; // style explicitly set by programmer
@@ -654,7 +654,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
   Initializes the window system and constructs an application object
   with \a argc command line arguments in \a argv.
 
-  The global \c qApp pointer refers to this application object. Only
+  The global \c tqApp pointer refers to this application object. Only
   one application object should be created.
 
   This application object must be constructed before any \link
@@ -663,7 +663,7 @@ void TQApplication::process_cmdline( int* argcptr, char ** argv )
 
   Note that \a argc and \a argv might be changed. TQt removes command
   line arguments that it recognizes. The modified \a argc and \a argv
-  can also be accessed later with \c qApp->argc() and \c qApp->argv().
+  can also be accessed later with \c tqApp->argc() and \c tqApp->argv().
   The documentation for argv() contains a detailed description of how
   to process command line arguments.
 
@@ -791,13 +791,13 @@ TQApplication::TQApplication( int &argc, char **argv, Type type )
 
 Q_EXPORT void qt_ucm_initialize( TQApplication *theApp )
 {
-    if ( qApp )
+    if ( tqApp )
 	return;
     int argc = theApp->argc();
     char **argv = theApp->argv();
-    theApp->construct( argc, argv, qApp->type() );
+    theApp->construct( argc, argv, tqApp->type() );
 
-    Q_ASSERT( qApp == theApp );
+    Q_ASSERT( tqApp == theApp );
 }
 
 void TQApplication::construct( int &argc, char **argv, Type type )
@@ -932,10 +932,10 @@ void TQApplication::init_precmdline()
     is_session_restored = FALSE;
 #endif
 #if defined(QT_CHECK_STATE)
-    if ( qApp )
+    if ( tqApp )
 	qWarning( "TQApplication: There should be max one application object" );
 #endif
-    qApp = (TQApplication*)this;
+    tqApp = (TQApplication*)this;
 }
 
 /*!
@@ -964,7 +964,7 @@ void TQApplication::initialize( int argc, char **argv )
     // connect to the session manager
     if ( !session_key )
 	session_key = new TQString;
-    session_manager = new TQSessionManager( qApp, session_id, *session_key );
+    session_manager = new TQSessionManager( tqApp, session_id, *session_key );
 #endif
 
 }
@@ -1017,7 +1017,7 @@ TQWidget *TQApplication::activeModalWidget()
 
 /*!
   Cleans up any window system resources that were allocated by this
-  application. Sets the global variable \c qApp to 0.
+  application. Sets the global variable \c tqApp to 0.
 */
 
 TQApplication::~TQApplication()
@@ -1098,10 +1098,10 @@ TQApplication::~TQApplication()
     postevent_mutex = 0;
 #endif // QT_THREAD_SUPPORT
 
-    if( qApp == this ) {
+    if( tqApp == this ) {
 	if ( postedEvents )
 	    removePostedEvents( this );
-	qApp = 0;
+	tqApp = 0;
     }
     is_app_running = FALSE;
 
@@ -1186,7 +1186,7 @@ TQApplication::~TQApplication()
     under X11, the list box contains the three strings "showargs",
     "hello" and "world".
 
-    TQt provides a global pointer, \c qApp, that points to the
+    TQt provides a global pointer, \c tqApp, that points to the
     TQApplication object, and through which you can access argc() and
     argv() in functions other than main().
 
@@ -1278,7 +1278,7 @@ TQStyle& TQApplication::style()
 	}
     }
 
-    app_style->polish( qApp );
+    app_style->polish( tqApp );
 #endif
     return *app_style;
 }
@@ -1326,7 +1326,7 @@ void TQApplication::setStyle( TQStyle *style )
 		}
 	    }
 	}
-	old->unPolish( qApp );
+	old->unPolish( tqApp );
     }
 
     // take care of possible palette requirements of certain gui
@@ -1338,7 +1338,7 @@ void TQApplication::setStyle( TQStyle *style )
     setPalette( tmpPal, TRUE );
 
     // initialize the application with the new style
-    app_style->polish( qApp );
+    app_style->polish( tqApp );
 
     // re-polish existing widgets if necessary
     if (old) {
@@ -1499,7 +1499,7 @@ int TQApplication::colorSpec()
 void TQApplication::setColorSpec( int spec )
 {
 #if defined(QT_CHECK_STATE)
-    if ( qApp ) {
+    if ( tqApp ) {
 	qWarning( "TQApplication::setColorSpec: This function must be "
 		 "called before the TQApplication object is created" );
     }
@@ -1546,7 +1546,7 @@ void TQApplication::setGlobalStrut( const TQSize& strut )
 }
 
 #if defined( Q_WS_WIN ) || defined( Q_WS_MAC )
-extern const char *qAppFileName();
+extern const char *tqAppFileName();
 #endif
 
 #ifndef QT_NO_DIR
@@ -1647,7 +1647,7 @@ TQString TQApplication::applicationFilePath()
 
     return filePath.filePath();
 #elif defined( Q_WS_MAC )
-    return TQDir::cleanDirPath( TQFile::decodeName( qAppFileName() ) );
+    return TQDir::cleanDirPath( TQFile::decodeName( tqAppFileName() ) );
 #else
     TQString argv0 = TQFile::decodeName( argv()[0] );
     TQString absPath;
@@ -1732,11 +1732,11 @@ TQStringList TQApplication::libraryPaths()
 	}
 
 	TQString app_location;
-	if (qApp)
-	    app_location = qApp->applicationFilePath();
+	if (tqApp)
+	    app_location = tqApp->applicationFilePath();
 #ifdef Q_WS_WIN
 	else {
-	    app_location = TQString(qAppFileName());
+	    app_location = TQString(tqAppFileName());
 	    app_location.replace('\\', '/');
 	}
 #endif
@@ -1821,7 +1821,7 @@ void TQApplication::removeLibraryPath( const TQString &path )
 TQPalette TQApplication::palette(const TQWidget* w)
 {
 #if defined(QT_CHECK_STATE)
-    if ( !qApp )
+    if ( !tqApp )
 	qWarning( "TQApplication::palette: This function can only be "
 		  "called after the TQApplication object has been created" );
 #endif
@@ -1872,7 +1872,7 @@ void TQApplication::setPalette( const TQPalette &palette, bool informWidgets,
     TQPalette *oldpal = 0;
 #ifndef QT_NO_STYLE
     if ( !startingUp() ) // on startup this has been done already
-	qApp->style().polish( pal );	// NB: non-const reference
+	tqApp->style().polish( pal );	// NB: non-const reference
 #endif
     bool all = FALSE;
     if ( !className ) {
@@ -2137,7 +2137,7 @@ TQFontMetrics TQApplication::fontMetrics()
   Example:
   \code
     TQPushButton *quitButton = new TQPushButton( "Quit" );
-    connect( quitButton, SIGNAL(clicked()), qApp, SLOT(quit()) );
+    connect( quitButton, SIGNAL(clicked()), tqApp, SLOT(quit()) );
   \endcode
 
   \sa exit() aboutToQuit() lastWindowClosed() TQAction
@@ -2159,10 +2159,10 @@ void TQApplication::quit()
   \code
     // the "Quit" menu entry should try to close all windows
     TQPopupMenu* file = new TQPopupMenu( this );
-    file->insertItem( "&Quit", qApp, SLOT(closeAllWindows()), CTRL+Key_Q );
+    file->insertItem( "&Quit", tqApp, SLOT(closeAllWindows()), CTRL+Key_Q );
 
     // when the last window is closed, the application should quit
-    connect( qApp, SIGNAL( lastWindowClosed() ), qApp, SLOT( quit() ) );
+    connect( tqApp, SIGNAL( lastWindowClosed() ), tqApp, SLOT( quit() ) );
   \endcode
 
   The windows are closed in random order, until one window does not
@@ -2286,9 +2286,9 @@ void TQApplication::aboutTQt()
   approaches are listed below:
   \list 1
   \i Reimplementing this function. This is very powerful, providing
-  complete control; but only one subclass can be qApp.
+  complete control; but only one subclass can be tqApp.
 
-  \i Installing an event filter on qApp. Such an event filter is able
+  \i Installing an event filter on tqApp. Such an event filter is able
   to process all events for all widgets, so it's just as powerful as
   reimplementing notify(); furthermore, it's possible to have more
   than one application-global event filter. Global event filters even
@@ -2730,7 +2730,7 @@ void TQApplication::processOneEvent()
 TQEventLoop *TQApplication::eventLoop()
 {
     if ( !eventloop && !is_app_closing )
-	(void) new TQEventLoop( qApp, "default event loop" );
+	(void) new TQEventLoop( tqApp, "default event loop" );
     return eventloop;
 }
 
@@ -2779,7 +2779,7 @@ int TQApplication::exec()
 */
 void TQApplication::exit( int retcode )
 {
-    qApp->eventLoop()->exit( retcode );
+    tqApp->eventLoop()->exit( retcode );
 }
 
 /*!
@@ -2963,7 +2963,7 @@ void TQApplication::removeTranslator( TQTranslator * mf )
     if ( !translators || !mf )
 	return;
 
-    if ( translators->remove( mf ) && ! qApp->closingDown() ) {
+    if ( translators->remove( mf ) && ! tqApp->closingDown() ) {
 	setReverseLayout( qt_detectRTLLanguage() );
 
 	TQWidgetList *list = topLevelWidgets();
@@ -3666,12 +3666,12 @@ Q_EXPORT void qt_dispatchEnterLeave( TQWidget* enter, TQWidget* leave ) {
 
     TQEvent leaveEvent( TQEvent::Leave );
     for ( w = leaveList.first(); w; w = leaveList.next() ) {
-	if ( !qApp->activeModalWidget() || qt_tryModalHelper( w, 0 ))
+	if ( !tqApp->activeModalWidget() || qt_tryModalHelper( w, 0 ))
 	    TQApplication::sendEvent( w, &leaveEvent );
     }
     TQEvent enterEvent( TQEvent::Enter );
     for ( w = enterList.first(); w; w = enterList.next() ) {
-	if ( !qApp->activeModalWidget() || qt_tryModalHelper( w, 0 ))
+	if ( !tqApp->activeModalWidget() || qt_tryModalHelper( w, 0 ))
 	    TQApplication::sendEvent( w, &enterEvent );
     }
 }
@@ -3691,7 +3691,7 @@ Q_EXPORT bool qt_tryModalHelper( TQWidget *widget, TQWidget **rettop ) {
     TQWidget *modal=0, *top=TQApplication::activeModalWidget();
     if ( rettop ) *rettop = top;
 
-    if ( qApp->activePopupWidget() )
+    if ( tqApp->activePopupWidget() )
 	return TRUE;
 
 #ifdef Q_WS_MACX