From 4ee9bc52eb83d3dbe097893bf5df36dd26279280 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 20 Oct 2012 21:39:08 -0500 Subject: [PATCH] Update TQt3 property/enum macros --- doc/api/PropEditor.dox | 2 +- kdevdesigner/designer/filechooser.h | 2 +- kdevdesigner/designer/layout.h | 2 +- kdevdesigner/designer/styledbutton.h | 2 +- lib/cppparser/driver.cpp | 2 +- lib/widgets/propeditor/Mainpage.dox | 2 +- lib/widgets/qcomboview.h | 2 +- parts/fileselector/kactionselector.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/api/PropEditor.dox b/doc/api/PropEditor.dox index b4f4eccc..676e634c 100644 --- a/doc/api/PropEditor.dox +++ b/doc/api/PropEditor.dox @@ -20,7 +20,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::PropertyType) or custom type. Custom type should be used if a custom property editor widget is diff --git a/kdevdesigner/designer/filechooser.h b/kdevdesigner/designer/filechooser.h index b4056a07..42430334 100644 --- a/kdevdesigner/designer/filechooser.h +++ b/kdevdesigner/designer/filechooser.h @@ -37,7 +37,7 @@ class FileChooser : public TQWidget Q_OBJECT - Q_ENUMS( Mode ) + TQ_ENUMS( Mode ) TQ_PROPERTY( Mode mode READ mode WRITE setMode ) TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName ) diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index d9870f55..de302e08 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -123,7 +123,7 @@ class Spacer : public TQWidget TQ_OVERRIDE( TQCString name ) TQ_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation ) - Q_ENUMS( SizeType ) + TQ_ENUMS( SizeType ) TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType ) TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true ) TQ_OVERRIDE( TQRect geometry DESIGNABLE false ) diff --git a/kdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h index 5248d604..8065fe84 100644 --- a/kdevdesigner/designer/styledbutton.h +++ b/kdevdesigner/designer/styledbutton.h @@ -44,7 +44,7 @@ class StyledButton : public TQButton 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/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 ) diff --git a/parts/fileselector/kactionselector.h b/parts/fileselector/kactionselector.h index 53a366b6..b5dd65d3 100644 --- a/parts/fileselector/kactionselector.h +++ b/parts/fileselector/kactionselector.h @@ -76,7 +76,7 @@ class KActionSelectorPrivate; class KActionSelector : public TQWidget { Q_OBJECT - Q_ENUMS( ButtonIconSize InsertionPolicy ) + TQ_ENUMS( ButtonIconSize InsertionPolicy ) TQ_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOnDoubleClick ) TQ_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEnabled ) TQ_PROPERTY( TQString availableLabel READ availableLabel WRITE setAvailableLabel )