Rename additional global TQt functions

1 files changed, 36 insertions, 36 deletions

diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 45d83df..5f5e23c 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -131,7 +131,7 @@ extern "C" Bool XftInitFtLibrary(void);
 extern "C" char *_Xsetlocale(int category, const char *locale);
 char *_Xsetlocale(int category, const char *locale)
 {
-    //qDebug("_Xsetlocale(%d,%s),category,locale");
+    //tqDebug("_Xsetlocale(%d,%s),category,locale");
     return setlocale(category,locale);
 }
 # endif // setlocale
@@ -520,7 +520,7 @@ void qt_deferred_map_add( QWidget* w)
 {
     if ( !deferred_map_list ) {
 	deferred_map_list = new QPtrList<QWidget>;
-	qAddPostRoutine( qt_deferred_map_cleanup );
+	tqAddPostRoutine( qt_deferred_map_cleanup );
     }
     deferred_map_list->append( w );
 }
@@ -788,7 +788,7 @@ static int qt_x_errhandler( Display *dpy, XErrorEvent *err )
 
     char errstr[256];
     XGetErrorText( dpy, err->error_code, errstr, 256 );
-    qWarning( "X Error: %s %d\n"
+    tqWarning( "X Error: %s %d\n"
 	      "  Major opcode:  %d\n"
 	      "  Minor opcode:  %d\n"
 	      "  Resource id:  0x%lx",
@@ -806,7 +806,7 @@ static int qt_x_errhandler( Display *dpy, XErrorEvent *err )
 
 static int qt_xio_errhandler( Display * )
 {
-    qWarning( "%s: Fatal IO error: client killed", appName );
+    tqWarning( "%s: Fatal IO error: client killed", appName );
     qApp = 0;
     exit( 1 );
     //### give the application a chance for a proper shutdown instead,
@@ -866,7 +866,7 @@ static void qt_x11_process_intern_atoms()
 	while( it.current() ) {
 	    res[i] = 0;
 	    resp[i] = it.current();
-	    names[i] = qstrdup(it.currentKey());
+	    names[i] = tqstrdup(it.currentKey());
 	    i++;
 	    ++it;
 	}
@@ -1184,7 +1184,7 @@ static void qt_set_input_encoding()
 	qt_input_mapper = QTextCodec::codecForLocale();
 
     } else {
-	if ( !qstricmp( data, "locale" ) )
+	if ( !tqstricmp( data, "locale" ) )
 	    qt_input_mapper = QTextCodec::codecForLocale();
 	else
 	    qt_input_mapper = QTextCodec::codecForName( data );
@@ -1658,11 +1658,11 @@ void qt_init_internal( int *argcptr, char **argv,
 	appDpy  = display;
 
 	// Set application name and class
-	appName = qstrdup( "Qt-subapplication" );
+	appName = tqstrdup( "Qt-subapplication" );
 	char *app_class = 0;
 	if (argv) {
 	    const char* p = strrchr( argv[0], '/' );
-	    app_class = qstrdup(p ? p + 1 : argv[0]);
+	    app_class = tqstrdup(p ? p + 1 : argv[0]);
 	    if (app_class[0])
 		app_class[0] = toupper(app_class[0]);
 	}
@@ -1686,7 +1686,7 @@ void qt_init_internal( int *argcptr, char **argv,
 	if (argv) {
 	    const char *p = strrchr( argv[0], '/' );
 	    appName = p ? p + 1 : argv[0];
-	    app_class = qstrdup(appName);
+	    app_class = tqstrdup(appName);
 	    if (app_class[0])
 		app_class[0] = toupper(app_class[0]);
 	}
@@ -1795,7 +1795,7 @@ void qt_init_internal( int *argcptr, char **argv,
 		}
 		if ( s == "gdb" ) {
 		    appNoGrab = TRUE;
-		    qDebug( "Qt: gdb: -nograb added to command-line options.\n"
+		    tqDebug( "Qt: gdb: -nograb added to command-line options.\n"
 			    "\t Use the -dograb option to enforce grabbing." );
 		}
 		f.close();
@@ -1806,7 +1806,7 @@ void qt_init_internal( int *argcptr, char **argv,
 
 	if( qt_is_gui_used ) {
 	    if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) {
-		qWarning( "%s: cannot connect to X server %s", appName,
+		tqWarning( "%s: cannot connect to X server %s", appName,
 			  XDisplayName(appDpyName) );
 		qApp = 0;
 		exit( 1 );
@@ -2272,7 +2272,7 @@ void qt_init_internal( int *argcptr, char **argv,
 
 	devices = XListInputDevices( appDpy, &ndev);
 	if ( devices == NULL ) {
-	    qWarning( "Failed to get list of devices" );
+	    tqWarning( "Failed to get list of devices" );
 	    ndev = -1;
 	}
 	dev = NULL;
@@ -2305,7 +2305,7 @@ void qt_init_internal( int *argcptr, char **argv,
 		    ev_class = event_list_eraser;
 		}
 		if ( dev == NULL ) {
-		    qWarning( "Failed to open device" );
+		    tqWarning( "Failed to open device" );
 		} else {
 		    if ( dev->num_classes > 0 ) {
 			for ( ip = dev->classes, j = 0; j < devs->num_classes;
@@ -2689,7 +2689,7 @@ static GC create_gc( int scrn, bool monochrome )
 GC qt_xget_readonly_gc( int scrn, bool monochrome )	// get read-only GC
 {
     if ( scrn < 0 || scrn >= appScreenCount ) {
-	qDebug("invalid screen %d %d", scrn, appScreenCount );
+	tqDebug("invalid screen %d %d", scrn, appScreenCount );
 	QWidget* bla = 0;
 	bla->setName("hello");
     }
@@ -2713,7 +2713,7 @@ GC qt_xget_readonly_gc( int scrn, bool monochrome )	// get read-only GC
 GC qt_xget_temp_gc( int scrn, bool monochrome )		// get temporary GC
 {
     if ( scrn < 0 || scrn >= appScreenCount ) {
-	qDebug("invalid screen (tmp) %d %d", scrn, appScreenCount );
+	tqDebug("invalid screen (tmp) %d %d", scrn, appScreenCount );
 	QWidget* bla = 0;
 	bla->setName("hello");
     }
@@ -2773,7 +2773,7 @@ void QApplication::setMainWidget( QWidget *mainWidget )
 #if defined(QT_CHECK_STATE)
     if ( mainWidget && mainWidget->parentWidget() &&
 	 ! mainWidget->parentWidget()->isDesktop() )
-	qWarning( "QApplication::setMainWidget(): New main widget (%s/%s) "
+	tqWarning( "QApplication::setMainWidget(): New main widget (%s/%s) "
 		  "has a parent!",
 		  mainWidget->className(), mainWidget->name() );
 #endif
@@ -3567,7 +3567,7 @@ int QApplication::x11ProcessEvent( XEvent* event )
     case XKeyRelease:
 	{
 	    if ( keywidget && keywidget->isEnabled() ) { // should always exist
-	        // qDebug( "sending key event" );
+	        // tqDebug( "sending key event" );
 	        keywidget->translateKeyEvent( event, grabbed );
 	    }
 	    break;
@@ -4474,22 +4474,22 @@ bool QETWidget::translateXinputEvent( const XEvent *ev )
 	}
 	button = (XDeviceButtonEvent*)ev;
 /*
-	qDebug( "\n\nXInput Button Event" );
-	qDebug( "serial:\t%d", button->serial );
-	qDebug( "send_event:\t%d", button->send_event );
-	qDebug( "display:\t%p", button->display );
-	qDebug( "window:\t%d", button->window );
-	qDebug( "deviceID:\t%d", button->deviceid );
-	qDebug( "root:\t%d", button->root );
-	qDebug( "subwindot:\t%d", button->subwindow );
-	qDebug( "x:\t%d", button->x );
-	qDebug( "y:\t%d", button->y );
-	qDebug( "x_root:\t%d", button->x_root );
-	qDebug( "y_root:\t%d", button->y_root );
-	qDebug( "state:\t%d", button->state );
-	qDebug( "button:\t%d", button->button );
-	qDebug( "same_screen:\t%d", button->same_screen );
-	qDebug( "time:\t%d", button->time );
+	tqDebug( "\n\nXInput Button Event" );
+	tqDebug( "serial:\t%d", button->serial );
+	tqDebug( "send_event:\t%d", button->send_event );
+	tqDebug( "display:\t%p", button->display );
+	tqDebug( "window:\t%d", button->window );
+	tqDebug( "deviceID:\t%d", button->deviceid );
+	tqDebug( "root:\t%d", button->root );
+	tqDebug( "subwindot:\t%d", button->subwindow );
+	tqDebug( "x:\t%d", button->x );
+	tqDebug( "y:\t%d", button->y );
+	tqDebug( "x_root:\t%d", button->x_root );
+	tqDebug( "y_root:\t%d", button->y_root );
+	tqDebug( "state:\t%d", button->state );
+	tqDebug( "button:\t%d", button->button );
+	tqDebug( "same_screen:\t%d", button->same_screen );
+	tqDebug( "time:\t%d", button->time );
 */
 	curr = QPoint( button->x, button->y );
     }
@@ -5181,7 +5181,7 @@ bool QETWidget::translateKeyEventInternal( const XEvent *event, int& count,
 	keyDict->setAutoDelete( FALSE );
 	textDict = new QIntDict<void>( 13 );
 	textDict->setAutoDelete( FALSE );
-	qAddPostRoutine( deleteKeyDicts );
+	tqAddPostRoutine( deleteKeyDicts );
     }
 
     QWidget* tlw = topLevelWidget();
@@ -6375,7 +6375,7 @@ static void sm_performSaveYourself( QSessionManagerData* smd )
     // generate a restart and discard command that makes sense
     QStringList restart;
     restart  << qApp->argv()[0] << "-session" << smd->sessionId + "_" + smd->sessionKey;
-    if (qstricmp(qAppName(), qAppClass()) != 0)
+    if (tqstricmp(qAppName(), qAppClass()) != 0)
 	restart << "-name" << qAppName();
     sm->setRestartCommand( restart );
     QStringList discard;
@@ -6524,7 +6524,7 @@ QSessionManager::QSessionManager( QApplication * app, QString &id, QString& key
 
     QString error = cerror;
     if (!smcConnection ) {
-	qWarning("Session management error: %s", error.latin1() );
+	tqWarning("Session management error: %s", error.latin1() );
     }
     else {
 	sm_receiver = new QSmSocketReceiver(  IceConnectionNumber( SmcGetIceConnection( smcConnection ) ) );