Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3

1 files changed, 12 insertions, 12 deletions

diff --git a/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h
index ce5f85e4d..b59ac0909 100644
--- a/src/widgets/ntqbutton.h
+++ b/src/widgets/ntqbutton.h
@@ -56,18 +56,18 @@ class TQButtonData;
 class Q_EXPORT TQButton : public TQWidget
 {
     TQ_OBJECT
-    Q_ENUMS( ToggleType ToggleState )
-    Q_PROPERTY( TQString text READ text WRITE setText )
-    Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
-    Q_PROPERTY( TQKeySequence accel READ accel WRITE setAccel )
-    Q_PROPERTY( bool toggleButton READ isToggleButton )
-    Q_PROPERTY( ToggleType toggleType READ toggleType )
-    Q_PROPERTY( bool down READ isDown WRITE setDown DESIGNABLE false  )
-    Q_PROPERTY( bool on READ isOn )
-    Q_PROPERTY( ToggleState toggleState READ state )
-    Q_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
-    Q_PROPERTY( bool autoRepeat READ autoRepeat WRITE setAutoRepeat )
-    Q_PROPERTY( bool exclusiveToggle READ isExclusiveToggle )
+    TQ_ENUMS( ToggleType ToggleState )
+    TQ_PROPERTY( TQString text READ text WRITE setText )
+    TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
+    TQ_PROPERTY( TQKeySequence accel READ accel WRITE setAccel )
+    TQ_PROPERTY( bool toggleButton READ isToggleButton )
+    TQ_PROPERTY( ToggleType toggleType READ toggleType )
+    TQ_PROPERTY( bool down READ isDown WRITE setDown DESIGNABLE false  )
+    TQ_PROPERTY( bool on READ isOn )
+    TQ_PROPERTY( ToggleState toggleState READ state )
+    TQ_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false )
+    TQ_PROPERTY( bool autoRepeat READ autoRepeat WRITE setAutoRepeat )
+    TQ_PROPERTY( bool exclusiveToggle READ isExclusiveToggle )
 
 public:
     TQButton( TQWidget* parent=0, const char* name=0, WFlags f=0 );