Automated update from qt3

1 files changed, 15 insertions, 15 deletions

diff --git a/src/kernel/qmetaobject.cpp b/src/kernel/qmetaobject.cpp
index 6dbc044a4..75bd9b5a7 100644
--- a/src/kernel/qmetaobject.cpp
+++ b/src/kernel/qmetaobject.cpp
@@ -145,7 +145,7 @@ public:
 #ifndef QT_NO_PROPERTIES
 	enumData(0), numEnumData(0),
 	propData(0),numPropData(0),
-	qt_static_property(0),
+	tqt_static_property(0),
 #endif
 	classInfo(0), numClassInfo(0) {}
 #ifndef QT_NO_PROPERTIES
@@ -153,7 +153,7 @@ public:
     int numEnumData;
     const TQMetaProperty *propData;
     int numPropData;
-    bool (*qt_static_property)(TQObject*, int, int, TQVariant*);
+    bool (*tqt_static_property)(TQObject*, int, int, TQVariant*);
 #endif
     const TQClassInfo *classInfo;
     int numClassInfo;
@@ -249,7 +249,7 @@ TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_cl
 			  const TQMetaData *const signal_data, int n_signals,
 			  const TQMetaProperty *const prop_data, int n_props,
 			  const TQMetaEnum *const enum_data, int n_enums,
-			  bool (*qt_static_property)(TQObject*, int, int, TQVariant*),
+			  bool (*tqt_static_property)(TQObject*, int, int, TQVariant*),
 			  const TQClassInfo *const class_info, int n_info )
 {
     classname = class_name;			// set meta data
@@ -265,7 +265,7 @@ TQMetaObject::TQMetaObject( const char *const class_name, TQMetaObject *super_cl
     d->numPropData = n_props;
     d->enumData = enum_data;
     d->numEnumData = n_enums;
-    d->qt_static_property = qt_static_property;
+    d->tqt_static_property = tqt_static_property;
     d->classInfo = class_info;
     d->numClassInfo = n_info;
 
@@ -492,14 +492,14 @@ TQMetaObject *TQMetaObject::new_metaobject( const char *classname,
 					  const TQMetaData * const signal_data, int n_signals,
 					  const TQMetaProperty * const prop_data, int n_props,
 					  const TQMetaEnum * const enum_data, int n_enums,
-					  bool (*qt_static_property)(TQObject*, int, int, TQVariant*),
+					  bool (*tqt_static_property)(TQObject*, int, int, TQVariant*),
 					  const TQClassInfo * const class_info, int n_info )
 {
     return new TQMetaObject( classname, superclassobject, slot_data, n_slots,
 			    signal_data, n_signals,
 			    prop_data, n_props,
 			    enum_data, n_enums,
-			    qt_static_property,
+			    tqt_static_property,
 			    class_info, n_info );
 }
 #endif
@@ -827,14 +827,14 @@ bool TQMetaObject::hasMetaObject( const char *class_name )
 ### this functions will go away. It exists purely for the sake of meta
 ### object code generated with TQt 3.1.0
 */
-bool TQMetaObject::qt_static_property( TQObject* o, int id, int f, TQVariant* v)
+bool TQMetaObject::tqt_static_property( TQObject* o, int id, int f, TQVariant* v)
 {
-    if ( d->qt_static_property )
-	return d->qt_static_property( o, id, f, v );
+    if ( d->tqt_static_property )
+	return d->tqt_static_property( o, id, f, v );
     else if ( o ) // compatibility
-	return o->qt_property( id, f, v );
+	return o->tqt_property( id, f, v );
     else if ( superclass )
-	return superclass->qt_static_property( o, id, f, v );
+	return superclass->tqt_static_property( o, id, f, v );
     switch ( f ) {
     case 3: case 4: case 5:
 	return TRUE;
@@ -1116,7 +1116,7 @@ bool TQMetaProperty::designable( TQObject* o ) const
 	return FALSE;
     if ( o ) {
 	int idx = _id >= 0 ? _id : (*meta)->indexOfProperty( this, TRUE );
-	return idx >= 0 && o->qt_property( idx, 3, 0 );
+	return idx >= 0 && o->tqt_property( idx, 3, 0 );
     }
     if ( testFlags( DesignableOverride ) ) {
 	const TQMetaObject* mo = (*meta);
@@ -1137,7 +1137,7 @@ bool TQMetaProperty::scriptable( TQObject* o ) const
 {
     if ( o ) {
 	int idx = _id >= 0 ? _id : (*meta)->indexOfProperty( this, TRUE );
-	return idx >= 0 && o->qt_property( idx, 4, 0 );
+	return idx >= 0 && o->tqt_property( idx, 4, 0 );
     }
     if ( testFlags( ScriptableOverride ) ) {
 	const TQMetaObject* mo = (*meta);
@@ -1160,7 +1160,7 @@ bool TQMetaProperty::stored( TQObject* o ) const
 	return FALSE;
     if ( o ) {
 	int idx = _id >= 0 ? _id : (*meta)->indexOfProperty( this, TRUE );
-	return idx >= 0 && o->qt_property( idx, 5, 0 );
+	return idx >= 0 && o->tqt_property( idx, 5, 0 );
     }
     if ( testFlags( StoredOverride ) ) {
 	const TQMetaObject* mo = (*meta);
@@ -1185,7 +1185,7 @@ bool TQMetaProperty::reset( TQObject* o ) const
     int idx = _id >= 0 ? _id : (*meta)->indexOfProperty( this, TRUE );
     if ( idx < 0 )
 	return 0;
-    return o->qt_property( idx, 2, 0 );
+    return o->tqt_property( idx, 2, 0 );
 }