diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:38:48 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:38:48 -0500 |
commit | bb5db1f645466cea736d1b0f798d289b63282d89 (patch) | |
tree | 15487508210950005267e65be92a89b5058aa583 /kdevdesigner | |
parent | ffc74f031874e3823f212e40a03cb9f25091cb5f (diff) | |
parent | 4ee9bc52eb83d3dbe097893bf5df36dd26279280 (diff) | |
download | tdevelop-bb5db1f645466cea736d1b0f798d289b63282d89.tar.gz tdevelop-bb5db1f645466cea736d1b0f798d289b63282d89.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdevelop
Diffstat (limited to 'kdevdesigner')
-rw-r--r-- | kdevdesigner/designer/filechooser.h | 2 | ||||
-rw-r--r-- | kdevdesigner/designer/layout.h | 2 | ||||
-rw-r--r-- | kdevdesigner/designer/styledbutton.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kdevdesigner/designer/filechooser.h b/kdevdesigner/designer/filechooser.h index b4056a07..42430334 100644 --- a/kdevdesigner/designer/filechooser.h +++ b/kdevdesigner/designer/filechooser.h @@ -37,7 +37,7 @@ class FileChooser : public TQWidget Q_OBJECT - Q_ENUMS( Mode ) + TQ_ENUMS( Mode ) TQ_PROPERTY( Mode mode READ mode WRITE setMode ) TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index d9870f55..de302e08 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -123,7 +123,7 @@ class Spacer : public TQWidget TQ_OVERRIDE( TQCString name ) TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) - Q_ENUMS( SizeType ) + TQ_ENUMS( SizeType ) TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) TQ_OVERRIDE( TQRect geometry DESIGNABLE false ) diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h index 5248d604..8065fe84 100644 --- a/kdevdesigner/designer/styledbutton.h +++ b/kdevdesigner/designer/styledbutton.h @@ -44,7 +44,7 @@ class StyledButton : public TQButton TQ_PROPERTY( EditorType editor READ editor WRITE setEditor ) TQ_PROPERTY( bool scale READ scale WRITE setScale ) - Q_ENUMS( EditorType ) + TQ_ENUMS( EditorType ) public: enum EditorType { ColorEditor, PixmapEditor }; |