Automated update from Qt3

1 files changed, 20 insertions, 20 deletions

diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp
index 619308be3..abe951b1c 100644
--- a/src/kernel/qobject.cpp
+++ b/src/kernel/qobject.cpp
@@ -148,7 +148,7 @@ public:
     Last but not least, TQObject provides the basic timer support in
     TQt; see TQTimer for high-level support for timers.
 
-    Notice that the Q_OBJECT macro is mandatory for any object that
+    Notice that the TQ_OBJECT macro is mandatory for any object that
     implements signals, slots or properties. You also need to run the
     \link moc.html moc program (Meta Object Compiler) \endlink on the
     source file. We strongly recommend the use of this macro in \e all
@@ -194,7 +194,7 @@ static inline bool isSpace( char x )
 
 static TQCString qt_rmWS( const char *s )
 {
-    TQCString result( qstrlen(s)+1 );
+    TQCString result( tqstrlen(s)+1 );
     char *d = result.data();
     char last = 0;
     while( *s && isSpace(*s) )			// skip leading space
@@ -537,7 +537,7 @@ TQObject::~TQObject()
 
     A meta object contains information about a class that inherits
     TQObject, e.g. class name, superclass name, properties, signals and
-    slots. Every class that contains the Q_OBJECT macro will also have
+    slots. Every class that contains the TQ_OBJECT macro will also have
     a meta object.
 
     The meta object information is required by the signal/slot
@@ -554,7 +554,7 @@ TQObject::~TQObject()
     Object Compiler. \endlink
 
     \warning This function will return the wrong name if the class
-    definition lacks the Q_OBJECT macro.
+    definition lacks the TQ_OBJECT macro.
 
     \sa name(), inherits(), isA(), isWidgetType()
 */
@@ -987,7 +987,7 @@ void TQObject::blockSignals( bool block )
     \code
     class MyObject : public TQObject
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	MyObject( TQObject *parent = 0, const char *name = 0 );
 
@@ -1198,7 +1198,7 @@ TQObjectList *TQObject::queryList( const char *inheritsClass,
 				 bool recursiveSearch ) const
 {
     TQObjectList *list = new TQObjectList;
-    Q_CHECK_PTR( list );
+    TQ_CHECK_PTR( list );
     bool onlyWidgets = ( inheritsClass && qstrcmp(inheritsClass, "TQWidget") == 0 );
 #ifndef QT_NO_REGEXP
     if ( regexpMatch && objName ) {		// regexp matching
@@ -1290,7 +1290,7 @@ void TQObject::insertChild( TQObject *obj )
 
     if ( !childObjects ) {
 	childObjects = new TQObjectList;
-	Q_CHECK_PTR( childObjects );
+	TQ_CHECK_PTR( childObjects );
     } else if ( obj->parentObj == this ) {
 #if defined(QT_CHECK_STATE)
 	qWarning( "TQObject::insertChild: Object %s::%s already in list",
@@ -1409,7 +1409,7 @@ void TQObject::installEventFilter( const TQObject *obj )
 		    this, SLOT(cleanupEventFilter(TQObject*)) );
     } else {
 	eventFilters = new TQObjectList;
-	Q_CHECK_PTR( eventFilters );
+	TQ_CHECK_PTR( eventFilters );
     }
     eventFilters->insert( 0, obj );
     connect( obj, SIGNAL(destroyed(TQObject*)), this, SLOT(cleanupEventFilter(TQObject*)) );
@@ -1644,9 +1644,9 @@ bool TQObject::checkConnectArgs( const char    *signal,
     while ( *s2++ != '(' ) { }
     if ( *s2 == ')' || qstrcmp(s1,s2) == 0 )	// member has no args or
 	return TRUE;				//   exact match
-    int s1len = qstrlen(s1);
-    int s2len = qstrlen(s2);
-    if ( s2len < s1len && qstrncmp(s1,s2,s2len-1)==0 && s1[s2len-1]==',' )
+    int s1len = tqstrlen(s1);
+    int s2len = tqstrlen(s2);
+    if ( s2len < s1len && tqstrncmp(s1,s2,s2len-1)==0 && s1[s2len-1]==',' )
 	return TRUE;				// member has less args
     return FALSE;
 }
@@ -1702,7 +1702,7 @@ TQCString TQObject::normalizeSignalSlot( const char *signalSlot )
     \code
     class MyWidget : public TQWidget
     {
-	Q_OBJECT
+	TQ_OBJECT
     public:
 	MyWidget();
 
@@ -1874,14 +1874,14 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const
 
     if ( !s->connections ) {			// create connections lookup table
 	s->connections = new TQSignalVec( signal_index+1 );
-	Q_CHECK_PTR( s->connections );
+	TQ_CHECK_PTR( s->connections );
 	s->connections->setAutoDelete( TRUE );
     }
 
     TQConnectionList *clist = s->connections->at( signal_index );
     if ( !clist ) {				// create receiver list
 	clist = new TQConnectionList;
-	Q_CHECK_PTR( clist );
+	TQ_CHECK_PTR( clist );
 	clist->setAutoDelete( TRUE );
 	s->connections->insert( signal_index, clist );
     }
@@ -1899,7 +1899,7 @@ void TQObject::connectInternal( const TQObject *sender, int signal_index, const
     }
 
     TQConnection *c = new TQConnection( r, member_index, rm ? rm->name : "qt_invoke", membcode );
-    Q_CHECK_PTR( c );
+    TQ_CHECK_PTR( c );
     clist->append( c );
     if ( !r->senderObjects )			// create list of senders
 	r->senderObjects = new TQSenderObjectList;
@@ -2113,8 +2113,8 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
 		    success = TRUE;
 		    c = clist->next();
 		} else if ( r == c->object() &&
-			    ( member_index == -1 ||
-			      member_index == c->member() && c->memberType() == membcode ) ) {
+			    ( (member_index == -1) ||
+			      ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
 		    removeObjFromList( c->object()->senderObjects, s, TRUE );
 		    success = TRUE;
 		    clist->remove();
@@ -2138,8 +2138,8 @@ bool TQObject::disconnectInternal( const TQObject *sender, int signal_index,
 		success = TRUE;
 		c = clist->next();
 	    } else if ( r == c->object() &&
-			( member_index == -1 ||
-			  member_index == c->member() && c->memberType() == membcode ) ) {
+			( (member_index == -1) ||
+			  ((member_index == c->member()) && (c->memberType() == membcode)) ) ) {
 		removeObjFromList( c->object()->senderObjects, s, TRUE );
 		success = TRUE;
 		clist->remove();
@@ -2209,7 +2209,7 @@ void TQObject::cleanupEventFilter(TQObject* obj)
     Returns a translated version of \a sourceText, or \a sourceText
     itself if there is no appropriate translated version. The
     translation context is TQObject with \a comment (0 by default).
-    All TQObject subclasses using the Q_OBJECT macro automatically have
+    All TQObject subclasses using the TQ_OBJECT macro automatically have
     a reimplementation of this function with the subclass name as
     context.