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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/cppparser/driver.cpp | 2 | ||||
| -rw-r--r-- | lib/widgets/propeditor/Mainpage.dox | 2 | ||||
| -rw-r--r-- | lib/widgets/qcomboview.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index 4c7fe6dc..0f5174a0 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -600,7 +600,7 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "Q_OBJECT" ); lexer->addSkipWord( "" ); lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); - lexer->addSkipWord( "Q_ENUMS", SkipWordAndArguments ); + lexer->addSkipWord( "TQ_ENUMS", SkipWordAndArguments ); lexer->addSkipWord( "TQ_PROPERTY", SkipWordAndArguments ); lexer->addSkipWord( "TQ_CLASSINFO", SkipWordAndArguments ); lexer->addSkipWord( "TQ_SETS", SkipWordAndArguments ); diff --git a/lib/widgets/propeditor/Mainpage.dox b/lib/widgets/propeditor/Mainpage.dox index a46f0eb5..9a3a741a 100644 --- a/lib/widgets/propeditor/Mainpage.dox +++ b/lib/widgets/propeditor/Mainpage.dox @@ -22,7 +22,7 @@ with the goal to be more generic and extensible. Library provides a @ref PropertyLib::Property class which stores property name, value and some more important information like description or the list of possible values. -Using @ref PropertyLib::Property class adds more overhead over Q_PROPERTY but provides more +Using @ref PropertyLib::Property class adds more overhead over TQ_PROPERTY but provides more flexibility. You can subclass @ref PropertyLib::Property and create your custom properties. Custom properties can have either predefined type (see @ref PropertyLib::Property::PropertyType) or custom type. Custom type should be used if a custom property editor widget is diff --git a/lib/widgets/qcomboview.h b/lib/widgets/qcomboview.h index b97bb3c9..51d57eec 100644 --- a/lib/widgets/qcomboview.h +++ b/lib/widgets/qcomboview.h @@ -42,7 +42,7 @@ class TQ_EXPORT QComboView : public TQWidget { Q_OBJECT - Q_ENUMS( Policy ) + TQ_ENUMS( Policy ) TQ_PROPERTY( bool editable READ editable WRITE setEditable ) // TQ_PROPERTY( int count READ count ) TQ_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false ) |