Automated update from Qt3

4 files changed, 81 insertions, 81 deletions

diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h
index 2405a7f15..ce170abc2 100644
--- a/src/kernel/ntqlayout.h
+++ b/src/kernel/ntqlayout.h
@@ -179,10 +179,10 @@ private:
 class Q_EXPORT TQLayout : public TQObject, public TQLayoutItem
 {
     TQ_OBJECT
-    Q_ENUMS( ResizeMode )
-    Q_PROPERTY( int margin READ margin WRITE setMargin )
-    Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
-    Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
+    TQ_ENUMS( ResizeMode )
+    TQ_PROPERTY( int margin READ margin WRITE setMargin )
+    TQ_PROPERTY( int spacing READ spacing WRITE setSpacing )
+    TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode )
 
 public:
     // ### TQt 4.0: put 'Auto' first in enum
diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h
index dc4ef21a0..5b64e2d01 100644
--- a/src/kernel/ntqobject.h
+++ b/src/kernel/ntqobject.h
@@ -66,7 +66,7 @@ struct TQUObject;
 class Q_EXPORT TQObject: public TQt
 {
     TQ_OBJECT
-    Q_PROPERTY( TQCString name READ name WRITE setName )
+    TQ_PROPERTY( TQCString name READ name WRITE setName )
 
 public:
     TQObject( TQObject *parent=0, const char *name=0 );
diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h
index 4d4e794fa..11401308b 100644
--- a/src/kernel/ntqobjectdefs.h
+++ b/src/kernel/ntqobjectdefs.h
@@ -77,11 +77,11 @@ struct TQUObject;
 #ifdef QT_MOC_CPP
 #define slots			    slots
 #define signals		    signals
-#define Q_CLASSINFO( name, value ) Q_CLASSINFO( name, value )
-#define Q_PROPERTY( text )	    Q_PROPERTY( text )
-#define Q_OVERRIDE( text )	    Q_OVERRIDE( text )
-#define Q_ENUMS( x )		    Q_ENUMS( x )
-#define Q_SETS( x )		    Q_SETS( x )
+#define TQ_CLASSINFO( name, value ) TQ_CLASSINFO( name, value )
+#define TQ_PROPERTY( text )	    TQ_PROPERTY( text )
+#define TQ_OVERRIDE( text )	    TQ_OVERRIDE( text )
+#define TQ_ENUMS( x )		    TQ_ENUMS( x )
+#define TQ_SETS( x )		    TQ_SETS( x )
  /* tmake ignore TQ_OBJECT */
 #define TQ_OBJECT		    TQ_OBJECT
  /* tmake ignore TQ_OBJECT */
@@ -93,11 +93,11 @@ struct TQUObject;
 #ifndef QT_NO_EMIT
 #define emit					// emit signal
 #endif
-#define Q_CLASSINFO( name, value )		// class info
-#define Q_PROPERTY( text )			// property
-#define Q_OVERRIDE( text )			// override property
-#define Q_ENUMS( x )
-#define Q_SETS( x )
+#define TQ_CLASSINFO( name, value )		// class info
+#define TQ_PROPERTY( text )			// property
+#define TQ_OVERRIDE( text )			// override property
+#define TQ_ENUMS( x )
+#define TQ_SETS( x )
 
 /* tmake ignore TQ_OBJECT */
 #define TQ_OBJECT							\
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index c4a288d4b..d7c8cb583 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -67,76 +67,76 @@ class TQStyle;
 class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice
 {
     TQ_OBJECT
-    Q_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin )
-    Q_PROPERTY( bool isTopLevel READ isTopLevel )
-    Q_PROPERTY( bool isDialog READ isDialog )
-    Q_PROPERTY( bool isModal READ isModal )
-    Q_PROPERTY( bool isPopup READ isPopup )
-    Q_PROPERTY( bool isDesktop READ isDesktop )
-    Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
-    Q_PROPERTY( TQRect geometry READ geometry WRITE setGeometry )
-    Q_PROPERTY( TQRect frameGeometry READ frameGeometry )
-    Q_PROPERTY( int x READ x )
-    Q_PROPERTY( int y READ y )
-    Q_PROPERTY( TQPoint pos READ pos WRITE move DESIGNABLE false STORED false )
-    Q_PROPERTY( TQSize frameSize READ frameSize )
-    Q_PROPERTY( TQSize size READ size WRITE resize DESIGNABLE false STORED false )
-    Q_PROPERTY( int width READ width )
-    Q_PROPERTY( int height READ height )
-    Q_PROPERTY( TQRect rect READ rect )
-    Q_PROPERTY( TQRect childrenRect READ childrenRect )
-    Q_PROPERTY( TQRegion childrenRegion READ childrenRegion )
-    Q_PROPERTY( TQSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy )
-    Q_PROPERTY( TQSize minimumSize READ minimumSize WRITE setMinimumSize )
-    Q_PROPERTY( TQSize maximumSize READ maximumSize WRITE setMaximumSize )
-    Q_PROPERTY( int minimumWidth READ minimumWidth WRITE setMinimumWidth STORED false DESIGNABLE false )
-    Q_PROPERTY( int minimumHeight READ minimumHeight WRITE setMinimumHeight STORED false DESIGNABLE false )
-    Q_PROPERTY( int maximumWidth READ maximumWidth WRITE setMaximumWidth STORED false DESIGNABLE false )
-    Q_PROPERTY( int maximumHeight READ maximumHeight WRITE setMaximumHeight STORED false DESIGNABLE false )
-    Q_PROPERTY( TQSize sizeIncrement READ sizeIncrement WRITE setSizeIncrement )
-    Q_PROPERTY( TQSize baseSize READ baseSize WRITE setBaseSize )
-    Q_PROPERTY( BackgroundMode backgroundMode READ backgroundMode WRITE setBackgroundMode DESIGNABLE false )
-    Q_PROPERTY( TQColor paletteForegroundColor READ paletteForegroundColor WRITE setPaletteForegroundColor RESET unsetPalette )
-    Q_PROPERTY( TQColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor RESET unsetPalette )
-    Q_PROPERTY( TQPixmap paletteBackgroundPixmap READ paletteBackgroundPixmap WRITE setPaletteBackgroundPixmap RESET unsetPalette )
-    Q_PROPERTY( TQBrush backgroundBrush READ backgroundBrush )
-    Q_PROPERTY( TQColorGroup colorGroup READ colorGroup )
-    Q_PROPERTY( TQPalette palette READ palette WRITE setPalette RESET unsetPalette  STORED ownPalette )
-    Q_PROPERTY( BackgroundOrigin backgroundOrigin READ backgroundOrigin WRITE setBackgroundOrigin )
-    Q_PROPERTY( bool ownPalette READ ownPalette )
-    Q_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont )
-    Q_PROPERTY( bool ownFont READ ownFont )
+    TQ_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin )
+    TQ_PROPERTY( bool isTopLevel READ isTopLevel )
+    TQ_PROPERTY( bool isDialog READ isDialog )
+    TQ_PROPERTY( bool isModal READ isModal )
+    TQ_PROPERTY( bool isPopup READ isPopup )
+    TQ_PROPERTY( bool isDesktop READ isDesktop )
+    TQ_PROPERTY( bool enabled READ isEnabled WRITE setEnabled )
+    TQ_PROPERTY( TQRect geometry READ geometry WRITE setGeometry )
+    TQ_PROPERTY( TQRect frameGeometry READ frameGeometry )
+    TQ_PROPERTY( int x READ x )
+    TQ_PROPERTY( int y READ y )
+    TQ_PROPERTY( TQPoint pos READ pos WRITE move DESIGNABLE false STORED false )
+    TQ_PROPERTY( TQSize frameSize READ frameSize )
+    TQ_PROPERTY( TQSize size READ size WRITE resize DESIGNABLE false STORED false )
+    TQ_PROPERTY( int width READ width )
+    TQ_PROPERTY( int height READ height )
+    TQ_PROPERTY( TQRect rect READ rect )
+    TQ_PROPERTY( TQRect childrenRect READ childrenRect )
+    TQ_PROPERTY( TQRegion childrenRegion READ childrenRegion )
+    TQ_PROPERTY( TQSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy )
+    TQ_PROPERTY( TQSize minimumSize READ minimumSize WRITE setMinimumSize )
+    TQ_PROPERTY( TQSize maximumSize READ maximumSize WRITE setMaximumSize )
+    TQ_PROPERTY( int minimumWidth READ minimumWidth WRITE setMinimumWidth STORED false DESIGNABLE false )
+    TQ_PROPERTY( int minimumHeight READ minimumHeight WRITE setMinimumHeight STORED false DESIGNABLE false )
+    TQ_PROPERTY( int maximumWidth READ maximumWidth WRITE setMaximumWidth STORED false DESIGNABLE false )
+    TQ_PROPERTY( int maximumHeight READ maximumHeight WRITE setMaximumHeight STORED false DESIGNABLE false )
+    TQ_PROPERTY( TQSize sizeIncrement READ sizeIncrement WRITE setSizeIncrement )
+    TQ_PROPERTY( TQSize baseSize READ baseSize WRITE setBaseSize )
+    TQ_PROPERTY( BackgroundMode backgroundMode READ backgroundMode WRITE setBackgroundMode DESIGNABLE false )
+    TQ_PROPERTY( TQColor paletteForegroundColor READ paletteForegroundColor WRITE setPaletteForegroundColor RESET unsetPalette )
+    TQ_PROPERTY( TQColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor RESET unsetPalette )
+    TQ_PROPERTY( TQPixmap paletteBackgroundPixmap READ paletteBackgroundPixmap WRITE setPaletteBackgroundPixmap RESET unsetPalette )
+    TQ_PROPERTY( TQBrush backgroundBrush READ backgroundBrush )
+    TQ_PROPERTY( TQColorGroup colorGroup READ colorGroup )
+    TQ_PROPERTY( TQPalette palette READ palette WRITE setPalette RESET unsetPalette  STORED ownPalette )
+    TQ_PROPERTY( BackgroundOrigin backgroundOrigin READ backgroundOrigin WRITE setBackgroundOrigin )
+    TQ_PROPERTY( bool ownPalette READ ownPalette )
+    TQ_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont )
+    TQ_PROPERTY( bool ownFont READ ownFont )
 #ifndef QT_NO_CURSOR
