From 6dec101d43dcbd4195c47d54bd388db1a8d7230e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 17 Jun 2012 17:28:28 -0500 Subject: Automated update from Qt3 --- tools/designer/uilib/ntqwidgetfactory.h | 4 +- tools/designer/uilib/qwidgetfactory.cpp | 104 ++++++++++++++++---------------- 2 files changed, 54 insertions(+), 54 deletions(-) (limited to 'tools/designer/uilib') diff --git a/tools/designer/uilib/ntqwidgetfactory.h b/tools/designer/uilib/ntqwidgetfactory.h index 4213199cd..99095d07d 100644 --- a/tools/designer/uilib/ntqwidgetfactory.h +++ b/tools/designer/uilib/ntqwidgetfactory.h @@ -107,8 +107,8 @@ private: TQString translate( const char *sourceText, const char *comment = "" ); TQString translate( const TQString& sourceText, const TQString& comment = TQString::null ); - void unpackUInt16( TQDataStream& in, Q_UINT16& n ); - void unpackUInt32( TQDataStream& in, Q_UINT32& n ); + void unpackUInt16( TQDataStream& in, TQ_UINT16& n ); + void unpackUInt32( TQDataStream& in, TQ_UINT32& n ); void unpackByteArray( TQDataStream& in, TQByteArray& array ); void unpackCString( const UibStrTable& strings, TQDataStream& in, TQCString& cstr ); diff --git a/tools/designer/uilib/qwidgetfactory.cpp b/tools/designer/uilib/qwidgetfactory.cpp index e126e937d..9cb6eeaa8 100644 --- a/tools/designer/uilib/qwidgetfactory.cpp +++ b/tools/designer/uilib/qwidgetfactory.cpp @@ -333,7 +333,7 @@ TQWidget *TQWidgetFactory::create( TQIODevice *dev, TQObject *connector, TQWidge // If we have no GUI, we only want to load the code if ( tqApp->type() != TQApplication::Tty ) { TQIODevice::Offset start = dev->at(); - Q_UINT32 magic; + TQ_UINT32 magic; TQDataStream in( dev ); in >> magic; if ( magic == UibMagic ) { @@ -505,9 +505,9 @@ TQWidget *TQWidgetFactory::createFromUiFile( TQDomDocument doc, TQObject *connec return w; } -void TQWidgetFactory::unpackUInt16( TQDataStream& in, Q_UINT16& n ) +void TQWidgetFactory::unpackUInt16( TQDataStream& in, TQ_UINT16& n ) { - Q_UINT8 half; + TQ_UINT8 half; in >> half; if ( half == 255 ) { in >> n; @@ -516,9 +516,9 @@ void TQWidgetFactory::unpackUInt16( TQDataStream& in, Q_UINT16& n ) } } -void TQWidgetFactory::unpackUInt32( TQDataStream& in, Q_UINT32& n ) +void TQWidgetFactory::unpackUInt32( TQDataStream& in, TQ_UINT32& n ) { - Q_UINT16 half; + TQ_UINT16 half; in >> half; if ( half == 65535 ) { in >> n; @@ -529,7 +529,7 @@ void TQWidgetFactory::unpackUInt32( TQDataStream& in, Q_UINT32& n ) void TQWidgetFactory::unpackByteArray( TQDataStream& in, TQByteArray& array ) { - Q_UINT32 size; + TQ_UINT32 size; unpackUInt32( in, size ); array.resize( size ); in.readRawBytes( array.data(), size ); @@ -538,7 +538,7 @@ void TQWidgetFactory::unpackByteArray( TQDataStream& in, TQByteArray& array ) void TQWidgetFactory::unpackCString( const UibStrTable& strings, TQDataStream& in, TQCString& cstr ) { - Q_UINT32 n; + TQ_UINT32 n; unpackUInt32( in, n ); cstr = strings.asCString( n ); } @@ -546,7 +546,7 @@ void TQWidgetFactory::unpackCString( const UibStrTable& strings, TQDataStream& i void TQWidgetFactory::unpackString( const UibStrTable& strings, TQDataStream& in, TQString& str ) { - Q_UINT32 n; + TQ_UINT32 n; unpackUInt32( in, n ); str = strings.asString( n ); } @@ -564,14 +564,14 @@ void TQWidgetFactory::unpackVariant( const UibStrTable& strings, TQDataStream& i TQVariant& value ) { TQString imageName; - Q_UINT32 number; - Q_UINT16 count; - Q_UINT16 x; - Q_UINT16 y; - Q_UINT16 width; - Q_UINT16 height; - Q_UINT8 bit; - Q_UINT8 type; + TQ_UINT32 number; + TQ_UINT16 count; + TQ_UINT16 x; + TQ_UINT16 y; + TQ_UINT16 width; + TQ_UINT16 height; + TQ_UINT8 bit; + TQ_UINT8 type; in >> type; @@ -672,11 +672,11 @@ void TQWidgetFactory::inputSpacer( const UibStrTable& strings, TQDataStream& in, bool vertical = FALSE; int w = 0; int h = 0; - Q_UINT16 column = 0; - Q_UINT16 row = 0; - Q_UINT16 colspan = 1; - Q_UINT16 rowspan = 1; - Q_UINT8 objectTag; + TQ_UINT16 column = 0; + TQ_UINT16 row = 0; + TQ_UINT16 colspan = 1; + TQ_UINT16 rowspan = 1; + TQ_UINT8 objectTag; in >> objectTag; while ( !in.atEnd() && objectTag != Object_End ) { @@ -738,7 +738,7 @@ void TQWidgetFactory::inputColumnOrRow( const UibStrTable& strings, TQVariant value; TQCString comment; TQString str; - Q_UINT8 objectTag; + TQ_UINT8 objectTag; in >> objectTag; while ( !in.atEnd() && objectTag != Object_End ) { @@ -794,7 +794,7 @@ void TQWidgetFactory::inputItem( const UibStrTable& strings, TQDataStream& in, TQCString name; TQVariant value; TQCString comment; - Q_UINT8 objectTag; + TQ_UINT8 objectTag; TQListView *listView = 0; if ( parent != 0 && parent->inherits("TQListView") ) @@ -885,8 +885,8 @@ void TQWidgetFactory::inputMenuItem( TQObject **objects, { TQCString name; TQCString text; - Q_UINT16 actionNo; - Q_UINT8 objectTag; + TQ_UINT16 actionNo; + TQ_UINT8 objectTag; unpackCString( strings, in, name ); unpackCString( strings, in, text ); @@ -963,7 +963,7 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, widget = ((TQMainWindow *) parent)->menuBar(); obj = widget; } else if ( className == "TQToolBar" ) { - Q_UINT8 dock; + TQ_UINT8 dock; in >> dock; unpackCString( strings, in, className ); widget = new TQToolBar( TQString::null, (TQMainWindow *) parent, @@ -985,14 +985,14 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, TQVariant value; TQCString comment; TQString str; - Q_UINT16 actionNo; + TQ_UINT16 actionNo; int metAttribute = 0; - Q_UINT16 column = 0; - Q_UINT16 row = 0; - Q_UINT16 colspan = 1; - Q_UINT16 rowspan = 1; - Q_UINT8 paletteTag; - Q_UINT8 objectTag; + TQ_UINT16 column = 0; + TQ_UINT16 row = 0; + TQ_UINT16 colspan = 1; + TQ_UINT16 rowspan = 1; + TQ_UINT8 paletteTag; + TQ_UINT8 objectTag; in >> objectTag; while ( !in.atEnd() && objectTag != Object_End ) { @@ -1016,8 +1016,8 @@ TQObject *TQWidgetFactory::inputObject( TQObject **objects, int& numObjects, { TQFont font; TQString family; - Q_UINT16 pointSize; - Q_UINT8 fontFlags; + TQ_UINT16 pointSize; + TQ_UINT8 fontFlags; unpackCString( strings, in, name ); in >> fontFlags; @@ -1188,8 +1188,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, #define END_OF_BLOCK() \ ( in.atEnd() || in.device()->at() >= nextBlock ) - Q_UINT8 lf; - Q_UINT8 cr; + TQ_UINT8 lf; + TQ_UINT8 cr; in >> lf; in >> cr; if ( lf != '\n' || cr != '\r' ) { @@ -1197,7 +1197,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, return 0; } - Q_UINT8 qdatastreamVersion; + TQ_UINT8 qdatastreamVersion; in >> qdatastreamVersion; if ( (int) qdatastreamVersion > in.version() ) { tqWarning( "Incompatible version of TQt" ); @@ -1209,8 +1209,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, TQObject **objects = 0; int numObjects = 0; - Q_UINT8 blockType; - Q_UINT32 blockSize; + TQ_UINT8 blockType; + TQ_UINT32 blockSize; in >> blockType; while ( !in.atEnd() && blockType != Block_End ) { @@ -1223,8 +1223,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Buddies: { - Q_UINT16 labelNo; - Q_UINT16 buddyNo; + TQ_UINT16 labelNo; + TQ_UINT16 buddyNo; do { unpackUInt16( in, labelNo ); @@ -1239,11 +1239,11 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, case Block_Connections: { TQString language = "C++"; - Q_UINT16 senderNo = 0; + TQ_UINT16 senderNo = 0; TQString signal = "clicked()"; - Q_UINT16 receiverNo = 0; + TQ_UINT16 receiverNo = 0; TQString slot = "accept()"; - Q_UINT8 connectionFlags; + TQ_UINT8 connectionFlags; do { in >> connectionFlags; @@ -1274,7 +1274,7 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, case Block_Images: { TQString format; - Q_UINT32 length; + TQ_UINT32 length; TQByteArray data; Image image; @@ -1290,10 +1290,10 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Intro: { - Q_INT16 defaultMargin; - Q_INT16 defaultSpacing; - Q_UINT16 maxObjects; - Q_UINT8 introFlags; + TQ_INT16 defaultMargin; + TQ_INT16 defaultSpacing; + TQ_UINT16 maxObjects; + TQ_UINT8 introFlags; in >> introFlags; in >> defaultMargin; @@ -1330,8 +1330,8 @@ TQWidget *TQWidgetFactory::createFromUibFile( TQDataStream& in, break; case Block_Tabstops: { - Q_UINT16 beforeNo; - Q_UINT16 afterNo; + TQ_UINT16 beforeNo; + TQ_UINT16 afterNo; unpackUInt16( in, beforeNo ); while ( !END_OF_BLOCK() ) { -- cgit v1.2.1