Automated update from Qt3

4 files changed, 32 insertions, 32 deletions

diff --git a/tools/designer/designer/listboxdnd.cpp b/tools/designer/designer/listboxdnd.cpp
index 11f38868..f4bf7305 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 49c7980f..a7b831d1 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 84e75034..fa763b54 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 719e147d..9d95f54d 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;