diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:11:21 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-10-21 13:11:21 -0500 |
commit | 7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2 (patch) | |
tree | 713b8b19d0bff547fb7a12d8f36b7ab5e48bbbd2 /tdeui/ktoolbar.h | |
parent | 5d9a593c1fe4967f3636524cbef739d80b0d8cae (diff) | |
parent | fe43761567120b0bda4e0aed56b7c1e56bdd93c5 (diff) | |
download | tdelibs-7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2.tar.gz tdelibs-7bdcf7b7a990e5024a865d801cd16df9d6e8a3e2.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdeui/ktoolbar.h')
-rw-r--r-- | tdeui/ktoolbar.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tdeui/ktoolbar.h b/tdeui/ktoolbar.h index 1ef30a3cc..aa447ed5c 100644 --- a/tdeui/ktoolbar.h +++ b/tdeui/ktoolbar.h @@ -105,12 +105,12 @@ class TDEUI_EXPORT KToolBar : public TQToolBar { Q_OBJECT - Q_ENUMS( IconText BarPosition ) - Q_PROPERTY( IconText iconText READ iconText WRITE setIconText ) - Q_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos ) - Q_PROPERTY( bool fullSize READ fullSize WRITE setFullSize ) - Q_PROPERTY( int iconSize READ iconSize WRITE setIconSize ) - Q_PROPERTY( TQString text READ text WRITE setText ) + TQ_ENUMS( IconText BarPosition ) + TQ_PROPERTY( IconText iconText READ iconText WRITE setIconText ) + TQ_PROPERTY( BarPosition barPos READ barPos WRITE setBarPos ) + TQ_PROPERTY( bool fullSize READ fullSize WRITE setFullSize ) + TQ_PROPERTY( int iconSize READ iconSize WRITE setIconSize ) + TQ_PROPERTY( TQString text READ text WRITE setText ) public: enum IconText{IconOnly = 0, IconTextRight, TextOnly, IconTextBottom}; |