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/kaction.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/kaction.h')
| -rw-r--r-- | tdeui/kaction.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tdeui/kaction.h b/tdeui/kaction.h index 44e77a4d5..dca99b4b0 100644 --- a/tdeui/kaction.h +++ b/tdeui/kaction.h @@ -203,15 +203,15 @@ class TDEUI_EXPORT KAction : public TQObject { friend class KActionCollection; Q_OBJECT - Q_PROPERTY( int containerCount READ containerCount ) - Q_PROPERTY( TQString plainText READ plainText ) - Q_PROPERTY( TQString text READ text WRITE setText ) - Q_PROPERTY( TQString shortcut READ shortcutText WRITE setShortcutText ) - Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled ) - Q_PROPERTY( TQString group READ group WRITE setGroup ) - Q_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis ) - Q_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip ) - Q_PROPERTY( TQString icon READ icon WRITE setIcon ) + TQ_PROPERTY( int containerCount READ containerCount ) + TQ_PROPERTY( TQString plainText READ plainText ) + TQ_PROPERTY( TQString text READ text WRITE setText ) + TQ_PROPERTY( TQString shortcut READ shortcutText WRITE setShortcutText ) + TQ_PROPERTY( bool enabled READ isEnabled WRITE setEnabled ) + TQ_PROPERTY( TQString group READ group WRITE setGroup ) + TQ_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis ) + TQ_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip ) + TQ_PROPERTY( TQString icon READ icon WRITE setIcon ) public: /** * Constructs an action with text, potential keyboard @@ -436,7 +436,7 @@ public: */ virtual const KShortcut& shortcutDefault() const; - // These two methods are for Q_PROPERTY + // These two methods are for TQ_PROPERTY TQString shortcutText() const; void setShortcutText( const TQString& ); |