summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/helpdialogimpl.cpp12
-rw-r--r--tools/assistant/helpdialogimpl.h2
-rw-r--r--tools/assistant/index.cpp4
-rw-r--r--tools/assistant/index.h4
-rw-r--r--tools/assistant/lib/ntqassistantclient.h2
-rw-r--r--tools/assistant/lib/qassistantclient.cpp2
-rw-r--r--tools/assistant/main.cpp6
-rw-r--r--tools/designer/designer/listboxdnd.cpp24
-rw-r--r--tools/designer/designer/listviewdnd.cpp28
-rw-r--r--tools/designer/designer/menubareditor.cpp6
-rw-r--r--tools/designer/designer/popupmenueditor.cpp6
-rw-r--r--tools/designer/shared/ui2uib.cpp96
-rw-r--r--tools/designer/shared/uib.h6
-rw-r--r--tools/designer/uic/form.cpp2
-rw-r--r--tools/designer/uilib/ntqwidgetfactory.h4
-rw-r--r--tools/designer/uilib/qwidgetfactory.cpp104
-rw-r--r--tools/linguist/linguist/simtexth.cpp4
17 files changed, 156 insertions, 156 deletions
diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp
index abce3ae84..00ab8cdc4 100644
--- a/tools/assistant/helpdialogimpl.cpp
+++ b/tools/assistant/helpdialogimpl.cpp
@@ -333,7 +333,7 @@ void HelpDialog::loadIndexFile()
editIndex->setEnabled(FALSE);
TQDataStream ds( &indexFile );
- Q_UINT32 fileAges;
+ TQ_UINT32 fileAges;
ds >> fileAges;
if ( fileAges != getFileAges() ) {
indexFile.close();
@@ -376,12 +376,12 @@ void HelpDialog::loadIndexFile()
editIndex->setEnabled(TRUE);
}
-Q_UINT32 HelpDialog::getFileAges()
+TQ_UINT32 HelpDialog::getFileAges()
{
TQStringList addDocuFiles = Config::configuration()->docFiles();
TQStringList::const_iterator i = addDocuFiles.begin();
- Q_UINT32 fileAges = 0;
+ TQ_UINT32 fileAges = 0;
for( ; i != addDocuFiles.end(); ++i ) {
TQFileInfo fi( *i );
if ( fi.exists() )
@@ -406,7 +406,7 @@ void HelpDialog::buildKeywordDB()
processEvents();
TQValueList<IndexKeyword> lst;
- Q_UINT32 fileAges = 0;
+ TQ_UINT32 fileAges = 0;
for( i = addDocuFiles.begin(); i != addDocuFiles.end(); i++ ){
TQFile file( *i );
if ( !file.exists() ) {
@@ -497,7 +497,7 @@ void HelpDialog::getAllContents()
}
TQDataStream ds( &contentFile );
- Q_UINT32 fileAges;
+ TQ_UINT32 fileAges;
ds >> fileAges;
if ( fileAges != getFileAges() ) {
contentFile.close();
@@ -520,7 +520,7 @@ void HelpDialog::buildContentDict()
{
TQStringList docuFiles = Config::configuration()->docFiles();
- Q_UINT32 fileAges = 0;
+ TQ_UINT32 fileAges = 0;
for( TQStringList::iterator it = docuFiles.begin(); it != docuFiles.end(); it++ ) {
TQFile file( *it );
if ( !file.exists() ) {
diff --git a/tools/assistant/helpdialogimpl.h b/tools/assistant/helpdialogimpl.h
index ecb3bf3e2..08db2fc20 100644
--- a/tools/assistant/helpdialogimpl.h
+++ b/tools/assistant/helpdialogimpl.h
@@ -144,7 +144,7 @@ private:
typedef TQValueList<ContentItem> ContentList;
void removeOldCacheFiles();
void buildKeywordDB();
- Q_UINT32 getFileAges();
+ TQ_UINT32 getFileAges();
void showIndexTopic();
void showBookmarkTopic();
void setupTitleMap();
diff --git a/tools/assistant/index.cpp b/tools/assistant/index.cpp
index 785f27bc6..7a3428920 100644
--- a/tools/assistant/index.cpp
+++ b/tools/assistant/index.cpp
@@ -59,8 +59,8 @@ TQDataStream &operator>>( TQDataStream &s, Document &l )
TQDataStream &operator<<( TQDataStream &s, const Document &l )
{
- s << (Q_INT16)l.docNumber;
- s << (Q_INT16)l.frequency;
+ s << (TQ_INT16)l.docNumber;
+ s << (TQ_INT16)l.frequency;
return s;
}
diff --git a/tools/assistant/index.h b/tools/assistant/index.h
index 2bd32f20e..b8a421730 100644
--- a/tools/assistant/index.h
+++ b/tools/assistant/index.h
@@ -54,8 +54,8 @@ struct Document {
bool operator>( const Document &doc ) const {
return frequency < doc.frequency;
}
- Q_INT16 docNumber;
- Q_INT16 frequency;
+ TQ_INT16 docNumber;
+ TQ_INT16 frequency;
};
TQDataStream &operator>>( TQDataStream &s, Document &l );
diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index a30c72b0e..9adf7830a 100644
--- a/tools/assistant/lib/ntqassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -72,7 +72,7 @@ private slots:
private:
TQSocket *socket;
TQProcess *proc;
- Q_UINT16 port;
+ TQ_UINT16 port;
TQString host, assistantCommand, pageBuffer;
bool opened;
};
diff --git a/tools/assistant/lib/qassistantclient.cpp b/tools/assistant/lib/qassistantclient.cpp
index b0fc0df39..4db090fb3 100644
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
@@ -230,7 +230,7 @@ void TQAssistantClient::openAssistant()
void TQAssistantClient::readPort()
{
TQString p = proc->readLineStdout();
- Q_UINT16 port = p.toUShort();
+ TQ_UINT16 port = p.toUShort();
if ( port == 0 ) {
emit error( tr( "Cannot connect to TQt Assistant." ) );
return;
diff --git a/tools/assistant/main.cpp b/tools/assistant/main.cpp
index 8954709cd..ce8ffd2db 100644
--- a/tools/assistant/main.cpp
+++ b/tools/assistant/main.cpp
@@ -78,14 +78,14 @@ class AssistantServer : public TQServerSocket
public:
AssistantServer( TQObject* parent = 0 );
void newConnection( int socket );
- Q_UINT16 getPort() const;
+ TQ_UINT16 getPort() const;
signals:
void showLinkRequest( const TQString& );
void newConnect();
private:
- Q_UINT16 p;
+ TQ_UINT16 p;
};
@@ -127,7 +127,7 @@ AssistantServer::AssistantServer( TQObject *parent )
p = port();
}
-Q_UINT16 AssistantServer::getPort() const
+TQ_UINT16 AssistantServer::getPort() const
{
return p;
}
diff --git a/tools/designer/designer/listboxdnd.cpp b/tools/designer/designer/listboxdnd.cpp
index 11f388686..f4bf73051 100644
--- a/tools/designer/designer/listboxdnd.cpp
+++ b/tools/designer/designer/listboxdnd.cpp
@@ -195,11 +195,11 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
: TQStoredDrag( "qt/listboxitem", parent, name )
{
// ### FIX!
- TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListBoxItem ) * items.count() );
+ TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListBoxItem ) * items.count() );
TQDataStream stream( data, IO_WriteOnly );
stream << items.count();
- stream << (Q_UINT8) sendPtr; // just transfer item pointer; omit data
+ stream << (TQ_UINT8) sendPtr; // just transfer item pointer; omit data
TQListBoxItem * i = items.first();
@@ -207,7 +207,7 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
while ( i ) {
- stream << (Q_ULONG) i; //###FIX: demands sizeof(ulong) >= sizeof(void*)
+ stream << (TQ_ULONG) i; //###FIX: demands sizeof(ulong) >= sizeof(void*)
i = items.next();
}
@@ -216,21 +216,21 @@ ListBoxItemDrag::ListBoxItemDrag( ListBoxItemList & items, bool sendPtr, TQListB
while ( i ) {
- Q_UINT8 b = 0;
+ TQ_UINT8 b = 0;
- b = (Q_UINT8) ( i->text() != TQString::null ); // does item have text ?
+ b = (TQ_UINT8) ( i->text() != TQString::null ); // does item have text ?
stream << b;
if ( b ) {
stream << i->text();
}
- b = (Q_UINT8) ( !!i->pixmap() ); // does item have a pixmap ?
+ b = (TQ_UINT8) ( !!i->pixmap() ); // does item have a pixmap ?
stream << b;
if ( b ) {
stream << ( *i->pixmap() );
}
- stream << (Q_UINT8) i->isSelectable();
+ stream << (TQ_UINT8) i->isSelectable();
i = items.next();
}
@@ -256,7 +256,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
int count = 0;
stream >> count;
- Q_UINT8 recievePtr = 0; // data contains just item pointers; no data
+ TQ_UINT8 recievePtr = 0; // data contains just item pointers; no data
stream >> recievePtr;
TQListBoxItem * item = 0;
@@ -265,7 +265,7 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
for( int i = 0; i < count; i++ ) {
- Q_ULONG p = 0; //###FIX: demands sizeof(ulong) >= sizeof(void*)
+ TQ_ULONG p = 0; //###FIX: demands sizeof(ulong) >= sizeof(void*)
stream >> p;
item = (TQListBoxItem *) p;
@@ -277,21 +277,21 @@ bool ListBoxItemDrag::decode( TQDropEvent * event, TQListBox * parent, TQListBox
for ( int i = 0; i < count; i++ ) {
- Q_UINT8 hasText = 0;
+ TQ_UINT8 hasText = 0;
TQString text;
stream >> hasText;
if ( hasText ) {
stream >> text;
}
- Q_UINT8 hasPixmap = 0;
+ TQ_UINT8 hasPixmap = 0;
TQPixmap pixmap;
stream >> hasPixmap;
if ( hasPixmap ) {
stream >> pixmap;
}
- Q_UINT8 isSelectable = 0;
+ TQ_UINT8 isSelectable = 0;
stream >> isSelectable;
if ( hasPixmap ) {
diff --git a/tools/designer/designer/listviewdnd.cpp b/tools/designer/designer/listviewdnd.cpp
index 49c7980f6..a7b831d15 100644
--- a/tools/designer/designer/listviewdnd.cpp
+++ b/tools/designer/designer/listviewdnd.cpp
@@ -270,7 +270,7 @@ ListViewItemDrag::ListViewItemDrag( ListViewItemList & items, TQWidget * parent,
: TQStoredDrag( "qt/listviewitem", parent, name )
{
// ### FIX!
- TQByteArray data( sizeof( Q_INT32 ) + sizeof( TQListViewItem ) * items.count() );
+ TQByteArray data( sizeof( TQ_INT32 ) + sizeof( TQListViewItem ) * items.count() );
TQDataStream stream( data, IO_WriteOnly );
stream << items.count();
@@ -327,11 +327,11 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
int columns = item.listView()->columns();
stream << columns;
- Q_UINT8 b = 0;
+ TQ_UINT8 b = 0;
int i;
for ( i = 0; i < columns; i++ ) {
- b = (Q_UINT8) ( item.text( i ) != TQString::null ); // does column i have a string ?
+ b = (TQ_UINT8) ( item.text( i ) != TQString::null ); // does column i have a string ?
stream << b;
if ( b ) {
stream << item.text( i );
@@ -339,25 +339,25 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
}
for ( i = 0; i < columns; i++ ) {
- b = (Q_UINT8) ( !!item.pixmap( i ) ); // does column i have a pixmap ?
+ b = (TQ_UINT8) ( !!item.pixmap( i ) ); // does column i have a pixmap ?
stream << b;
if ( b ) {
stream << ( *item.pixmap( i ) );
}
}
- stream << (Q_UINT8) item.isOpen();
- stream << (Q_UINT8) item.isSelectable();
- stream << (Q_UINT8) item.isExpandable();
- stream << (Q_UINT8) item.dragEnabled();
- stream << (Q_UINT8) item.dropEnabled();
- stream << (Q_UINT8) item.isVisible();
+ stream << (TQ_UINT8) item.isOpen();
+ stream << (TQ_UINT8) item.isSelectable();
+ stream << (TQ_UINT8) item.isExpandable();
+ stream << (TQ_UINT8) item.dragEnabled();
+ stream << (TQ_UINT8) item.dropEnabled();
+ stream << (TQ_UINT8) item.isVisible();
for ( i = 0; i < columns; i++ ) {
- stream << (Q_UINT8) item.renameEnabled( i );
+ stream << (TQ_UINT8) item.renameEnabled( i );
}
- stream << (Q_UINT8) item.multiLinesEnabled();
+ stream << (TQ_UINT8) item.multiLinesEnabled();
stream << item.childCount();
if ( item.childCount() > 0 ) {
@@ -373,10 +373,10 @@ TQDataStream & operator<< ( TQDataStream & stream, const TQListViewItem & item )
TQDataStream & operator>> ( TQDataStream & stream, TQListViewItem & item )
{
- Q_INT32 columns;
+ TQ_INT32 columns;
stream >> columns;
- Q_UINT8 b = 0;
+ TQ_UINT8 b = 0;
TQString text;
int i;
diff --git a/tools/designer/designer/menubareditor.cpp b/tools/designer/designer/menubareditor.cpp
index 84e750343..fa763b54f 100644
--- a/tools/designer/designer/menubareditor.cpp
+++ b/tools/designer/designer/menubareditor.cpp
@@ -66,9 +66,9 @@ MenuBarEditorItemPtrDrag::MenuBarEditorItemPtrDrag( MenuBarEditorItem * item,
const char * name )
: TQStoredDrag( "qt/menubareditoritemptr", parent, name )
{
- TQByteArray data( sizeof( Q_LONG ) );
+ TQByteArray data( sizeof( TQ_LONG ) );
TQDataStream stream( data, IO_WriteOnly );
- stream << ( Q_LONG ) item;
+ stream << ( TQ_LONG ) item;
setEncodedData( data );
}
@@ -85,7 +85,7 @@ bool MenuBarEditorItemPtrDrag::decode( TQDropEvent * e, MenuBarEditorItem ** i )
if ( !data.size() )
return FALSE;
- Q_LONG p = 0;
+ TQ_LONG p = 0;
stream >> p;
*i = ( MenuBarEditorItem *) p;
diff --git a/tools/designer/designer/popupmenueditor.cpp b/tools/designer/designer/popupmenueditor.cpp
index 719e147dd..9d95f54d2 100644
--- a/tools/designer/designer/popupmenueditor.cpp
+++ b/tools/designer/designer/popupmenueditor.cpp
@@ -72,9 +72,9 @@ PopupMenuEditorItemPtrDrag::PopupMenuEditorItemPtrDrag( PopupMenuEditorItem * it
TQWidget * parent, const char * name )
: TQStoredDrag( "qt/popupmenueditoritemptr", parent, name )
{
- TQByteArray data( sizeof( Q_LONG ) );
+ TQByteArray data( sizeof( TQ_LONG ) );
TQDataStream stream( data, IO_WriteOnly );
- stream << ( Q_LONG ) item;
+ stream << ( TQ_LONG ) item;
setEncodedData( data );
}
@@ -91,7 +91,7 @@ bool PopupMenuEditorItemPtrDrag::decode( TQDropEvent * e, PopupMenuEditorItem **
if ( !data.size() )
return FALSE;
- Q_LONG p = 0;
+ TQ_LONG p = 0;
stream >> p;
*i = ( PopupMenuEditorItem *) p;
diff --git a/tools/designer/shared/ui2uib.cpp b/tools/designer/shared/ui2uib.cpp
index 239697982..fa3085e50 100644
--- a/tools/designer/shared/ui2uib.cpp
+++ b/tools/designer/shared/ui2uib.cpp
@@ -198,22 +198,22 @@ int UibIndexMap::find( const TQString& name, int deflt ) const
}
}
-static void packUInt16( TQDataStream& out, Q_UINT16 n )
+static void packUInt16( TQDataStream& out, TQ_UINT16 n )
{
if ( n < 255 ) {
- out << (Q_UINT8) n;
+ out << (TQ_UINT8) n;
} else {
- out << (Q_UINT8) 255;
+ out << (TQ_UINT8) 255;
out << n;
}
}
-static void packUInt32( TQDataStream& out, Q_UINT32 n )
+static void packUInt32( TQDataStream& out, TQ_UINT32 n )
{
if ( n < 65535 ) {
- out << (Q_UINT16) n;
+ out << (TQ_UINT16) n;
} else {
- out << (Q_UINT16) 65535;
+ out << (TQ_UINT16) 65535;
out << n;
}
}
@@ -251,7 +251,7 @@ static void packVariant( UibStrTable& strings, TQDataStream& out,
{
TQStringList::ConstIterator s;
- Q_UINT8 type = value.type();
+ TQ_UINT8 type = value.type();
if ( tag == "pixmap" ) {
type = TQVariant::Pixmap;
} else if ( tag == "image" ) {
@@ -300,7 +300,7 @@ static void packVariant( UibStrTable& strings, TQDataStream& out,
packUInt32( out, value.asInt() );
break;
case TQVariant::Bool:
- out << (Q_UINT8) value.asBool();
+ out << (TQ_UINT8) value.asBool();
break;
case TQVariant::Double:
out << value.asDouble();
@@ -340,8 +340,8 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
if ( tag == "font" ) {
TQString family;
- Q_UINT16 pointSize = 65535;
- Q_UINT8 fontFlags = 0;
+ TQ_UINT16 pointSize = 65535;
+ TQ_UINT8 fontFlags = 0;
TQDomElement g = f.firstChild().toElement();
while ( !g.isNull() ) {
@@ -351,7 +351,7 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
family = text;
} else if ( g.tagName() == "pointsize" ) {
fontFlags |= Font_PointSize;
- pointSize = (Q_UINT16) text.toUInt();
+ pointSize = (TQ_UINT16) text.toUInt();
} else {
if ( g.firstChild().toText().data().toInt() != 0 ) {
if ( g.tagName() == "bold" ) {
@@ -368,7 +368,7 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
g = g.nextSibling().toElement();
}
- out << (Q_UINT8) Object_FontProperty;
+ out << (TQ_UINT8) Object_FontProperty;
packCString( strings, out, name );
out << fontFlags;
if ( fontFlags & Font_Family )
@@ -376,7 +376,7 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
if ( fontFlags & Font_PointSize )
packUInt16( out, pointSize );
} else if ( tag == "palette" ) {
- out << (Q_UINT8) Object_PaletteProperty;
+ out << (TQ_UINT8) Object_PaletteProperty;
packCString( strings, out, name );
TQDomElement g = f.firstChild().toElement();
@@ -385,25 +385,25 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
while ( !h.isNull() ) {
value = DomTool::elementToVariant( h, TQt::gray );
if ( h.tagName() == "color" ) {
- out << (Q_UINT8) Palette_Color;
+ out << (TQ_UINT8) Palette_Color;
out << value.asColor();
} else if ( h.tagName() == "pixmap" ) {
- out << (Q_UINT8) Palette_Pixmap;
+ out << (TQ_UINT8) Palette_Pixmap;
packVariant( strings, out, value, "pixmap" );
}
h = h.nextSibling().toElement();
}
if ( g.tagName() == "active" ) {
- out << (Q_UINT8) Palette_Active;
+ out << (TQ_UINT8) Palette_Active;
} else if ( g.tagName() == "inactive" ) {
- out << (Q_UINT8) Palette_Inactive;
+ out << (TQ_UINT8) Palette_Inactive;
} else {
- out << (Q_UINT8) Palette_Disabled;
+ out << (TQ_UINT8) Palette_Disabled;
}
g = g.nextSibling().toElement();
}
- out << (Q_UINT8) Palette_End;
+ out << (TQ_UINT8) Palette_End;
} else {
value = DomTool::elementToVariant( f, value, comment );
if ( value.isValid() ) {
@@ -411,12 +411,12 @@ static void outputProperty( TQMap<int, TQStringList>& buddies, int objectNo,
buddies[objectNo] += value.asString();
} else {
if ( tag == "string" ) {
- out << (Q_UINT8) Object_TextProperty;
+ out << (TQ_UINT8) Object_TextProperty;
packCString( strings, out, name );
packCString( strings, out, value.asString().utf8() );
packCString( strings, out, comment.utf8() );
} else {
- out << (Q_UINT8) Object_VariantProperty;
+ out << (TQ_UINT8) Object_VariantProperty;
packCString( strings, out, name );
packVariant( strings, out, value, tag );
}
@@ -437,7 +437,7 @@ static void outputGridCell( TQDataStream& out, TQDomElement elem )
rowspan = 1;
if ( column != 0 || row != 0 || colspan != 1 || rowspan != 1 ) {
- out << (Q_UINT8) Object_GridCell;
+ out << (TQ_UINT8) Object_GridCell;
packUInt16( out, column );
packUInt16( out, row );
packUInt16( out, colspan );
@@ -463,7 +463,7 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies,
while ( !f.isNull() ) {
TQString tag = f.tagName();
if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) {
- out << (Q_UINT8) Object_SubLayout;
+ out << (TQ_UINT8) Object_SubLayout;
subLayoutNo = outputObject( buddies, objects, strings, out, f,
layoutForTag(tag) );
} else if ( tag == "property" ) {
@@ -484,7 +484,7 @@ static void outputLayoutWidgetsSubLayout( TQMap<int, TQStringList>& buddies,
out.device()->at( out.device()->at() - 1 );
outputGridCell( out, elem );
outputProperty( buddies, subLayoutNo, strings, out, nameElem );
- out << (Q_UINT8) Object_End;
+ out << (TQ_UINT8) Object_End;
objects.setName( subLayoutNo, name );
}
@@ -498,7 +498,7 @@ static int outputObject( TQMap<int, TQStringList>& buddies,
bool isTQObject = !className.isEmpty();
if ( className == "TQToolBar" )
- out << (Q_UINT8) elem.attribute( "dock", "0" ).toInt();
+ out << (TQ_UINT8) elem.attribute( "dock", "0" ).toInt();
if ( className == "TQWidget" )
className = elem.attribute( "class", className ).latin1();
@@ -525,50 +525,50 @@ static int outputObject( TQMap<int, TQStringList>& buddies,
TQString actionName = f.attribute( "name" );
int no = objects.find( actionName );
if ( no != -1 ) {
- out << (Q_UINT8) Object_ActionRef;
+ out << (TQ_UINT8) Object_ActionRef;
packUInt16( out, no );
}
} else {
- out << (Q_UINT8) Object_SubAction;
+ out << (TQ_UINT8) Object_SubAction;
outputObject( buddies, objects, strings, out, f, "TQAction" );
}
} else if ( tag == "actiongroup" ) {
- out << (Q_UINT8) Object_SubAction;
+ out << (TQ_UINT8) Object_SubAction;
outputObject( buddies, objects, strings, out, f, "TQActionGroup" );
} else if ( tag == "attribute" ) {
- out << (Q_UINT8) Object_Attribute;
+ out << (TQ_UINT8) Object_Attribute;
outputProperty( buddies, objectNo, strings, out, f );
} else if ( tag == "column" ) {
- out << (Q_UINT8) Object_Column;
+ out << (TQ_UINT8) Object_Column;
outputObject( buddies, objects, strings, out, f );
} else if ( tag == "event" ) {
- out << (Q_UINT8) Object_Event;
+ out << (TQ_UINT8) Object_Event;
packCString( strings, out, f.attribute("name").latin1() );
packVariant( strings, out,
TQStringList::split(',', f.attribute("functions")) );
} else if ( tag == "grid" || tag == "hbox" || tag == "vbox" ) {
- out << (Q_UINT8) Object_SubLayout;
+ out << (TQ_UINT8) Object_SubLayout;
outputObject( buddies, objects, strings, out, f,
layoutForTag(tag) );
} else if ( tag == "item" ) {
if ( elem.tagName() == "menubar" ) {
- out << (Q_UINT8) Object_MenuItem;
+ out << (TQ_UINT8) Object_MenuItem;
packCString( strings, out, f.attribute("name").latin1() );
packCString( strings, out, f.attribute("text").utf8() );
outputObject( buddies, objects, strings, out, f );
} else {
- out << (Q_UINT8) Object_Item;
+ out << (TQ_UINT8) Object_Item;
outputObject( buddies, objects, strings, out, f );
}
} else if ( tag == "property" ) {
outputProperty( buddies, objectNo, strings, out, f );
} else if ( tag == "row" ) {
- out << (Q_UINT8) Object_Row;
+ out << (TQ_UINT8) Object_Row;
outputObject( buddies, objects, strings, out, f );
} else if ( tag == "separator" ) {
- out << (Q_UINT8) Object_Separator;
+ out << (TQ_UINT8) Object_Separator;
} else if ( tag == "spacer" ) {
- out << (Q_UINT8) Object_Spacer;
+ out << (TQ_UINT8) Object_Spacer;
outputObject( buddies, objects, strings, out, f );
} else if ( tag == "widget" ) {
if ( f.attribute("class") == "TQLayoutWidget" &&
@@ -576,13 +576,13 @@ static int outputObject( TQMap<int, TQStringList>& buddies,
outputLayoutWidgetsSubLayout( buddies, objects, strings, out,
f );
} else {
- out << (Q_UINT8) Object_SubWidget;
+ out << (TQ_UINT8) Object_SubWidget;
outputObject( buddies, objects, strings, out, f, "TQWidget" );
}
}
f = f.nextSibling().toElement();
}
- out << (Q_UINT8) Object_End;
+ out << (TQ_UINT8) Object_End;
if ( isTQObject )
objects.setName( objectNo,
DomTool::readProperty(elem, "name", "").asString() );
@@ -593,7 +593,7 @@ static void outputBlock( TQDataStream& out, BlockTag tag,
const TQByteArray& data )
{
if ( !data.isEmpty() ) {
- out << (Q_UINT8) tag;
+ out << (TQ_UINT8) tag;
packByteArray( out, data );
}
}
@@ -626,9 +626,9 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
UibIndexMap objects;
int widgetNo = -1;
TQCString className;
- Q_INT16 defaultMargin = -32768;
- Q_INT16 defaultSpacing = -32768;
- Q_UINT8 introFlags = 0;
+ TQ_INT16 defaultMargin = -32768;
+ TQ_INT16 defaultSpacing = -32768;
+ TQ_UINT8 introFlags = 0;
TQDomElement elem = doc.firstChild().toElement().firstChild().toElement();
while ( !elem.isNull() ) {
@@ -834,7 +834,7 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
TQString signal = UibHack::normalize( argMap["signal"] );
TQString slot = UibHack::normalize( argMap["slot"] );
- Q_UINT8 connectionFlags = 0;
+ TQ_UINT8 connectionFlags = 0;
if ( language != prevLanguage )
connectionFlags |= Connection_Language;
if ( senderNo != prevSenderNo )
@@ -880,9 +880,9 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
}
out << UibMagic;
- out << (Q_UINT8) '\n';
- out << (Q_UINT8) '\r';
- out << (Q_UINT8) out.version();
+ out << (TQ_UINT8) '\n';
+ out << (TQ_UINT8) '\r';
+ out << (TQ_UINT8) out.version();
outputBlock( out, Block_Strings, strings.block() );
outputBlock( out, Block_Intro, introBlock );
outputBlock( out, Block_Images, imagesBlock );
@@ -896,5 +896,5 @@ void convertUiToUib( TQDomDocument& doc, TQDataStream& out )
outputBlock( out, Block_Functions, functionsBlock );
outputBlock( out, Block_Buddies, buddiesBlock );
outputBlock( out, Block_Connections, connectionsBlock );
- out << (Q_UINT8) Block_End;
+ out << (TQ_UINT8) Block_End;
}
diff --git a/tools/designer/shared/uib.h b/tools/designer/shared/uib.h
index d4b09addf..47c6f08f2 100644
--- a/tools/designer/shared/uib.h
+++ b/tools/designer/shared/uib.h
@@ -36,7 +36,7 @@
#include <ntqdatastream.h>
-const Q_UINT32 UibMagic = 0xb77c61d8;
+const TQ_UINT32 UibMagic = 0xb77c61d8;
enum BlockTag { Block_End = '$', Block_Actions = 'A', Block_Buddies = 'B',
Block_Connections = 'C', Block_Functions = 'F',
@@ -108,7 +108,7 @@ inline int UibStrTable::insertCString( const char *cstr )
return i;
}
for ( i = 0; i < len + 1; i++ )
- out << (Q_UINT8) cstr[i];
+ out << (TQ_UINT8) cstr[i];
return nextPos;
}
}
@@ -117,7 +117,7 @@ inline int UibStrTable::insertString( const TQString& str )
{
if ( str.contains('\0') || str[0] == TQChar(0x7f) ) {
int nextPos = table.size();
- out << (Q_UINT8) 0x7f;
+ out << (TQ_UINT8) 0x7f;
out << str;
return nextPos;
} else {
diff --git a/tools/designer/uic/form.cpp b/tools/designer/uic/form.cpp
index 02cdcaa7d..5c564c9dd 100644
--- a/tools/designer/uic/form.cpp
+++ b/tools/designer/uic/form.cpp
@@ -1383,7 +1383,7 @@ void Uic::createFormImpl( const TQDomElement &e )
2. If the type is 'bool', we return 'FALSE'.
3. If the type is 'unsigned long' or
- 'Q_UINT16' or 'double' or similar, we
+ 'TQ_UINT16' or 'double' or similar, we
return '0'.
4. If the type is 'Foo *', we return '0'.
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() ) {
diff --git a/tools/linguist/linguist/simtexth.cpp b/tools/linguist/linguist/simtexth.cpp
index 8d6182210..0611058d3 100644
--- a/tools/linguist/linguist/simtexth.cpp
+++ b/tools/linguist/linguist/simtexth.cpp
@@ -134,8 +134,8 @@ struct CoMatrix
words. Some operations are performed on words for more efficiency.
*/
union {
- Q_UINT8 b[52];
- Q_UINT32 w[13];
+ TQ_UINT8 b[52];
+ TQ_UINT32 w[13];
};
CoMatrix() { memset( b, 0, 52 ); }
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-08 05:48:31 +0000