Automated update from Qt3

1 files changed, 19 insertions, 19 deletions

diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 1c285c44..4579b98f 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -1019,7 +1019,7 @@ bool TQApplication::x11_apply_settings()
 
     // read library (ie. plugin) path list
     TQString libpathkey =
-	TQString("/qt/%1.%2/libraryPath").arg( QT_VERSION >> 16 ).arg( (QT_VERSION & 0xff00 ) >> 8 );
+	TQString("/qt/%1.%2/libraryPath").arg( TQT_VERSION >> 16 ).arg( (TQT_VERSION & 0xff00 ) >> 8 );
     TQStringList pathlist = settings.readListEntry(libpathkey, ':');
     if (! pathlist.isEmpty()) {
 	TQStringList::ConstIterator it = pathlist.begin();
@@ -1835,13 +1835,13 @@ void qt_init_internal( int *argcptr, char **argv,
 	TQPaintDevice::x_appdefcolormap_arr = new bool[ appScreenCount ];
 	TQPaintDevice::x_appvisual_arr = new void*[ appScreenCount ];
 	TQPaintDevice::x_appdefvisual_arr = new bool[ appScreenCount ];
-	Q_CHECK_PTR( TQPaintDevice::x_appdepth_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appcells_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_approotwindow_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appcolormap_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appdefcolormap_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appvisual_arr );
-	Q_CHECK_PTR( TQPaintDevice::x_appdefvisual_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appdepth_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appcells_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_approotwindow_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appcolormap_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appdefcolormap_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appvisual_arr );
+	TQ_CHECK_PTR( TQPaintDevice::x_appdefvisual_arr );
 
 	int screen;
 	TQString serverVendor( ServerVendor( appDpy) );
@@ -2384,8 +2384,8 @@ void qt_init_internal( int *argcptr, char **argv,
 
 		// read library (ie. plugin) path list
 		TQString libpathkey = TQString("/qt/%1.%2/libraryPath")
-				     .arg( QT_VERSION >> 16 )
-				     .arg( (QT_VERSION & 0xff00 ) >> 8 );
+				     .arg( TQT_VERSION >> 16 )
+				     .arg( (TQT_VERSION & 0xff00 ) >> 8 );
 		TQStringList pathlist =
 		    settings.readListEntry(libpathkey, ':');
 		if (! pathlist.isEmpty()) {
@@ -2618,7 +2618,7 @@ bool qt_wstate_iconified( WId winid )
     return iconic;
 }
 
-const char *qAppName()				// get application name
+const char *tqAppName()				// get application name
 {
     return appName;
 }
@@ -2873,11 +2873,11 @@ void TQApplication::setOverrideCursor( const TQCursor &cursor, bool replace )
 {
     if ( !cursorStack ) {
 	cursorStack = new TQCursorList;
-	Q_CHECK_PTR( cursorStack );
+	TQ_CHECK_PTR( cursorStack );
 	cursorStack->setAutoDelete( TRUE );
     }
     app_cursor = new TQCursor( cursor );
-    Q_CHECK_PTR( app_cursor );
+    TQ_CHECK_PTR( app_cursor );
     if ( replace )
 	cursorStack->removeLast();
     cursorStack->append( app_cursor );
@@ -3176,7 +3176,7 @@ void qPRCreate( const TQWidget *widget, Window oldwin )
 {						// TQWidget::reparent mechanism
     if ( !wPRmapper ) {
 	wPRmapper = new TQWidgetIntDict;
-	Q_CHECK_PTR( wPRmapper );
+	TQ_CHECK_PTR( wPRmapper );
     }
     wPRmapper->insert( (long)oldwin, widget );	// add old window to mapper
     TQETWidget *w = (TQETWidget *)widget;
@@ -3846,7 +3846,7 @@ void qt_enter_modal( TQWidget *widget )
 {
     if ( !qt_modal_stack ) {			// create modal stack
 	qt_modal_stack = new TQWidgetList;
-	Q_CHECK_PTR( qt_modal_stack );
+	TQ_CHECK_PTR( qt_modal_stack );
     }
     if (widget->parentWidget()) {
 	TQEvent e(TQEvent::WindowBlocked);
@@ -3941,7 +3941,7 @@ void TQApplication::openPopup( TQWidget *popup )
     openPopupCount++;
     if ( !popupWidgets ) {			// create list
 	popupWidgets = new TQWidgetList;
-	Q_CHECK_PTR( popupWidgets );
+	TQ_CHECK_PTR( popupWidgets );
     }
     popupWidgets->append( popup );		// add to end of list
 
@@ -6223,7 +6223,7 @@ public:
 
 class TQSmSocketReceiver : public TQObject
 {
-    Q_OBJECT
+    TQ_OBJECT
 public:
     TQSmSocketReceiver( int socket )
 	: TQObject(0,0)
@@ -6375,8 +6375,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(qAppName(), qAppClass()) != 0)
-	restart << "-name" << qAppName();
+    if (qstricmp(tqAppName(), qAppClass()) != 0)
+	restart << "-name" << tqAppName();
     sm->setRestartCommand( restart );
     TQStringList discard;
     sm->setDiscardCommand( discard );