From a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:24:30 -0600 Subject: Rename additional global TQt functions --- src/kernel/qobject.cpp | 72 +++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'src/kernel/qobject.cpp') diff --git a/src/kernel/qobject.cpp b/src/kernel/qobject.cpp index 7e01dec..285fc51 100644 --- a/src/kernel/qobject.cpp +++ b/src/kernel/qobject.cpp @@ -335,7 +335,7 @@ static void cleanup_object_trees() static void ensure_object_trees() { object_trees = new QObjectList; - qAddPostRoutine( cleanup_object_trees ); + tqAddPostRoutine( cleanup_object_trees ); } static void insert_tree( QObject* obj ) @@ -418,7 +418,7 @@ QObject::QObject( QObject *parent, const char *name ) blockSig( FALSE ), // not blocking signals wasDeleted( FALSE ), // double-delete catcher isTree( FALSE ), // no tree yet - objname( name ? qstrdup(name) : 0 ), // set object name + objname( name ? tqstrdup(name) : 0 ), // set object name parentObj( 0 ), // no parent yet. It is set by insertChild() childObjects( 0 ), // no children yet connections( 0 ), // no connections yet @@ -463,7 +463,7 @@ QObject::~QObject() { if ( wasDeleted ) { #if defined(QT_DEBUG) - qWarning( "Double QObject deletion detected." ); + tqWarning( "Double QObject deletion detected." ); #endif return; } @@ -643,12 +643,12 @@ void *qt_inheritedBy( QMetaObject *superClass, const QObject *object ) future. If the object does not have a name, the name() function returns - "unnamed", so printf() (used in qDebug()) will not be asked to + "unnamed", so printf() (used in tqDebug()) will not be asked to output a null pointer. If you want a null pointer to be returned for unnamed objects, you can call name( 0 ). \code - qDebug( "MyClass::setPrecision(): (%s) invalid precision %f", + tqDebug( "MyClass::setPrecision(): (%s) invalid precision %f", name(), newPrecision ); \endcode @@ -668,7 +668,7 @@ void QObject::setName( const char *name ) { if ( objname ) delete [] (char*) objname; - objname = name ? qstrdup(name) : 0; + objname = name ? tqstrdup(name) : 0; } /*! @@ -756,7 +756,7 @@ bool QObject::event( QEvent *e ) { #if defined(QT_CHECK_NULL) if ( e == 0 ) - qWarning( "QObject::event: Null events are not permitted" ); + tqWarning( "QObject::event: Null events are not permitted" ); #endif if ( eventFilters ) { // try filters if ( activate_filters(e) ) // stopped by a filter @@ -883,7 +883,7 @@ void QObject::customEvent( QCustomEvent * ) if ( obj == textEdit ) { if ( e->type() == QEvent::KeyPress ) { QKeyEvent *k = (QKeyEvent*)ev; - qDebug( "Ate key press %d", k->key() ); + tqDebug( "Ate key press %d", k->key() ); return TRUE; } else { return FALSE; @@ -1005,7 +1005,7 @@ void QObject::blockSignals( bool block ) void MyObject::timerEvent( QTimerEvent *e ) { - qDebug( "timer event, id %d", e->timerId() ); + tqDebug( "timer event, id %d", e->timerId() ); } \endcode @@ -1282,7 +1282,7 @@ void QObject::insertChild( QObject *obj ) if ( obj->parentObj && obj->parentObj != this ) { #if defined(QT_CHECK_STATE) if ( obj->parentObj != this && obj->isWidgetType() ) - qWarning( "QObject::insertChild: Cannot reparent a widget, " + tqWarning( "QObject::insertChild: Cannot reparent a widget, " "use QWidget::reparent() instead" ); #endif obj->parentObj->removeChild( obj ); @@ -1293,7 +1293,7 @@ void QObject::insertChild( QObject *obj ) Q_CHECK_PTR( childObjects ); } else if ( obj->parentObj == this ) { #if defined(QT_CHECK_STATE) - qWarning( "QObject::insertChild: Object %s::%s already in list", + tqWarning( "QObject::insertChild: Object %s::%s already in list", obj->className(), obj->name( "unnamed" ) ); #endif return; @@ -1368,7 +1368,7 @@ void QObject::removeChild( QObject *obj ) if ( e->type() == QEvent::KeyPress ) { // special processing for key press QKeyEvent *k = (QKeyEvent *)e; - qDebug( "Ate key press %d", k->key() ); + tqDebug( "Ate key press %d", k->key() ); return TRUE; // eat event } else { // standard event processing @@ -1453,10 +1453,10 @@ static bool check_signal_macro( const QObject *sender, const char *signal, int sigcode = (int)(*signal) - '0'; if ( sigcode != QSIGNAL_CODE ) { if ( sigcode == QSLOT_CODE ) - qWarning( "QObject::%s: Attempt to %s non-signal %s::%s", + tqWarning( "QObject::%s: Attempt to %s non-signal %s::%s", func, op, sender->className(), signal+1 ); else - qWarning( "QObject::%s: Use the SIGNAL macro to %s %s::%s", + tqWarning( "QObject::%s: Use the SIGNAL macro to %s %s::%s", func, op, sender->className(), signal ); return FALSE; } @@ -1467,7 +1467,7 @@ static bool check_member_code( int code, const QObject *object, const char *member, const char *func ) { if ( code != QSLOT_CODE && code != QSIGNAL_CODE ) { - qWarning( "QObject::%s: Use the SLOT or SIGNAL macro to " + tqWarning( "QObject::%s: Use the SLOT or SIGNAL macro to " "%s %s::%s", func, func, object->className(), member ); return FALSE; } @@ -1483,10 +1483,10 @@ static void err_member_notfound( int code, const QObject *object, case QSIGNAL_CODE: type = "signal"; break; } if ( strchr(member,')') == 0 ) // common typing mistake - qWarning( "QObject::%s: Parentheses expected, %s %s::%s", + tqWarning( "QObject::%s: Parentheses expected, %s %s::%s", func, type, object->className(), member ); else - qWarning( "QObject::%s: No such %s %s::%s", + tqWarning( "QObject::%s: No such %s %s::%s", func, type, object->className(), member ); } @@ -1497,9 +1497,9 @@ static void err_info_about_objects( const char * func, { const char * a = sender->name(), * b = receiver->name(); if ( a ) - qWarning( "QObject::%s: (sender name: '%s')", func, a ); + tqWarning( "QObject::%s: (sender name: '%s')", func, a ); if ( b ) - qWarning( "QObject::%s: (receiver name: '%s')", func, b ); + tqWarning( "QObject::%s: (receiver name: '%s')", func, b ); } static void err_info_about_candidates( int code, @@ -1524,7 +1524,7 @@ static void err_info_about_candidates( int code, break; } if ( rm ) { - qWarning("QObject::%s: Candidate: %s", func, newname.data()); + tqWarning("QObject::%s: Candidate: %s", func, newname.data()); } } } @@ -1748,7 +1748,7 @@ bool QObject::connect( const QObject *sender, const char *signal, { #if defined(QT_CHECK_NULL) if ( sender == 0 || receiver == 0 || signal == 0 || member == 0 ) { - qWarning( "QObject::connect: Cannot connect %s::%s to %s::%s", + tqWarning( "QObject::connect: Cannot connect %s::%s to %s::%s", sender ? sender->className() : "(null)", signal ? signal+1 : "(null)", receiver ? receiver->className() : "(null)", @@ -1825,7 +1825,7 @@ bool QObject::connect( const QObject *sender, const char *signal, } #if defined(QT_CHECK_RANGE) if ( !s->checkConnectArgs(signal,receiver,member) ) { - qWarning( "QObject::connect: Incompatible sender/receiver arguments" + tqWarning( "QObject::connect: Incompatible sender/receiver arguments" "\n\t%s::%s --> %s::%s", s->className(), signal, r->className(), member ); @@ -1849,7 +1849,7 @@ bool QObject::connect( const QObject *sender, const char *signal, || ( QUType::isEqual( sm->method->parameters[si-1].type, &static_QUType_varptr ) && QUType::isEqual( rm->method->parameters[ri-1].type, &static_QUType_ptr ) ) ) continue; // varptr got introduced in 3.1 and is binary compatible with ptr - qWarning( "QObject::connect: Incompatible sender/receiver marshalling" + tqWarning( "QObject::connect: Incompatible sender/receiver marshalling" "\n\t%s::%s --> %s::%s", s->className(), signal, r->className(), member ); @@ -1989,7 +1989,7 @@ bool QObject::disconnect( const QObject *sender, const char *signal, { #if defined(QT_CHECK_NULL) if ( sender == 0 || (receiver == 0 && member != 0) ) { - qWarning( "QObject::disconnect: Unexpected null parameter" ); + tqWarning( "QObject::disconnect: Unexpected null parameter" ); return FALSE; } #endif @@ -2061,7 +2061,7 @@ bool QObject::disconnect( const QObject *sender, const char *signal, } if ( signal_index < 0 ) { #if defined(QT_CHECK_RANGE) - qWarning( "QObject::disconnect: No such signal %s::%s", + tqWarning( "QObject::disconnect: No such signal %s::%s", s->className(), signal ); #endif return FALSE; @@ -2504,7 +2504,7 @@ static void dumpRecursive( int level, QObject *object ) flags += 'I'; } } - qDebug( "%s%s::%s %s", (const char*)buf, object->className(), name, + tqDebug( "%s%s::%s %s", (const char*)buf, object->className(), name, flags.latin1() ); if ( object->children() ) { QObjectListIt it(*object->children()); @@ -2546,41 +2546,41 @@ void QObject::dumpObjectTree() void QObject::dumpObjectInfo() { #if defined(QT_DEBUG) - qDebug( "OBJECT %s::%s", className(), name( "unnamed" ) ); + tqDebug( "OBJECT %s::%s", className(), name( "unnamed" ) ); int n = 0; - qDebug( " SIGNALS OUT" ); + tqDebug( " SIGNALS OUT" ); if ( connections ) { QConnectionList *clist; for ( uint i = 0; i < connections->size(); i++ ) { if ( ( clist = connections->at( i ) ) ) { - qDebug( "\t%s", metaObject()->signal( i, TRUE )->name ); + tqDebug( "\t%s", metaObject()->signal( i, TRUE )->name ); n++; register QConnection *c; QConnectionListIt cit(*clist); while ( (c=cit.current()) ) { ++cit; - qDebug( "\t --> %s::%s %s", c->object()->className(), + tqDebug( "\t --> %s::%s %s", c->object()->className(), c->object()->name( "unnamed" ), c->memberName() ); } } } } if ( n == 0 ) - qDebug( "\t" ); + tqDebug( "\t" ); - qDebug( " SIGNALS IN" ); + tqDebug( " SIGNALS IN" ); n = 0; if ( senderObjects ) { QObject *sender = senderObjects->first(); while ( sender ) { - qDebug( "\t%s::%s", + tqDebug( "\t%s::%s", sender->className(), sender->name( "unnamed" ) ); n++; sender = senderObjects->next(); } } if ( n == 0 ) - qDebug( "\t" ); + tqDebug( "\t" ); #endif } @@ -2610,7 +2610,7 @@ bool QObject::setProperty( const char *name, const QVariant& value ) int id = meta->findProperty( name, TRUE ); const QMetaProperty* p = meta->property( id, TRUE ); if ( !p || !p->isValid() || !p->writable() ) { - qWarning( "%s::setProperty( \"%s\", value ) failed: property invalid, read-only or does not exist", + tqWarning( "%s::setProperty( \"%s\", value ) failed: property invalid, read-only or does not exist", className(), name ); return FALSE; } @@ -2662,7 +2662,7 @@ QVariant QObject::property( const char *name ) const int id = meta->findProperty( name, TRUE ); const QMetaProperty* p = meta->property( id, TRUE ); if ( !p || !p->isValid() ) { - qWarning( "%s::property( \"%s\" ) failed: property invalid or does not exist", + tqWarning( "%s::property( \"%s\" ) failed: property invalid or does not exist", className(), name ); return v; } -- cgit v1.2.1