-    Q_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor )
-    Q_PROPERTY( bool ownCursor READ ownCursor )
+    TQ_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor )
+    TQ_PROPERTY( bool ownCursor READ ownCursor )
 #endif
 #ifndef QT_NO_WIDGET_TOPEXTRA
-    Q_PROPERTY( TQString caption READ caption WRITE setCaption )
-    Q_PROPERTY( TQPixmap icon READ icon WRITE setIcon )
-    Q_PROPERTY( TQString iconText READ iconText WRITE setIconText )
+    TQ_PROPERTY( TQString caption READ caption WRITE setCaption )
+    TQ_PROPERTY( TQPixmap icon READ icon WRITE setIcon )
+    TQ_PROPERTY( TQString iconText READ iconText WRITE setIconText )
 #endif
-    Q_PROPERTY( bool mouseTracking READ hasMouseTracking WRITE setMouseTracking )
-    Q_PROPERTY( bool underMouse READ hasMouse )
-    Q_PROPERTY( bool isActiveWindow READ isActiveWindow )
-    Q_PROPERTY( bool focusEnabled READ isFocusEnabled )
-    Q_PROPERTY( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy )
-    Q_PROPERTY( bool focus READ hasFocus )
-    Q_PROPERTY( bool updatesEnabled READ isUpdatesEnabled WRITE setUpdatesEnabled DESIGNABLE false )
-    Q_PROPERTY( bool visible READ isVisible )
-    Q_PROPERTY( TQRect visibleRect READ visibleRect ) // obsolete
-    Q_PROPERTY( bool hidden READ isHidden WRITE setHidden DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( bool shown READ isShown WRITE setShown DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( bool minimized READ isMinimized )
-    Q_PROPERTY( bool maximized READ isMaximized )
-    Q_PROPERTY( bool fullScreen READ isFullScreen )
-    Q_PROPERTY( TQSize sizeHint READ sizeHint )
-    Q_PROPERTY( TQSize minimumSizeHint READ minimumSizeHint )
-    Q_PROPERTY( TQRect microFocusHint READ microFocusHint )
-    Q_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops )
-    Q_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( bool customWhatsThis READ customWhatsThis )
-    Q_PROPERTY( bool inputMethodEnabled READ isInputMethodEnabled WRITE setInputMethodEnabled DESIGNABLE false SCRIPTABLE false )
-    Q_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
+    TQ_PROPERTY( bool mouseTracking READ hasMouseTracking WRITE setMouseTracking )
+    TQ_PROPERTY( bool underMouse READ hasMouse )
+    TQ_PROPERTY( bool isActiveWindow READ isActiveWindow )
+    TQ_PROPERTY( bool focusEnabled READ isFocusEnabled )
+    TQ_PROPERTY( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy )
+    TQ_PROPERTY( bool focus READ hasFocus )
+    TQ_PROPERTY( bool updatesEnabled READ isUpdatesEnabled WRITE setUpdatesEnabled DESIGNABLE false )
+    TQ_PROPERTY( bool visible READ isVisible )
+    TQ_PROPERTY( TQRect visibleRect READ visibleRect ) // obsolete
+    TQ_PROPERTY( bool hidden READ isHidden WRITE setHidden DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool shown READ isShown WRITE setShown DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool minimized READ isMinimized )
+    TQ_PROPERTY( bool maximized READ isMaximized )
+    TQ_PROPERTY( bool fullScreen READ isFullScreen )
+    TQ_PROPERTY( TQSize sizeHint READ sizeHint )
+    TQ_PROPERTY( TQSize minimumSizeHint READ minimumSizeHint )
+    TQ_PROPERTY( TQRect microFocusHint READ microFocusHint )
+    TQ_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops )
+    TQ_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( bool customWhatsThis READ customWhatsThis )
+    TQ_PROPERTY( bool inputMethodEnabled READ isInputMethodEnabled WRITE setInputMethodEnabled DESIGNABLE false SCRIPTABLE false )
+    TQ_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false )
 
 public:
     Q_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0, NFlags n=0 );