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 /tdecore | |
| 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 'tdecore')
| -rw-r--r-- | tdecore/kcompletion.h | 8 | ||||
| -rw-r--r-- | tdecore/kconfigdialogmanager.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tdecore/kcompletion.h b/tdecore/kcompletion.h index aead92f77..c0ba02d34 100644 --- a/tdecore/kcompletion.h +++ b/tdecore/kcompletion.h @@ -131,10 +131,10 @@ class TQPopupMenu; */ class TDECORE_EXPORT KCompletion : public TQObject { - Q_ENUMS( CompOrder ) - Q_PROPERTY( CompOrder order READ order WRITE setOrder ) - Q_PROPERTY( bool ignoreCase READ ignoreCase WRITE setIgnoreCase ) - Q_PROPERTY( TQStringList items READ items WRITE setItems ) + TQ_ENUMS( CompOrder ) + TQ_PROPERTY( CompOrder order READ order WRITE setOrder ) + TQ_PROPERTY( bool ignoreCase READ ignoreCase WRITE setIgnoreCase ) + TQ_PROPERTY( TQStringList items READ items WRITE setItems ) Q_OBJECT public: diff --git a/tdecore/kconfigdialogmanager.h b/tdecore/kconfigdialogmanager.h index 46c2b03a6..cc2238d4c 100644 --- a/tdecore/kconfigdialogmanager.h +++ b/tdecore/kconfigdialogmanager.h @@ -50,14 +50,14 @@ class TQSqlPropertyMap; * database, it simply uses the functionality that is built into the * TQSqlPropertyMap class. New widgets can be added to the map using * TQSqlPropertyMap::installDefaultMap(). Note that you can't just add any - * class. The class must have a matching Q_PROPERTY(...) macro defined. + * class. The class must have a matching TQ_PROPERTY(...) macro defined. * * For example (note that KColorButton is already added and it doesn't need to * manually added): * * kcolorbutton.h defines the following property: * \code - * Q_PROPERTY( TQColor color READ color WRITE setColor ) + * TQ_PROPERTY( TQColor color READ color WRITE setColor ) * \endcode * * To add KColorButton the following code would be inserted in the main. |