diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 18:55:44 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 18:55:44 -0500 |
| commit | 6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d (patch) | |
| tree | f13bbebb928d6448ff186bc596fa58fa6b8892d9 /examples | |
| parent | 56cd55070ee6c5267fde1aae4d5251e400dea64d (diff) | |
| parent | 7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 (diff) | |
| download | tqt3-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.tar.gz tqt3-6b6c9a354dbda88664fb1aebda9bb1df77a4aa2d.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/demo/dnd/styledbutton.h | 10 | ||||
| -rw-r--r-- | examples/sql/overview/custom1/main.h | 2 | ||||
| -rw-r--r-- | examples/sql/overview/table3/main.h | 2 | ||||
| -rw-r--r-- | examples/sql/overview/table4/main.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/examples/demo/dnd/styledbutton.h b/examples/demo/dnd/styledbutton.h index 2cd6c0ae6..80fae5c10 100644 --- a/examples/demo/dnd/styledbutton.h +++ b/examples/demo/dnd/styledbutton.h @@ -44,12 +44,12 @@ class StyledButton : public TQButton { TQ_OBJECT - Q_PROPERTY( TQColor color READ color WRITE setColor ) - Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) - Q_PROPERTY( EditorType editor READ editor WRITE setEditor ) - Q_PROPERTY( bool scale READ scale WRITE setScale ) + TQ_PROPERTY( TQColor color READ color WRITE setColor ) + TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) + 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 }; diff --git a/examples/sql/overview/custom1/main.h b/examples/sql/overview/custom1/main.h index 7ee9d5ddc..6ba30e28c 100644 --- a/examples/sql/overview/custom1/main.h +++ b/examples/sql/overview/custom1/main.h @@ -22,7 +22,7 @@ class CustomEdit : public TQLineEdit { TQ_OBJECT - Q_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine ) + TQ_PROPERTY( TQString upperLine READ upperLine WRITE setUpperLine ) public: CustomEdit( TQWidget *parent=0, const char *name=0 ); TQString upperLine() const; diff --git a/examples/sql/overview/table3/main.h b/examples/sql/overview/table3/main.h index 8720dbb6f..4b10d7e17 100644 --- a/examples/sql/overview/table3/main.h +++ b/examples/sql/overview/table3/main.h @@ -19,7 +19,7 @@ class StatusPicker : public TQComboBox { TQ_OBJECT - Q_PROPERTY( int statusid READ statusId WRITE setStatusId ) + TQ_PROPERTY( int statusid READ statusId WRITE setStatusId ) public: StatusPicker( TQWidget *parent=0, const char *name=0 ); int statusId() const; diff --git a/examples/sql/overview/table4/main.h b/examples/sql/overview/table4/main.h index 184d69777..394d34738 100644 --- a/examples/sql/overview/table4/main.h +++ b/examples/sql/overview/table4/main.h @@ -21,7 +21,7 @@ class StatusPicker : public TQComboBox { TQ_OBJECT - Q_PROPERTY( int statusid READ statusId WRITE setStatusId ) + TQ_PROPERTY( int statusid READ statusId WRITE setStatusId ) public: StatusPicker( TQWidget *parent=0, const char *name=0 ); int statusId() const; |