diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-10-20 20:01:48 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-10-20 20:01:48 -0500 |
| commit | 7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 (patch) | |
| tree | 7ffddfefaf990c9a33ee6a0f317b9133dc58305c /src | |
| parent | edec8306fb4f7dab5e6b0f368e889581f38ea3bc (diff) | |
| download | tqt3-7608f0043b6dfc0b1adcaa8912793e1d3fe7b636.tar.gz tqt3-7608f0043b6dfc0b1adcaa8912793e1d3fe7b636.zip | |
Automated update from Qt3
Diffstat (limited to 'src')
66 files changed, 593 insertions, 593 deletions
diff --git a/src/attic/qtmultilineedit.h b/src/attic/qtmultilineedit.h index f74b66ef..da12cb54 100644 --- a/src/attic/qtmultilineedit.h +++ b/src/attic/qtmultilineedit.h @@ -29,27 +29,27 @@ class TQValidator; class TQtMultiLineEdit : public TQtTableView { TQ_OBJECT - Q_ENUMS( EchoMode WordWrap WrapPolicy ) - Q_PROPERTY( int numLines READ numLines ) - Q_PROPERTY( bool atBeginning READ atBeginning ) - Q_PROPERTY( bool atEnd READ atEnd ) - Q_PROPERTY( int maxLineWidth READ maxLineWidth ) - Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) - Q_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false ) - Q_PROPERTY( EchoMode echoMode READ echoMode WRITE setEchoMode ) - Q_PROPERTY( int maxLength READ maxLength WRITE setMaxLength ) - Q_PROPERTY( int maxLines READ maxLines WRITE setMaxLines ) - Q_PROPERTY( int hMargin READ hMargin WRITE setHMargin ) - Q_PROPERTY( WordWrap wordWrap READ wordWrap WRITE setWordWrap ) - Q_PROPERTY( int wrapColumnOrWidth READ wrapColumnOrWidth WRITE setWrapColumnOrWidth ) - Q_PROPERTY( WrapPolicy wrapPolicy READ wrapPolicy WRITE setWrapPolicy ) - Q_PROPERTY( bool autoUpdate READ autoUpdate WRITE setAutoUpdate DESIGNABLE false ) - Q_PROPERTY( bool undoEnabled READ isUndoEnabled WRITE setUndoEnabled ) - Q_PROPERTY( int undoDepth READ undoDepth WRITE setUndoDepth ) - Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) - Q_PROPERTY( bool overWriteMode READ isOverwriteMode WRITE setOverwriteMode ) - Q_PROPERTY( TQString text READ text WRITE setText ) - Q_PROPERTY( int length READ length ) + TQ_ENUMS( EchoMode WordWrap WrapPolicy ) + TQ_PROPERTY( int numLines READ numLines ) + TQ_PROPERTY( bool atBeginning READ atBeginning ) + TQ_PROPERTY( bool atEnd READ atEnd ) + TQ_PROPERTY( int maxLineWidth READ maxLineWidth ) + TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) + TQ_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false ) + TQ_PROPERTY( EchoMode echoMode READ echoMode WRITE setEchoMode ) + TQ_PROPERTY( int maxLength READ maxLength WRITE setMaxLength ) + TQ_PROPERTY( int maxLines READ maxLines WRITE setMaxLines ) + TQ_PROPERTY( int hMargin READ hMargin WRITE setHMargin ) + TQ_PROPERTY( WordWrap wordWrap READ wordWrap WRITE setWordWrap ) + TQ_PROPERTY( int wrapColumnOrWidth READ wrapColumnOrWidth WRITE setWrapColumnOrWidth ) + TQ_PROPERTY( WrapPolicy wrapPolicy READ wrapPolicy WRITE setWrapPolicy ) + TQ_PROPERTY( bool autoUpdate READ autoUpdate WRITE setAutoUpdate DESIGNABLE false ) + TQ_PROPERTY( bool undoEnabled READ isUndoEnabled WRITE setUndoEnabled ) + TQ_PROPERTY( int undoDepth READ undoDepth WRITE setUndoDepth ) + TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) + TQ_PROPERTY( bool overWriteMode READ isOverwriteMode WRITE setOverwriteMode ) + TQ_PROPERTY( TQString text READ text WRITE setText ) + TQ_PROPERTY( int length READ length ) public: TQtMultiLineEdit( TQWidget *parent=0, const char *name=0 ); diff --git a/src/dialogs/ntqdialog.h b/src/dialogs/ntqdialog.h index 113703d6..5c9e1499 100644 --- a/src/dialogs/ntqdialog.h +++ b/src/dialogs/ntqdialog.h @@ -56,8 +56,8 @@ class Q_EXPORT TQDialog : public TQWidget { friend class TQPushButton; TQ_OBJECT - Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled ) - Q_PROPERTY( bool modal READ isModal WRITE setModal ) + TQ_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled ) + TQ_PROPERTY( bool modal READ isModal WRITE setModal ) public: Q_EXPLICIT TQDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE, diff --git a/src/dialogs/ntqfiledialog.h b/src/dialogs/ntqfiledialog.h index aeaee742..577958bc 100644 --- a/src/dialogs/ntqfiledialog.h +++ b/src/dialogs/ntqfiledialog.h @@ -92,19 +92,19 @@ public: class Q_EXPORT TQFileDialog : public TQDialog { TQ_OBJECT - Q_ENUMS( Mode ViewMode PreviewMode ) + TQ_ENUMS( Mode ViewMode PreviewMode ) // ##### Why are this read-only properties ? - Q_PROPERTY( TQString selectedFile READ selectedFile ) - Q_PROPERTY( TQString selectedFilter READ selectedFilter ) - Q_PROPERTY( TQStringList selectedFiles READ selectedFiles ) + TQ_PROPERTY( TQString selectedFile READ selectedFile ) + TQ_PROPERTY( TQString selectedFilter READ selectedFilter ) + TQ_PROPERTY( TQStringList selectedFiles READ selectedFiles ) // #### Should not we be able to set the path ? - Q_PROPERTY( TQString dirPath READ dirPath ) - Q_PROPERTY( bool showHiddenFiles READ showHiddenFiles WRITE setShowHiddenFiles ) - Q_PROPERTY( Mode mode READ mode WRITE setMode ) - Q_PROPERTY( ViewMode viewMode READ viewMode WRITE setViewMode ) - Q_PROPERTY( PreviewMode previewMode READ previewMode WRITE setPreviewMode ) - Q_PROPERTY( bool infoPreview READ isInfoPreviewEnabled WRITE setInfoPreviewEnabled ) - Q_PROPERTY( bool contentsPreview READ isContentsPreviewEnabled WRITE setContentsPreviewEnabled ) + TQ_PROPERTY( TQString dirPath READ dirPath ) + TQ_PROPERTY( bool showHiddenFiles READ showHiddenFiles WRITE setShowHiddenFiles ) + TQ_PROPERTY( Mode mode READ mode WRITE setMode ) + TQ_PROPERTY( ViewMode viewMode READ viewMode WRITE setViewMode ) + TQ_PROPERTY( PreviewMode previewMode READ previewMode WRITE setPreviewMode ) + TQ_PROPERTY( bool infoPreview READ isInfoPreviewEnabled WRITE setInfoPreviewEnabled ) + TQ_PROPERTY( bool contentsPreview READ isContentsPreviewEnabled WRITE setContentsPreviewEnabled ) public: TQFileDialog( const TQString& dirName, const TQString& filter = TQString::null, diff --git a/src/dialogs/ntqmessagebox.h b/src/dialogs/ntqmessagebox.h index 50522e81..c4436dfc 100644 --- a/src/dialogs/ntqmessagebox.h +++ b/src/dialogs/ntqmessagebox.h @@ -54,11 +54,11 @@ struct TQMessageBoxData; class Q_EXPORT TQMessageBox : public TQDialog { TQ_OBJECT - Q_ENUMS( Icon ) - Q_PROPERTY( TQString text READ text WRITE setText ) - Q_PROPERTY( Icon icon READ icon WRITE setIcon ) - Q_PROPERTY( TQPixmap iconPixmap READ iconPixmap WRITE setIconPixmap ) - Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat ) + TQ_ENUMS( Icon ) + TQ_PROPERTY( TQString text READ text WRITE setText ) + TQ_PROPERTY( Icon icon READ icon WRITE setIcon ) + TQ_PROPERTY( TQPixmap iconPixmap READ iconPixmap WRITE setIconPixmap ) + TQ_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat ) public: enum Icon { NoIcon = 0, Information = 1, Warning = 2, Critical = 3, diff --git a/src/dialogs/ntqprogressdialog.h b/src/dialogs/ntqprogressdialog.h index 77b8af10..404fa5e3 100644 --- a/src/dialogs/ntqprogressdialog.h +++ b/src/dialogs/ntqprogressdialog.h @@ -56,14 +56,14 @@ class TQProgressDialogData; class Q_EXPORT TQProgressDialog : public TQDialog { TQ_OBJECT - Q_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0 - Q_PROPERTY( bool wasCanceled READ wasCanceled ) - Q_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps ) - Q_PROPERTY( int progress READ progress WRITE setProgress ) - Q_PROPERTY( bool autoReset READ autoReset WRITE setAutoReset ) - Q_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose ) - Q_PROPERTY( int minimumDuration READ minimumDuration WRITE setMinimumDuration ) - Q_PROPERTY( TQString labelText READ labelText WRITE setLabelText ) + TQ_PROPERTY( bool wasCancelled READ wasCancelled DESIGNABLE false STORED false ) // ### remove in 4.0 + TQ_PROPERTY( bool wasCanceled READ wasCanceled ) + TQ_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps ) + TQ_PROPERTY( int progress READ progress WRITE setProgress ) + TQ_PROPERTY( bool autoReset READ autoReset WRITE setAutoReset ) + TQ_PROPERTY( bool autoClose READ autoClose WRITE setAutoClose ) + TQ_PROPERTY( int minimumDuration READ minimumDuration WRITE setMinimumDuration ) + TQ_PROPERTY( TQString labelText READ labelText WRITE setLabelText ) public: TQProgressDialog( TQWidget* parent=0, const char* name=0, bool modal=FALSE, diff --git a/src/dialogs/ntqwizard.h b/src/dialogs/ntqwizard.h index d0c90b38..d9fb8d1c 100644 --- a/src/dialogs/ntqwizard.h +++ b/src/dialogs/ntqwizard.h @@ -54,7 +54,7 @@ class TQWizardPrivate; class Q_EXPORT TQWizard : public TQDialog { TQ_OBJECT - Q_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont ) + TQ_PROPERTY( TQFont titleFont READ titleFont WRITE setTitleFont ) public: TQWizard( TQWidget* parent=0, const char* name=0, bool modal=FALSE, diff --git a/src/dialogs/qcolordialog.cpp b/src/dialogs/qcolordialog.cpp index a4863f86..7efb55ff 100644 --- a/src/dialogs/qcolordialog.cpp +++ b/src/dialogs/qcolordialog.cpp @@ -74,8 +74,8 @@ struct TQWellArrayData; class TQWellArray : public TQGridView { TQ_OBJECT - Q_PROPERTY( int selectedColumn READ selectedColumn ) - Q_PROPERTY( int selectedRow READ selectedRow ) + TQ_PROPERTY( int selectedColumn READ selectedColumn ) + TQ_PROPERTY( int selectedRow READ selectedRow ) public: TQWellArray( TQWidget* parent=0, const char* name=0, bool popup = FALSE ); diff --git a/src/iconview/ntqiconview.h b/src/iconview/ntqiconview.h index 6df2991f..bda8273f 100644 --- a/src/iconview/ntqiconview.h +++ b/src/iconview/ntqiconview.h @@ -277,24 +277,24 @@ class TQM_EXPORT_ICONVIEW TQIconView : public TQScrollView TQ_OBJECT // #### sorting and sort direction do not work - Q_ENUMS( SelectionMode ItemTextPos Arrangement ResizeMode ) - Q_PROPERTY( bool sorting READ sorting ) - Q_PROPERTY( bool sortDirection READ sortDirection ) - Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode ) - Q_PROPERTY( int gridX READ gridX WRITE setGridX ) - Q_PROPERTY( int gridY READ gridY WRITE setGridY ) - Q_PROPERTY( int spacing READ spacing WRITE setSpacing ) - Q_PROPERTY( ItemTextPos itemTextPos READ itemTextPos WRITE setItemTextPos ) - Q_PROPERTY( TQBrush itemTextBackground READ itemTextBackground WRITE setItemTextBackground ) - Q_PROPERTY( Arrangement arrangement READ arrangement WRITE setArrangement ) - Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode ) - Q_PROPERTY( int maxItemWidth READ maxItemWidth WRITE setMaxItemWidth ) - Q_PROPERTY( int maxItemTextLength READ maxItemTextLength WRITE setMaxItemTextLength ) - Q_PROPERTY( bool autoArrange READ autoArrange WRITE setAutoArrange ) - Q_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable ) - Q_PROPERTY( bool wordWrapIconText READ wordWrapIconText WRITE setWordWrapIconText ) - Q_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips ) - Q_PROPERTY( uint count READ count ) + TQ_ENUMS( SelectionMode ItemTextPos Arrangement ResizeMode ) + TQ_PROPERTY( bool sorting READ sorting ) + TQ_PROPERTY( bool sortDirection READ sortDirection ) + TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode ) + TQ_PROPERTY( int gridX READ gridX WRITE setGridX ) + TQ_PROPERTY( int gridY READ gridY WRITE setGridY ) + TQ_PROPERTY( int spacing READ spacing WRITE setSpacing ) + TQ_PROPERTY( ItemTextPos itemTextPos READ itemTextPos WRITE setItemTextPos ) + TQ_PROPERTY( TQBrush itemTextBackground READ itemTextBackground WRITE setItemTextBackground ) + TQ_PROPERTY( Arrangement arrangement READ arrangement WRITE setArrangement ) + TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode ) + TQ_PROPERTY( int maxItemWidth READ maxItemWidth WRITE setMaxItemWidth ) + TQ_PROPERTY( int maxItemTextLength READ maxItemTextLength WRITE setMaxItemTextLength ) + TQ_PROPERTY( bool autoArrange READ autoArrange WRITE setAutoArrange ) + TQ_PROPERTY( bool itemsMovable READ itemsMovable WRITE setItemsMovable ) + TQ_PROPERTY( bool wordWrapIconText READ wordWrapIconText WRITE setWordWrapIconText ) + TQ_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips ) + TQ_PROPERTY( uint count READ count ) public: enum SelectionMode { diff --git a/src/kernel/ntqlayout.h b/src/kernel/ntqlayout.h index 2405a7f1..ce170abc 100644 --- a/src/kernel/ntqlayout.h +++ b/src/kernel/ntqlayout.h @@ -179,10 +179,10 @@ private: class Q_EXPORT TQLayout : public TQObject, public TQLayoutItem { TQ_OBJECT - Q_ENUMS( ResizeMode ) - Q_PROPERTY( int margin READ margin WRITE setMargin ) - Q_PROPERTY( int spacing READ spacing WRITE setSpacing ) - Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode ) + TQ_ENUMS( ResizeMode ) + TQ_PROPERTY( int margin READ margin WRITE setMargin ) + TQ_PROPERTY( int spacing READ spacing WRITE setSpacing ) + TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode ) public: // ### TQt 4.0: put 'Auto' first in enum diff --git a/src/kernel/ntqobject.h b/src/kernel/ntqobject.h index dc4ef21a..5b64e2d0 100644 --- a/src/kernel/ntqobject.h +++ b/src/kernel/ntqobject.h @@ -66,7 +66,7 @@ struct TQUObject; class Q_EXPORT TQObject: public TQt { TQ_OBJECT - Q_PROPERTY( TQCString name READ name WRITE setName ) + TQ_PROPERTY( TQCString name READ name WRITE setName ) public: TQObject( TQObject *parent=0, const char *name=0 ); diff --git a/src/kernel/ntqobjectdefs.h b/src/kernel/ntqobjectdefs.h index 4d4e794f..11401308 100644 --- a/src/kernel/ntqobjectdefs.h +++ b/src/kernel/ntqobjectdefs.h @@ -77,11 +77,11 @@ struct TQUObject; #ifdef QT_MOC_CPP #define slots slots #define signals signals -#define Q_CLASSINFO( name, value ) Q_CLASSINFO( name, value ) -#define Q_PROPERTY( text ) Q_PROPERTY( text ) -#define Q_OVERRIDE( text ) Q_OVERRIDE( text ) -#define Q_ENUMS( x ) Q_ENUMS( x ) -#define Q_SETS( x ) Q_SETS( x ) +#define TQ_CLASSINFO( name, value ) TQ_CLASSINFO( name, value ) +#define TQ_PROPERTY( text ) TQ_PROPERTY( text ) +#define TQ_OVERRIDE( text ) TQ_OVERRIDE( text ) +#define TQ_ENUMS( x ) TQ_ENUMS( x ) +#define TQ_SETS( x ) TQ_SETS( x ) /* tmake ignore TQ_OBJECT */ #define TQ_OBJECT TQ_OBJECT /* tmake ignore TQ_OBJECT */ @@ -93,11 +93,11 @@ struct TQUObject; #ifndef QT_NO_EMIT #define emit // emit signal #endif -#define Q_CLASSINFO( name, value ) // class info -#define Q_PROPERTY( text ) // property -#define Q_OVERRIDE( text ) // override property -#define Q_ENUMS( x ) -#define Q_SETS( x ) +#define TQ_CLASSINFO( name, value ) // class info +#define TQ_PROPERTY( text ) // property +#define TQ_OVERRIDE( text ) // override property +#define TQ_ENUMS( x ) +#define TQ_SETS( x ) /* tmake ignore TQ_OBJECT */ #define TQ_OBJECT \ diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h index c4a288d4..d7c8cb58 100644 --- a/src/kernel/ntqwidget.h +++ b/src/kernel/ntqwidget.h @@ -67,76 +67,76 @@ class TQStyle; class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice { TQ_OBJECT - Q_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin ) - Q_PROPERTY( bool isTopLevel READ isTopLevel ) - Q_PROPERTY( bool isDialog READ isDialog ) - Q_PROPERTY( bool isModal READ isModal ) - Q_PROPERTY( bool isPopup READ isPopup ) - Q_PROPERTY( bool isDesktop READ isDesktop ) - Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled ) - Q_PROPERTY( TQRect geometry READ geometry WRITE setGeometry ) - Q_PROPERTY( TQRect frameGeometry READ frameGeometry ) - Q_PROPERTY( int x READ x ) - Q_PROPERTY( int y READ y ) - Q_PROPERTY( TQPoint pos READ pos WRITE move DESIGNABLE false STORED false ) - Q_PROPERTY( TQSize frameSize READ frameSize ) - Q_PROPERTY( TQSize size READ size WRITE resize DESIGNABLE false STORED false ) - Q_PROPERTY( int width READ width ) - Q_PROPERTY( int height READ height ) - Q_PROPERTY( TQRect rect READ rect ) - Q_PROPERTY( TQRect childrenRect READ childrenRect ) - Q_PROPERTY( TQRegion childrenRegion READ childrenRegion ) - Q_PROPERTY( TQSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy ) - Q_PROPERTY( TQSize minimumSize READ minimumSize WRITE setMinimumSize ) - Q_PROPERTY( TQSize maximumSize READ maximumSize WRITE setMaximumSize ) - Q_PROPERTY( int minimumWidth READ minimumWidth WRITE setMinimumWidth STORED false DESIGNABLE false ) - Q_PROPERTY( int minimumHeight READ minimumHeight WRITE setMinimumHeight STORED false DESIGNABLE false ) - Q_PROPERTY( int maximumWidth READ maximumWidth WRITE setMaximumWidth STORED false DESIGNABLE false ) - Q_PROPERTY( int maximumHeight READ maximumHeight WRITE setMaximumHeight STORED false DESIGNABLE false ) - Q_PROPERTY( TQSize sizeIncrement READ sizeIncrement WRITE setSizeIncrement ) - Q_PROPERTY( TQSize baseSize READ baseSize WRITE setBaseSize ) - Q_PROPERTY( BackgroundMode backgroundMode READ backgroundMode WRITE setBackgroundMode DESIGNABLE false ) - Q_PROPERTY( TQColor paletteForegroundColor READ paletteForegroundColor WRITE setPaletteForegroundColor RESET unsetPalette ) - Q_PROPERTY( TQColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor RESET unsetPalette ) - Q_PROPERTY( TQPixmap paletteBackgroundPixmap READ paletteBackgroundPixmap WRITE setPaletteBackgroundPixmap RESET unsetPalette ) - Q_PROPERTY( TQBrush backgroundBrush READ backgroundBrush ) - Q_PROPERTY( TQColorGroup colorGroup READ colorGroup ) - Q_PROPERTY( TQPalette palette READ palette WRITE setPalette RESET unsetPalette STORED ownPalette ) - Q_PROPERTY( BackgroundOrigin backgroundOrigin READ backgroundOrigin WRITE setBackgroundOrigin ) - Q_PROPERTY( bool ownPalette READ ownPalette ) - Q_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont ) - Q_PROPERTY( bool ownFont READ ownFont ) + TQ_ENUMS( BackgroundMode FocusPolicy BackgroundOrigin ) + TQ_PROPERTY( bool isTopLevel READ isTopLevel ) + TQ_PROPERTY( bool isDialog READ isDialog ) + TQ_PROPERTY( bool isModal READ isModal ) + TQ_PROPERTY( bool isPopup READ isPopup ) + TQ_PROPERTY( bool isDesktop READ isDesktop ) + TQ_PROPERTY( bool enabled READ isEnabled WRITE setEnabled ) + TQ_PROPERTY( TQRect geometry READ geometry WRITE setGeometry ) + TQ_PROPERTY( TQRect frameGeometry READ frameGeometry ) + TQ_PROPERTY( int x READ x ) + TQ_PROPERTY( int y READ y ) + TQ_PROPERTY( TQPoint pos READ pos WRITE move DESIGNABLE false STORED false ) + TQ_PROPERTY( TQSize frameSize READ frameSize ) + TQ_PROPERTY( TQSize size READ size WRITE resize DESIGNABLE false STORED false ) + TQ_PROPERTY( int width READ width ) + TQ_PROPERTY( int height READ height ) + TQ_PROPERTY( TQRect rect READ rect ) + TQ_PROPERTY( TQRect childrenRect READ childrenRect ) + TQ_PROPERTY( TQRegion childrenRegion READ childrenRegion ) + TQ_PROPERTY( TQSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy ) + TQ_PROPERTY( TQSize minimumSize READ minimumSize WRITE setMinimumSize ) + TQ_PROPERTY( TQSize maximumSize READ maximumSize WRITE setMaximumSize ) + TQ_PROPERTY( int minimumWidth READ minimumWidth WRITE setMinimumWidth STORED false DESIGNABLE false ) + TQ_PROPERTY( int minimumHeight READ minimumHeight WRITE setMinimumHeight STORED false DESIGNABLE false ) + TQ_PROPERTY( int maximumWidth READ maximumWidth WRITE setMaximumWidth STORED false DESIGNABLE false ) + TQ_PROPERTY( int maximumHeight READ maximumHeight WRITE setMaximumHeight STORED false DESIGNABLE false ) + TQ_PROPERTY( TQSize sizeIncrement READ sizeIncrement WRITE setSizeIncrement ) + TQ_PROPERTY( TQSize baseSize READ baseSize WRITE setBaseSize ) + TQ_PROPERTY( BackgroundMode backgroundMode READ backgroundMode WRITE setBackgroundMode DESIGNABLE false ) + TQ_PROPERTY( TQColor paletteForegroundColor READ paletteForegroundColor WRITE setPaletteForegroundColor RESET unsetPalette ) + TQ_PROPERTY( TQColor paletteBackgroundColor READ paletteBackgroundColor WRITE setPaletteBackgroundColor RESET unsetPalette ) + TQ_PROPERTY( TQPixmap paletteBackgroundPixmap READ paletteBackgroundPixmap WRITE setPaletteBackgroundPixmap RESET unsetPalette ) + TQ_PROPERTY( TQBrush backgroundBrush READ backgroundBrush ) + TQ_PROPERTY( TQColorGroup colorGroup READ colorGroup ) + TQ_PROPERTY( TQPalette palette READ palette WRITE setPalette RESET unsetPalette STORED ownPalette ) + TQ_PROPERTY( BackgroundOrigin backgroundOrigin READ backgroundOrigin WRITE setBackgroundOrigin ) + TQ_PROPERTY( bool ownPalette READ ownPalette ) + TQ_PROPERTY( TQFont font READ font WRITE setFont RESET unsetFont STORED ownFont ) + TQ_PROPERTY( bool ownFont READ ownFont ) #ifndef QT_NO_CURSOR - Q_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor ) - Q_PROPERTY( bool ownCursor READ ownCursor ) + TQ_PROPERTY( TQCursor cursor READ cursor WRITE setCursor RESET unsetCursor STORED ownCursor ) + TQ_PROPERTY( bool ownCursor READ ownCursor ) #endif #ifndef QT_NO_WIDGET_TOPEXTRA - Q_PROPERTY( TQString caption READ caption WRITE setCaption ) - Q_PROPERTY( TQPixmap icon READ icon WRITE setIcon ) - Q_PROPERTY( TQString iconText READ iconText WRITE setIconText ) + TQ_PROPERTY( TQString caption READ caption WRITE setCaption ) + TQ_PROPERTY( TQPixmap icon READ icon WRITE setIcon ) + TQ_PROPERTY( TQString iconText READ iconText WRITE setIconText ) #endif - Q_PROPERTY( bool mouseTracking READ hasMouseTracking WRITE setMouseTracking ) - Q_PROPERTY( bool underMouse READ hasMouse ) - Q_PROPERTY( bool isActiveWindow READ isActiveWindow ) - Q_PROPERTY( bool focusEnabled READ isFocusEnabled ) - Q_PROPERTY( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy ) - Q_PROPERTY( bool focus READ hasFocus ) - Q_PROPERTY( bool updatesEnabled READ isUpdatesEnabled WRITE setUpdatesEnabled DESIGNABLE false ) - Q_PROPERTY( bool visible READ isVisible ) - Q_PROPERTY( TQRect visibleRect READ visibleRect ) // obsolete - Q_PROPERTY( bool hidden READ isHidden WRITE setHidden DESIGNABLE false SCRIPTABLE false ) - Q_PROPERTY( bool shown READ isShown WRITE setShown DESIGNABLE false SCRIPTABLE false ) - Q_PROPERTY( bool minimized READ isMinimized ) - Q_PROPERTY( bool maximized READ isMaximized ) - Q_PROPERTY( bool fullScreen READ isFullScreen ) - Q_PROPERTY( TQSize sizeHint READ sizeHint ) - Q_PROPERTY( TQSize minimumSizeHint READ minimumSizeHint ) - Q_PROPERTY( TQRect microFocusHint READ microFocusHint ) - Q_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops ) - Q_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false ) - Q_PROPERTY( bool customWhatsThis READ customWhatsThis ) - Q_PROPERTY( bool inputMethodEnabled READ isInputMethodEnabled WRITE setInputMethodEnabled DESIGNABLE false SCRIPTABLE false ) - Q_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false ) + TQ_PROPERTY( bool mouseTracking READ hasMouseTracking WRITE setMouseTracking ) + TQ_PROPERTY( bool underMouse READ hasMouse ) + TQ_PROPERTY( bool isActiveWindow READ isActiveWindow ) + TQ_PROPERTY( bool focusEnabled READ isFocusEnabled ) + TQ_PROPERTY( FocusPolicy focusPolicy READ focusPolicy WRITE setFocusPolicy ) + TQ_PROPERTY( bool focus READ hasFocus ) + TQ_PROPERTY( bool updatesEnabled READ isUpdatesEnabled WRITE setUpdatesEnabled DESIGNABLE false ) + TQ_PROPERTY( bool visible READ isVisible ) + TQ_PROPERTY( TQRect visibleRect READ visibleRect ) // obsolete + TQ_PROPERTY( bool hidden READ isHidden WRITE setHidden DESIGNABLE false SCRIPTABLE false ) + TQ_PROPERTY( bool shown READ isShown WRITE setShown DESIGNABLE false SCRIPTABLE false ) + TQ_PROPERTY( bool minimized READ isMinimized ) + TQ_PROPERTY( bool maximized READ isMaximized ) + TQ_PROPERTY( bool fullScreen READ isFullScreen ) + TQ_PROPERTY( TQSize sizeHint READ sizeHint ) + TQ_PROPERTY( TQSize minimumSizeHint READ minimumSizeHint ) + TQ_PROPERTY( TQRect microFocusHint READ microFocusHint ) + TQ_PROPERTY( bool acceptDrops READ acceptDrops WRITE setAcceptDrops ) + TQ_PROPERTY( bool autoMask READ autoMask WRITE setAutoMask DESIGNABLE false SCRIPTABLE false ) + TQ_PROPERTY( bool customWhatsThis READ customWhatsThis ) + TQ_PROPERTY( bool inputMethodEnabled READ isInputMethodEnabled WRITE setInputMethodEnabled DESIGNABLE false SCRIPTABLE false ) + TQ_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false ) public: Q_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0, NFlags n=0 ); diff --git a/src/moc/moc.l b/src/moc/moc.l index a917b03e..868f9c0a 100644 --- a/src/moc/moc.l +++ b/src/moc/moc.l @@ -127,11 +127,11 @@ STRING {ALMOSTSTRING}\" <QT_DEF>"TQ_OBJECT" { X; return TQ_OBJECT; } <QT_DEF>"signals" { X; return SIGNALS; } <QT_DEF>"slots" { X; return SLOTS; } -<QT_DEF>"Q_CLASSINFO" { X; return Q_CLASSINFO; } -<QT_DEF>"Q_PROPERTY" { X; return Q_PROPERTY; } -<QT_DEF>"Q_OVERRIDE" { X; return Q_OVERRIDE; } -<QT_DEF>"Q_ENUMS" { X; return Q_ENUMS; } -<QT_DEF>"Q_SETS" { X; return Q_SETS; } +<QT_DEF>"TQ_CLASSINFO" { X; return TQ_CLASSINFO; } +<QT_DEF>"TQ_PROPERTY" { X; return TQ_PROPERTY; } +<QT_DEF>"TQ_OVERRIDE" { X; return TQ_OVERRIDE; } +<QT_DEF>"TQ_ENUMS" { X; return TQ_ENUMS; } +<QT_DEF>"TQ_SETS" { X; return TQ_SETS; } <IN_FCT>"{" { fctLevel++;Y; } <IN_FCT>"}" { fctLevel--;Y;if (fctLevel==0){X;return '}';}} @@ -143,17 +143,17 @@ STRING {ALMOSTSTRING}\" <IN_CLASS>"private" { X;if( classPLevel == 1 ) return PRIVATE; } <IN_CLASS>"signals" { X;if( classPLevel == 1 ) return SIGNALS; } <IN_CLASS>"slots" { X;if( classPLevel == 1 ) return SLOTS; } -<IN_CLASS>"Q_CLASSINFO" { X;if( classPLevel == 1 ) return Q_CLASSINFO; } +<IN_CLASS>"TQ_CLASSINFO" { X;if( classPLevel == 1 ) return TQ_CLASSINFO; } <IN_CLASS>"TQ_OBJECT" { X; if ( classPLevel == 1 ) return TQ_OBJECT; else if ( classPLevel > 1 ) moc_warn( "Cannot use TQ_OBJECT in nested class." ); } -<IN_CLASS>"Q_PROPERTY" { X;if( classPLevel == 1 ) return Q_PROPERTY; } -<IN_CLASS>"Q_OVERRIDE" { X;if( classPLevel == 1 ) return Q_OVERRIDE; } -<IN_CLASS>"Q_ENUMS" { X;if( classPLevel == 1 ) return Q_ENUMS; } -<IN_CLASS>"Q_SETS" { X;if( classPLevel == 1 ) return Q_SETS; } +<IN_CLASS>"TQ_PROPERTY" { X;if( classPLevel == 1 ) return TQ_PROPERTY; } +<IN_CLASS>"TQ_OVERRIDE" { X;if( classPLevel == 1 ) return TQ_OVERRIDE; } +<IN_CLASS>"TQ_ENUMS" { X;if( classPLevel == 1 ) return TQ_ENUMS; } +<IN_CLASS>"TQ_SETS" { X;if( classPLevel == 1 ) return TQ_SETS; } <IN_NAMESPACE>"{" { namespacePLevel++;Y; } <IN_NAMESPACE>"}" { namespacePLevel--;Y;if (namespacePLevel == 0) diff --git a/src/moc/moc.y b/src/moc/moc.y index afbf3988..2826274c 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -466,7 +466,7 @@ struct Property designable( d ), scriptable( sc ), override( ov ), oredEnum( -1 ) { /* - The Q_PROPERTY construct cannot contain any commas, since + The TQ_PROPERTY construct cannot contain any commas, since commas separate macro arguments. We therefore expect users to type "TQMap" instead of "TQMap<TQString, TQVariant>". For coherence, we also expect the same for @@ -581,7 +581,7 @@ class parser_reg { PropList props; // list of all properties ClassInfoList infos; // list of all class infos -// Used to store the values in the Q_PROPERTY macro +// Used to store the values in the TQ_PROPERTY macro TQCString propWrite; // set function TQCString propRead; // get function TQCString propReset; // reset function @@ -590,8 +590,8 @@ class parser_reg { TQCString propScriptable; // "true", "false" or function or empty if not specified bool propOverride; // Wether OVERRIDE was detected - TQStrList qtEnums; // Used to store the contents of Q_ENUMS - TQStrList qtSets; // Used to store the contents of Q_SETS + TQStrList qtEnums; // Used to store the contents of TQ_ENUMS + TQStrList qtSets; // Used to store the contents of TQ_SETS }; @@ -637,9 +637,9 @@ Access subClassPerm; // current access permission bool TQ_OBJECTdetected; // TRUE if current class // contains the TQ_OBJECT macro -bool Q_PROPERTYdetected; // TRUE if current class - // contains at least one Q_PROPERTY, - // Q_OVERRIDE, Q_SETS or Q_ENUMS macro +bool TQ_PROPERTYdetected; // TRUE if current class + // contains at least one TQ_PROPERTY, + // TQ_OVERRIDE, TQ_SETS or TQ_ENUMS macro bool tmpPropOverride; // current property override setting int tmpYYStart; // Used to store the lexers current mode @@ -747,11 +747,11 @@ extern "C" int hack_isatty( int ) %token SIGNALS %token SLOTS %token TQ_OBJECT -%token Q_PROPERTY -%token Q_OVERRIDE -%token Q_CLASSINFO -%token Q_ENUMS -%token Q_SETS +%token TQ_PROPERTY +%token TQ_OVERRIDE +%token TQ_CLASSINFO +%token TQ_ENUMS +%token TQ_SETS %token READ %token WRITE @@ -1252,36 +1252,36 @@ obj_member_area: qt_access_specifier { BEGIN QT_DEF; } " access permission to \"private\"."); TQ_OBJECTdetected = TRUE; } - | Q_PROPERTY { tmpYYStart = YY_START; + | TQ_PROPERTY { tmpYYStart = YY_START; tmpPropOverride = FALSE; BEGIN IN_PROPERTY; } '(' property ')' { BEGIN tmpYYStart; } opt_property_candidates - | Q_OVERRIDE { tmpYYStart = YY_START; + | TQ_OVERRIDE { tmpYYStart = YY_START; tmpPropOverride = TRUE; BEGIN IN_PROPERTY; } '(' property ')' { BEGIN tmpYYStart; } opt_property_candidates - | Q_CLASSINFO { tmpYYStart = YY_START; BEGIN IN_CLASSINFO; } + | TQ_CLASSINFO { tmpYYStart = YY_START; BEGIN IN_CLASSINFO; } '(' STRING ',' STRING ')' { g->infos.append( new ClassInfo( $4, $6 ) ); BEGIN tmpYYStart; } opt_property_candidates - | Q_ENUMS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } + | TQ_ENUMS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } '(' qt_enums ')' { - Q_PROPERTYdetected = TRUE; + TQ_PROPERTYdetected = TRUE; BEGIN tmpYYStart; } opt_property_candidates - | Q_SETS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } + | TQ_SETS { tmpYYStart = YY_START; BEGIN IN_PROPERTY; } '(' qt_sets ')' { - Q_PROPERTYdetected = TRUE; + TQ_PROPERTYdetected = TRUE; BEGIN tmpYYStart; } opt_property_candidates @@ -1290,7 +1290,7 @@ obj_member_area: qt_access_specifier { BEGIN QT_DEF; } slot_area: SIGNALS ':' { moc_err( "Signals cannot " "have access specifiers" ); } | SLOTS ':' opt_slot_declarations - | ':' { if ( tmpAccess == Public && Q_PROPERTYdetected ) + | ':' { if ( tmpAccess == Public && TQ_PROPERTYdetected ) BEGIN QT_DEF; else BEGIN IN_CLASS; @@ -1572,7 +1572,7 @@ property: IDENTIFIER IDENTIFIER if ( g->propRead.isEmpty() && !g->propOverride ) moc_err( "A property must at least feature a read method." ); checkPropertyName( $2 ); - Q_PROPERTYdetected = TRUE; + TQ_PROPERTYdetected = TRUE; // Avoid duplicates for( TQPtrListIterator<Property> lit( g->props ); lit.current(); ++lit ) { if ( lit.current()->name == $2 ) { @@ -2019,7 +2019,7 @@ void initClass() // prepare for new class tmpAccess = Private; subClassPerm = Private; TQ_OBJECTdetected = FALSE; - Q_PROPERTYdetected = FALSE; + TQ_PROPERTYdetected = FALSE; skipClass = FALSE; templateClass = FALSE; g->slots.clear(); @@ -2555,7 +2555,7 @@ int generateProps() if ( p->getfunc == 0 ) { if ( displayWarnings ) { - // Is the type a set, that means, mentioned in Q_SETS? + // Is the type a set, that means, mentioned in TQ_SETS? bool set = FALSE; for( TQPtrListIterator<Enum> lit( g->enums ); lit.current(); ++lit ) if ( lit.current()->name == p->type && lit.current()->set ) @@ -2671,7 +2671,7 @@ int generateProps() if ( p->setfunc == 0 ) { if ( displayWarnings ) { - // Is the type a set, that means, mentioned in Q_SETS ? + // Is the type a set, that means, mentioned in TQ_SETS ? bool set = FALSE; for( TQPtrListIterator<Enum> lit( g->enums ); lit.current(); ++lit ) if ( lit.current()->name == p->type && lit.current()->set ) @@ -3544,7 +3544,7 @@ void addEnum() } } - // Only look at types mentioned in Q_ENUMS and Q_SETS + // Only look at types mentioned in TQ_ENUMS and TQ_SETS if ( g->qtEnums.contains( tmpEnum->name ) || g->qtSets.contains( tmpEnum->name ) ) { g->enums.append( tmpEnum ); diff --git a/src/moc/moc_lex.cpp b/src/moc/moc_lex.cpp index 149489d0..5b76dd4f 100644 --- a/src/moc/moc_lex.cpp +++ b/src/moc/moc_lex.cpp @@ -1388,27 +1388,27 @@ YY_RULE_SETUP case 8: YY_RULE_SETUP #line 130 "moc.l" -{ X; return Q_CLASSINFO; } +{ X; return TQ_CLASSINFO; } YY_BREAK case 9: YY_RULE_SETUP #line 131 "moc.l" -{ X; return Q_PROPERTY; } +{ X; return TQ_PROPERTY; } YY_BREAK case 10: YY_RULE_SETUP #line 132 "moc.l" -{ X; return Q_OVERRIDE; } +{ X; return TQ_OVERRIDE; } YY_BREAK case 11: YY_RULE_SETUP #line 133 "moc.l" -{ X; return Q_ENUMS; } +{ X; return TQ_ENUMS; } YY_BREAK case 12: YY_RULE_SETUP #line 134 "moc.l" -{ X; return Q_SETS; } +{ X; return TQ_SETS; } YY_BREAK case 13: YY_RULE_SETUP @@ -1459,7 +1459,7 @@ YY_RULE_SETUP case 22: YY_RULE_SETUP #line 146 "moc.l" -{ X;if( classPLevel == 1 ) return Q_CLASSINFO; } +{ X;if( classPLevel == 1 ) return TQ_CLASSINFO; } YY_BREAK case 23: YY_RULE_SETUP @@ -1474,22 +1474,22 @@ YY_RULE_SETUP case 24: YY_RULE_SETUP #line 153 "moc.l" -{ X;if( classPLevel == 1 ) return Q_PROPERTY; } +{ X;if( classPLevel == 1 ) return TQ_PROPERTY; } YY_BREAK case 25: YY_RULE_SETUP #line 154 "moc.l" -{ X;if( classPLevel == 1 ) return Q_OVERRIDE; } +{ X;if( classPLevel == 1 ) return TQ_OVERRIDE; } YY_BREAK case 26: YY_RULE_SETUP #line 155 "moc.l" -{ X;if( classPLevel == 1 ) return Q_ENUMS; } +{ X;if( classPLevel == 1 ) return TQ_ENUMS; } YY_BREAK case 27: YY_RULE_SETUP #line 156 "moc.l" -{ X;if( classPLevel == 1 ) return Q_SETS; } +{ X;if( classPLevel == 1 ) return TQ_SETS; } YY_BREAK case 28: YY_RULE_SETUP diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index 46a5cfe2..57ee1e86 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -481,7 +481,7 @@ struct Property designable( d ), scriptable( sc ), override( ov ), oredEnum( -1 ) { /* - The Q_PROPERTY construct cannot contain any commas, since + The TQ_PROPERTY construct cannot contain any commas, since commas separate macro arguments. We therefore expect users to type "TQMap" instead of "TQMap<TQString, TQVariant>". For coherence, we also expect the same for @@ -596,7 +596,7 @@ class parser_reg { PropList props; // list of all properties ClassInfoList infos; // list of all class infos -// Used to store the values in the Q_PROPERTY macro +// Used to store the values in the TQ_PROPERTY macro TQCString propWrite; // set function TQCString propRead; // get function TQCString propReset; // reset function @@ -605,8 +605,8 @@ class parser_reg { TQCString propScriptable; // "true", "false" or function or empty if not specified bool propOverride; // Wether OVERRIDE was detected - TQStrList qtEnums; // Used to store the contents of Q_ENUMS - TQStrList qtSets; // Used to store the contents of Q_SETS + TQStrList qtEnums; // Used to store the contents of TQ_ENUMS + TQStrList qtSets; // Used to store the contents of TQ_SETS }; @@ -652,9 +652,9 @@ Access subClassPerm; // current access permission bool TQ_OBJECTdetected; // TRUE if current class // contains the TQ_OBJECT macro -bool Q_PROPERTYdetected; // TRUE if current class - // contains at least one Q_PROPERTY, - // Q_OVERRIDE, Q_SETS or Q_ENUMS macro +bool TQ_PROPERTYdetected; // TRUE if current class + // contains at least one TQ_PROPERTY, + // TQ_OVERRIDE, TQ_SETS or TQ_ENUMS macro bool tmpPropOverride; // current property override setting int tmpYYStart; // Used to store the lexers current mode @@ -772,11 +772,11 @@ extern "C" int hack_isatty( int ) SIGNALS = 298, SLOTS = 299, TQ_OBJECT = 300, - Q_PROPERTY = 301, - Q_OVERRIDE = 302, - Q_CLASSINFO = 303, - Q_ENUMS = 304, - Q_SETS = 305, + TQ_PROPERTY = 301, + TQ_OVERRIDE = 302, + TQ_CLASSINFO = 303, + TQ_ENUMS = 304, + TQ_SETS = 305, READ = 306, WRITE = 307, STORED = 308, @@ -829,11 +829,11 @@ extern "C" int hack_isatty( int ) #define SIGNALS 298 #define SLOTS 299 #define TQ_OBJECT 300 -#define Q_PROPERTY 301 -#define Q_OVERRIDE 302 -#define Q_CLASSINFO 303 -#define Q_ENUMS 304 -#define Q_SETS 305 +#define TQ_PROPERTY 301 +#define TQ_OVERRIDE 302 +#define TQ_CLASSINFO 303 +#define TQ_ENUMS 304 +#define TQ_SETS 305 #define READ 306 #define WRITE 307 #define STORED 308 @@ -1334,7 +1334,7 @@ static const char *const yytname[] = "ENUM", "CLASS", "STRUCT", "UNION", "ASM", "PRIVATE", "PROTECTED", "PUBLIC", "OPERATOR", "DBL_COLON", "TRIPLE_DOT", "TEMPLATE", "NAMESPACE", "USING", "MUTABLE", "THROW", "SIGNALS", "SLOTS", "TQ_OBJECT", - "Q_PROPERTY", "Q_OVERRIDE", "Q_CLASSINFO", "Q_ENUMS", "Q_SETS", "READ", + "TQ_PROPERTY", "TQ_OVERRIDE", "TQ_CLASSINFO", "TQ_ENUMS", "TQ_SETS", "READ", "WRITE", "STORED", "DESIGNABLE", "SCRIPTABLE", "RESET", "'{'", "'}'", "'='", "';'", "'<'", "'>'", "','", "'['", "']'", "'('", "')'", "'*'", "'&'", "':'", "'+'", "'-'", "'/'", "'%'", "'^'", "'|'", "'~'", "'!'", @@ -3639,7 +3639,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 1277 "moc.y" { - Q_PROPERTYdetected = TRUE; + TQ_PROPERTYdetected = TRUE; BEGIN tmpYYStart; } break; @@ -3656,7 +3656,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 1283 "moc.y" { - Q_PROPERTYdetected = TRUE; + TQ_PROPERTYdetected = TRUE; BEGIN tmpYYStart; } break; @@ -3673,7 +3673,7 @@ yyreduce: /* Line 1455 of yacc.c */ #line 1293 "moc.y" - { if ( tmpAccess == Public && Q_PROPERTYdetected ) + { if ( tmpAccess == Public && TQ_PROPERTYdetected ) BEGIN QT_DEF; else BEGIN IN_CLASS; @@ -4129,7 +4129,7 @@ yyreduce: if ( g->propRead.isEmpty() && !g->propOverride ) moc_err( "A property must at least feature a read method." ); checkPropertyName( (yyvsp[(2) - (4)].string) ); - Q_PROPERTYdetected = TRUE; + TQ_PROPERTYdetected = TRUE; // Avoid duplicates for( TQPtrListIterator<Property> lit( g->props ); lit.current(); ++lit ) { if ( lit.current()->name == (yyvsp[(2) - (4)].string) ) { @@ -4845,7 +4845,7 @@ void initClass() // prepare for new class tmpAccess = Private; subClassPerm = Private; TQ_OBJECTdetected = FALSE; - Q_PROPERTYdetected = FALSE; + TQ_PROPERTYdetected = FALSE; skipClass = FALSE; templateClass = FALSE; g->slots.clear(); @@ -5381,7 +5381,7 @@ int generateProps() if ( p->getfunc == 0 ) { if ( displayWarnings ) { - // Is the type a set, that means, mentioned in Q_SETS? + // Is the type a set, that means, mentioned in TQ_SETS? bool set = FALSE; for( TQPtrListIterator<Enum> lit( g->enums ); lit.current(); ++lit ) if ( lit.current()->name == p->type && lit.current()->set ) @@ -5497,7 +5497,7 @@ int generateProps() if ( p->setfunc == 0 ) { if ( displayWarnings ) { - // Is the type a set, that means, mentioned in Q_SETS ? + // Is the type a set, that means, mentioned in TQ_SETS ? bool set = FALSE; for( TQPtrListIterator<Enum> lit( g->enums ); lit.current(); ++lit ) if ( lit.current()->name == p->type && lit.current()->set ) @@ -6370,7 +6370,7 @@ void addEnum() } } - // Only look at types mentioned in Q_ENUMS and Q_SETS + // Only look at types mentioned in TQ_ENUMS and TQ_SETS if ( g->qtEnums.contains( tmpEnum->name ) || g->qtSets.contains( tmpEnum->name ) ) { g->enums.append( tmpEnum ); diff --git a/src/moc/moc_yacc.h b/src/moc/moc_yacc.h index 84ef25bc..3b3a7c15 100644 --- a/src/moc/moc_yacc.h +++ b/src/moc/moc_yacc.h @@ -82,11 +82,11 @@ SIGNALS = 298, SLOTS = 299, TQ_OBJECT = 300, - Q_PROPERTY = 301, - Q_OVERRIDE = 302, - Q_CLASSINFO = 303, - Q_ENUMS = 304, - Q_SETS = 305, + TQ_PROPERTY = 301, + TQ_OVERRIDE = 302, + TQ_CLASSINFO = 303, + TQ_ENUMS = 304, + TQ_SETS = 305, READ = 306, WRITE = 307, STORED = 308, @@ -139,11 +139,11 @@ #define SIGNALS 298 #define SLOTS 299 #define TQ_OBJECT 300 -#define Q_PROPERTY 301 -#define Q_OVERRIDE 302 -#define Q_CLASSINFO 303 -#define Q_ENUMS 304 -#define Q_SETS 305 +#define TQ_PROPERTY 301 +#define TQ_OVERRIDE 302 +#define TQ_CLASSINFO 303 +#define TQ_ENUMS 304 +#define TQ_SETS 305 #define READ 306 #define WRITE 307 #define STORED 308 diff --git a/src/sql/ntqdatabrowser.h b/src/sql/ntqdatabrowser.h index 938b9320..54a1d9e8 100644 --- a/src/sql/ntqdatabrowser.h +++ b/src/sql/ntqdatabrowser.h @@ -59,16 +59,16 @@ class TQDataBrowserPrivate; class Q_EXPORT TQDataBrowser : public TQWidget { TQ_OBJECT - Q_PROPERTY( bool boundaryChecking READ boundaryChecking WRITE setBoundaryChecking ) - Q_PROPERTY( TQString filter READ filter WRITE setFilter ) - Q_PROPERTY( TQStringList sort READ sort WRITE setSort ) - Q_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits ) - Q_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert ) - Q_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate ) - Q_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete ) - Q_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels ) - Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) - Q_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit ) + TQ_PROPERTY( bool boundaryChecking READ boundaryChecking WRITE setBoundaryChecking ) + TQ_PROPERTY( TQString filter READ filter WRITE setFilter ) + TQ_PROPERTY( TQStringList sort READ sort WRITE setSort ) + TQ_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits ) + TQ_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert ) + TQ_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate ) + TQ_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete ) + TQ_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels ) + TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) + TQ_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit ) public: TQDataBrowser( TQWidget* parent=0, const char* name=0, WFlags fl = 0 ); diff --git a/src/sql/ntqdatatable.h b/src/sql/ntqdatatable.h index e92f8b6c..489661c8 100644 --- a/src/sql/ntqdatatable.h +++ b/src/sql/ntqdatatable.h @@ -69,20 +69,20 @@ class TQM_EXPORT_SQL TQDataTable : public TQTable { TQ_OBJECT - Q_PROPERTY( TQString nullText READ nullText WRITE setNullText ) - Q_PROPERTY( TQString trueText READ trueText WRITE setTrueText ) - Q_PROPERTY( TQString falseText READ falseText WRITE setFalseText ) - Q_PROPERTY( DateFormat dateFormat READ dateFormat WRITE setDateFormat ) - Q_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits ) - Q_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert ) - Q_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate ) - Q_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete ) - Q_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels ) - Q_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit ) - Q_PROPERTY( TQString filter READ filter WRITE setFilter ) - Q_PROPERTY( TQStringList sort READ sort WRITE setSort ) - Q_PROPERTY( int numCols READ numCols ) - Q_PROPERTY( int numRows READ numRows ) + TQ_PROPERTY( TQString nullText READ nullText WRITE setNullText ) + TQ_PROPERTY( TQString trueText READ trueText WRITE setTrueText ) + TQ_PROPERTY( TQString falseText READ falseText WRITE setFalseText ) + TQ_PROPERTY( DateFormat dateFormat READ dateFormat WRITE setDateFormat ) + TQ_PROPERTY( bool confirmEdits READ confirmEdits WRITE setConfirmEdits ) + TQ_PROPERTY( bool confirmInsert READ confirmInsert WRITE setConfirmInsert ) + TQ_PROPERTY( bool confirmUpdate READ confirmUpdate WRITE setConfirmUpdate ) + TQ_PROPERTY( bool confirmDelete READ confirmDelete WRITE setConfirmDelete ) + TQ_PROPERTY( bool confirmCancels READ confirmCancels WRITE setConfirmCancels ) + TQ_PROPERTY( bool autoEdit READ autoEdit WRITE setAutoEdit ) + TQ_PROPERTY( TQString filter READ filter WRITE setFilter ) + TQ_PROPERTY( TQStringList sort READ sort WRITE setSort ) + TQ_PROPERTY( int numCols READ numCols ) + TQ_PROPERTY( int numRows READ numRows ) public: TQDataTable ( TQWidget* parent=0, const char* name=0 ); diff --git a/src/sql/ntqsqldatabase.h b/src/sql/ntqsqldatabase.h index 97b744b1..75aa0ded 100644 --- a/src/sql/ntqsqldatabase.h +++ b/src/sql/ntqsqldatabase.h @@ -79,12 +79,12 @@ public: class TQM_EXPORT_SQL TQSqlDatabase : public TQObject { TQ_OBJECT - Q_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName ) - Q_PROPERTY( TQString userName READ userName WRITE setUserName ) - Q_PROPERTY( TQString password READ password WRITE setPassword ) - Q_PROPERTY( TQString hostName READ hostName WRITE setHostName ) - Q_PROPERTY( int port READ port WRITE setPort ) - Q_PROPERTY( TQString connectOptions READ connectOptions WRITE setConnectOptions ) + TQ_PROPERTY( TQString databaseName READ databaseName WRITE setDatabaseName ) + TQ_PROPERTY( TQString userName READ userName WRITE setUserName ) + TQ_PROPERTY( TQString password READ password WRITE setPassword ) + TQ_PROPERTY( TQString hostName READ hostName WRITE setHostName ) + TQ_PROPERTY( int port READ port WRITE setPort ) + TQ_PROPERTY( TQString connectOptions READ connectOptions WRITE setConnectOptions ) public: ~TQSqlDatabase(); diff --git a/src/sql/qsqlpropertymap.cpp b/src/sql/qsqlpropertymap.cpp index 2d32583c..a83f0186 100644 --- a/src/sql/qsqlpropertymap.cpp +++ b/src/sql/qsqlpropertymap.cpp @@ -250,7 +250,7 @@ void TQSqlPropertyMap::setProperty( TQWidget * widget, const TQVariant & value ) /*! Insert a new classname/property pair, which is used for custom SQL - field editors. There \e must be a \c Q_PROPERTY clause in the \a + field editors. There \e must be a \c TQ_PROPERTY clause in the \a classname class declaration for the \a property. */ void TQSqlPropertyMap::insert( const TQString & classname, diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h index a5202725..0c5e022e 100644 --- a/src/table/ntqtable.h +++ b/src/table/ntqtable.h @@ -247,17 +247,17 @@ private: class TQM_EXPORT_TABLE TQTable : public TQScrollView { TQ_OBJECT - Q_ENUMS( SelectionMode FocusStyle ) - Q_PROPERTY( int numRows READ numRows WRITE setNumRows ) - Q_PROPERTY( int numCols READ numCols WRITE setNumCols ) - Q_PROPERTY( bool showGrid READ showGrid WRITE setShowGrid ) - Q_PROPERTY( bool rowMovingEnabled READ rowMovingEnabled WRITE setRowMovingEnabled ) - Q_PROPERTY( bool columnMovingEnabled READ columnMovingEnabled WRITE setColumnMovingEnabled ) - Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) - Q_PROPERTY( bool sorting READ sorting WRITE setSorting ) - Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode ) - Q_PROPERTY( FocusStyle focusStyle READ focusStyle WRITE setFocusStyle ) - Q_PROPERTY( int numSelections READ numSelections ) + TQ_ENUMS( SelectionMode FocusStyle ) + TQ_PROPERTY( int numRows READ numRows WRITE setNumRows ) + TQ_PROPERTY( int numCols READ numCols WRITE setNumCols ) + TQ_PROPERTY( bool showGrid READ showGrid WRITE setShowGrid ) + TQ_PROPERTY( bool rowMovingEnabled READ rowMovingEnabled WRITE setRowMovingEnabled ) + TQ_PROPERTY( bool columnMovingEnabled READ columnMovingEnabled WRITE setColumnMovingEnabled ) + TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) + TQ_PROPERTY( bool sorting READ sorting WRITE setSorting ) + TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode ) + TQ_PROPERTY( FocusStyle focusStyle READ focusStyle WRITE setFocusStyle ) + TQ_PROPERTY( int numSelections READ numSelections ) friend class TQTableHeader; friend class TQComboTableItem; diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h index 919ba22e..48f72f0f 100644 --- a/src/widgets/ntqaction.h +++ b/src/widgets/ntqaction.h @@ -59,19 +59,19 @@ class TQToolTipGroup; class Q_EXPORT TQAction : public TQObject { TQ_OBJECT - Q_PROPERTY( bool toggleAction READ isToggleAction WRITE setToggleAction) - Q_PROPERTY( bool on READ isOn WRITE setOn ) - Q_PROPERTY( bool enabled READ isEnabled WRITE setEnabled ) - Q_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet ) - Q_PROPERTY( TQString text READ text WRITE setText ) - Q_PROPERTY( TQString menuText READ menuText WRITE setMenuText ) - Q_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip ) - Q_PROPERTY( TQString statusTip READ statusTip WRITE setStatusTip ) - Q_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis ) + TQ_PROPERTY( bool toggleAction READ isToggleAction WRITE setToggleAction) + TQ_PROPERTY( bool on READ isOn WRITE setOn ) + TQ_PROPERTY( bool enabled READ isEnabled WRITE setEnabled ) + TQ_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet ) + TQ_PROPERTY( TQString text READ text WRITE setText ) + TQ_PROPERTY( TQString menuText READ menuText WRITE setMenuText ) + TQ_PROPERTY( TQString toolTip READ toolTip WRITE setToolTip ) + TQ_PROPERTY( TQString statusTip READ statusTip WRITE setStatusTip ) + TQ_PROPERTY( TQString whatsThis READ whatsThis WRITE setWhatsThis ) #ifndef QT_NO_ACCEL - Q_PROPERTY( TQKeySequence accel READ accel WRITE setAccel ) + TQ_PROPERTY( TQKeySequence accel READ accel WRITE setAccel ) #endif - Q_PROPERTY( bool visible READ isVisible WRITE setVisible ) + TQ_PROPERTY( bool visible READ isVisible WRITE setVisible ) public: TQAction( TQObject* parent, const char* name = 0 ); @@ -154,8 +154,8 @@ private: class Q_EXPORT TQActionGroup : public TQAction { TQ_OBJECT - Q_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive ) - Q_PROPERTY( bool usesDropDown READ usesDropDown WRITE setUsesDropDown ) + TQ_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive ) + TQ_PROPERTY( bool usesDropDown READ usesDropDown WRITE setUsesDropDown ) public: TQActionGroup( TQObject* parent, const char* name = 0 ); diff --git a/src/widgets/ntqbutton.h b/src/widgets/ntqbutton.h index ce5f85e4..b59ac090 100644 --- a/src/widgets/ntqbutton.h +++ b/src/widgets/ntqbutton.h @@ -56,18 +56,18 @@ class TQButtonData; class Q_EXPORT TQButton : public TQWidget { TQ_OBJECT - Q_ENUMS( ToggleType ToggleState ) - Q_PROPERTY( TQString text READ text WRITE setText ) - Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) - Q_PROPERTY( TQKeySequence accel READ accel WRITE setAccel ) - Q_PROPERTY( bool toggleButton READ isToggleButton ) - Q_PROPERTY( ToggleType toggleType READ toggleType ) - Q_PROPERTY( bool down READ isDown WRITE setDown DESIGNABLE false ) - Q_PROPERTY( bool on READ isOn ) - Q_PROPERTY( ToggleState toggleState READ state ) - Q_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false ) - Q_PROPERTY( bool autoRepeat READ autoRepeat WRITE setAutoRepeat ) - Q_PROPERTY( bool exclusiveToggle READ isExclusiveToggle ) + TQ_ENUMS( ToggleType ToggleState ) + TQ_PROPERTY( TQString text READ text WRITE setText ) + TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) + TQ_PROPERTY( TQKeySequence accel READ accel WRITE setAccel ) + TQ_PROPERTY( bool toggleButton READ isToggleButton ) + TQ_PROPERTY( ToggleType toggleType READ toggleType ) + TQ_PROPERTY( bool down READ isDown WRITE setDown DESIGNABLE false ) + TQ_PROPERTY( bool on READ isOn ) + TQ_PROPERTY( ToggleState toggleState READ state ) + TQ_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false ) + TQ_PROPERTY( bool autoRepeat READ autoRepeat WRITE setAutoRepeat ) + TQ_PROPERTY( bool exclusiveToggle READ isExclusiveToggle ) public: TQButton( TQWidget* parent=0, const char* name=0, WFlags f=0 ); diff --git a/src/widgets/ntqbuttongroup.h b/src/widgets/ntqbuttongroup.h index 466e578f..92e2860a 100644 --- a/src/widgets/ntqbuttongroup.h +++ b/src/widgets/ntqbuttongroup.h @@ -55,9 +55,9 @@ class TQButtonList; class Q_EXPORT TQButtonGroup : public TQGroupBox { TQ_OBJECT - Q_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive ) - Q_PROPERTY( bool radioButtonExclusive READ isRadioButtonExclusive WRITE setRadioButtonExclusive ) - Q_PROPERTY( int selectedId READ selectedId WRITE setButton ) + TQ_PROPERTY( bool exclusive READ isExclusive WRITE setExclusive ) + TQ_PROPERTY( bool radioButtonExclusive READ isRadioButtonExclusive WRITE setRadioButtonExclusive ) + TQ_PROPERTY( int selectedId READ selectedId WRITE setButton ) public: TQButtonGroup( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqcheckbox.h b/src/widgets/ntqcheckbox.h index e5110776..a62a0d1b 100644 --- a/src/widgets/ntqcheckbox.h +++ b/src/widgets/ntqcheckbox.h @@ -50,9 +50,9 @@ class Q_EXPORT TQCheckBox : public TQButton { TQ_OBJECT - Q_PROPERTY( bool checked READ isChecked WRITE setChecked ) - Q_PROPERTY( bool tristate READ isTristate WRITE setTristate ) - Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) + TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) + TQ_PROPERTY( bool tristate READ isTristate WRITE setTristate ) + TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: TQCheckBox( TQWidget *parent, const char* name=0 ); diff --git a/src/widgets/ntqcombobox.h b/src/widgets/ntqcombobox.h index 9ab4e3a3..c6b27ce9 100644 --- a/src/widgets/ntqcombobox.h +++ b/src/widgets/ntqcombobox.h @@ -59,18 +59,18 @@ class TQWheelEvent; class Q_EXPORT TQComboBox : public TQWidget { TQ_OBJECT - Q_ENUMS( Policy ) - Q_PROPERTY( bool editable READ editable WRITE setEditable ) - Q_PROPERTY( int count READ count ) - Q_PROPERTY( TQString currentText READ currentText WRITE setCurrentText DESIGNABLE false ) - Q_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem ) - Q_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false ) - Q_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit ) - Q_PROPERTY( int maxCount READ maxCount WRITE setMaxCount ) - Q_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy ) - Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion ) - Q_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled ) - Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) + 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 ) + TQ_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem ) + TQ_PROPERTY( bool autoResize READ autoResize WRITE setAutoResize DESIGNABLE false ) + TQ_PROPERTY( int sizeLimit READ sizeLimit WRITE setSizeLimit ) + TQ_PROPERTY( int maxCount READ maxCount WRITE setMaxCount ) + TQ_PROPERTY( Policy insertionPolicy READ insertionPolicy WRITE setInsertionPolicy ) + TQ_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompletion ) + TQ_PROPERTY( bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled ) + TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: TQComboBox( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/ntqdatetimeedit.h index e53273f2..8078d826 100644 --- a/src/widgets/ntqdatetimeedit.h +++ b/src/widgets/ntqdatetimeedit.h @@ -77,12 +77,12 @@ class TQDateEditPrivate; class Q_EXPORT TQDateEdit : public TQDateTimeEditBase { TQ_OBJECT - Q_ENUMS( Order ) - Q_PROPERTY( Order order READ order WRITE setOrder ) - Q_PROPERTY( TQDate date READ date WRITE setDate ) - Q_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) - Q_PROPERTY( TQDate maxValue READ maxValue WRITE setMaxValue ) - Q_PROPERTY( TQDate minValue READ minValue WRITE setMinValue ) + TQ_ENUMS( Order ) + TQ_PROPERTY( Order order READ order WRITE setOrder ) + TQ_PROPERTY( TQDate date READ date WRITE setDate ) + TQ_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) + TQ_PROPERTY( TQDate maxValue READ maxValue WRITE setMaxValue ) + TQ_PROPERTY( TQDate minValue READ minValue WRITE setMinValue ) public: TQDateEdit( TQWidget* parent=0, const char* name=0 ); @@ -157,12 +157,12 @@ class TQTimeEditPrivate; class Q_EXPORT TQTimeEdit : public TQDateTimeEditBase { TQ_OBJECT - Q_SETS( Display ) - Q_PROPERTY( TQTime time READ time WRITE setTime ) - Q_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) - Q_PROPERTY( TQTime maxValue READ maxValue WRITE setMaxValue ) - Q_PROPERTY( TQTime minValue READ minValue WRITE setMinValue ) - Q_PROPERTY( Display display READ display WRITE setDisplay ) + TQ_SETS( Display ) + TQ_PROPERTY( TQTime time READ time WRITE setTime ) + TQ_PROPERTY( bool autoAdvance READ autoAdvance WRITE setAutoAdvance ) + TQ_PROPERTY( TQTime maxValue READ maxValue WRITE setMaxValue ) + TQ_PROPERTY( TQTime minValue READ minValue WRITE setMinValue ) + TQ_PROPERTY( Display display READ display WRITE setDisplay ) public: enum Display { @@ -241,7 +241,7 @@ class TQDateTimeEditPrivate; class Q_EXPORT TQDateTimeEdit : public TQWidget { TQ_OBJECT - Q_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime ) + TQ_PROPERTY( TQDateTime dateTime READ dateTime WRITE setDateTime ) public: TQDateTimeEdit( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqdial.h b/src/widgets/ntqdial.h index 2fd25d94..c28bedfa 100644 --- a/src/widgets/ntqdial.h +++ b/src/widgets/ntqdial.h @@ -54,16 +54,16 @@ class TQDialPrivate; class Q_EXPORT TQDial: public TQWidget, public TQRangeControl { TQ_OBJECT - Q_PROPERTY( bool tracking READ tracking WRITE setTracking ) - Q_PROPERTY( bool wrapping READ wrapping WRITE setWrapping ) - Q_PROPERTY( int notchSize READ notchSize ) - Q_PROPERTY( double notchTarget READ notchTarget WRITE setNotchTarget ) - Q_PROPERTY( bool notchesVisible READ notchesVisible WRITE setNotchesVisible ) - Q_PROPERTY( int minValue READ minValue WRITE setMinValue ) - Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) - Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep ) - Q_PROPERTY( int pageStep READ pageStep WRITE setPageStep ) - Q_PROPERTY( int value READ value WRITE setValue ) + TQ_PROPERTY( bool tracking READ tracking WRITE setTracking ) + TQ_PROPERTY( bool wrapping READ wrapping WRITE setWrapping ) + TQ_PROPERTY( int notchSize READ notchSize ) + TQ_PROPERTY( double notchTarget READ notchTarget WRITE setNotchTarget ) + TQ_PROPERTY( bool notchesVisible READ notchesVisible WRITE setNotchesVisible ) + TQ_PROPERTY( int minValue READ minValue WRITE setMinValue ) + TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) + TQ_PROPERTY( int lineStep READ lineStep WRITE setLineStep ) + TQ_PROPERTY( int pageStep READ pageStep WRITE setPageStep ) + TQ_PROPERTY( int value READ value WRITE setValue ) public: TQDial( TQWidget* parent=0, const char* name=0, WFlags f = 0 ); diff --git a/src/widgets/ntqdockarea.h b/src/widgets/ntqdockarea.h index 7ce03c1c..7a5a5910 100644 --- a/src/widgets/ntqdockarea.h +++ b/src/widgets/ntqdockarea.h @@ -106,11 +106,11 @@ private: class Q_EXPORT TQDockArea : public TQWidget { TQ_OBJECT - Q_ENUMS( HandlePosition ) - Q_PROPERTY( Orientation orientation READ orientation ) - Q_PROPERTY( int count READ count ) - Q_PROPERTY( bool empty READ isEmpty ) - Q_PROPERTY( HandlePosition handlePosition READ handlePosition ) + TQ_ENUMS( HandlePosition ) + TQ_PROPERTY( Orientation orientation READ orientation ) + TQ_PROPERTY( int count READ count ) + TQ_PROPERTY( bool empty READ isEmpty ) + TQ_PROPERTY( HandlePosition handlePosition READ handlePosition ) friend class TQDockWindow; friend class TQDockWindowResizeHandle; diff --git a/src/widgets/ntqdockwindow.h b/src/widgets/ntqdockwindow.h index 96e417b9..fa9d66bc 100644 --- a/src/widgets/ntqdockwindow.h +++ b/src/widgets/ntqdockwindow.h @@ -65,17 +65,17 @@ class TQWindowsXPStyle; class Q_EXPORT TQDockWindow : public TQFrame { TQ_OBJECT - Q_ENUMS( CloseMode Place ) - Q_PROPERTY( int closeMode READ closeMode WRITE setCloseMode ) //### this shouldn't be of type int?! - Q_PROPERTY( bool resizeEnabled READ isResizeEnabled WRITE setResizeEnabled ) - Q_PROPERTY( bool movingEnabled READ isMovingEnabled WRITE setMovingEnabled ) - Q_PROPERTY( bool horizontallyStretchable READ isHorizontallyStretchable WRITE setHorizontallyStretchable ) - Q_PROPERTY( bool verticallyStretchable READ isVerticallyStretchable WRITE setVerticallyStretchable ) - Q_PROPERTY( bool stretchable READ isStretchable ) - Q_PROPERTY( bool newLine READ newLine WRITE setNewLine ) - Q_PROPERTY( bool opaqueMoving READ opaqueMoving WRITE setOpaqueMoving ) - Q_PROPERTY( int offset READ offset WRITE setOffset ) - Q_PROPERTY( Place place READ place ) + TQ_ENUMS( CloseMode Place ) + TQ_PROPERTY( int closeMode READ closeMode WRITE setCloseMode ) //### this shouldn't be of type int?! + TQ_PROPERTY( bool resizeEnabled READ isResizeEnabled WRITE setResizeEnabled ) + TQ_PROPERTY( bool movingEnabled READ isMovingEnabled WRITE setMovingEnabled ) + TQ_PROPERTY( bool horizontallyStretchable READ isHorizontallyStretchable WRITE setHorizontallyStretchable ) + TQ_PROPERTY( bool verticallyStretchable READ isVerticallyStretchable WRITE setVerticallyStretchable ) + TQ_PROPERTY( bool stretchable READ isStretchable ) + TQ_PROPERTY( bool newLine READ newLine WRITE setNewLine ) + TQ_PROPERTY( bool opaqueMoving READ opaqueMoving WRITE setOpaqueMoving ) + TQ_PROPERTY( int offset READ offset WRITE setOffset ) + TQ_PROPERTY( Place place READ place ) friend class TQDockWindowHandle; friend class TQDockWindowTitleBar; diff --git a/src/widgets/ntqframe.h b/src/widgets/ntqframe.h index 21a1cbe4..8c66f0b1 100644 --- a/src/widgets/ntqframe.h +++ b/src/widgets/ntqframe.h @@ -50,15 +50,15 @@ class Q_EXPORT TQFrame : public TQWidget { TQ_OBJECT - Q_ENUMS( Shape Shadow ) - Q_PROPERTY( int frameWidth READ frameWidth ) - Q_PROPERTY( TQRect contentsRect READ contentsRect ) - Q_PROPERTY( Shape frameShape READ frameShape WRITE setFrameShape ) - Q_PROPERTY( Shadow frameShadow READ frameShadow WRITE setFrameShadow ) - Q_PROPERTY( int lineWidth READ lineWidth WRITE setLineWidth ) - Q_PROPERTY( int margin READ margin WRITE setMargin ) - Q_PROPERTY( int midLineWidth READ midLineWidth WRITE setMidLineWidth ) - Q_PROPERTY( TQRect frameRect READ frameRect WRITE setFrameRect DESIGNABLE false ) + TQ_ENUMS( Shape Shadow ) + TQ_PROPERTY( int frameWidth READ frameWidth ) + TQ_PROPERTY( TQRect contentsRect READ contentsRect ) + TQ_PROPERTY( Shape frameShape READ frameShape WRITE setFrameShape ) + TQ_PROPERTY( Shadow frameShadow READ frameShadow WRITE setFrameShadow ) + TQ_PROPERTY( int lineWidth READ lineWidth WRITE setLineWidth ) + TQ_PROPERTY( int margin READ margin WRITE setMargin ) + TQ_PROPERTY( int midLineWidth READ midLineWidth WRITE setMidLineWidth ) + TQ_PROPERTY( TQRect frameRect READ frameRect WRITE setFrameRect DESIGNABLE false ) public: TQFrame( TQWidget* parent=0, const char* name=0, WFlags f=0 ); diff --git a/src/widgets/ntqgridview.h b/src/widgets/ntqgridview.h index e1581689..72b0982f 100644 --- a/src/widgets/ntqgridview.h +++ b/src/widgets/ntqgridview.h @@ -52,10 +52,10 @@ class TQGridViewPrivate; class Q_EXPORT TQGridView : public TQScrollView { TQ_OBJECT - Q_PROPERTY( int numRows READ numRows WRITE setNumRows ) - Q_PROPERTY( int numCols READ numCols WRITE setNumCols ) - Q_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth ) - Q_PROPERTY( int cellHeight READ cellHeight WRITE setCellHeight ) + TQ_PROPERTY( int numRows READ numRows WRITE setNumRows ) + TQ_PROPERTY( int numCols READ numCols WRITE setNumCols ) + TQ_PROPERTY( int cellWidth READ cellWidth WRITE setCellWidth ) + TQ_PROPERTY( int cellHeight READ cellHeight WRITE setCellHeight ) public: TQGridView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); diff --git a/src/widgets/ntqgroupbox.h b/src/widgets/ntqgroupbox.h index bd4ef354..49b7aa72 100644 --- a/src/widgets/ntqgroupbox.h +++ b/src/widgets/ntqgroupbox.h @@ -57,14 +57,14 @@ class TQSpacerItem; class Q_EXPORT TQGroupBox : public TQFrame { TQ_OBJECT - Q_PROPERTY( TQString title READ title WRITE setTitle ) - Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) - Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation DESIGNABLE false ) - Q_PROPERTY( int columns READ columns WRITE setColumns DESIGNABLE false ) - Q_PROPERTY( bool flat READ isFlat WRITE setFlat ) + TQ_PROPERTY( TQString title READ title WRITE setTitle ) + TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) + TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation DESIGNABLE false ) + TQ_PROPERTY( int columns READ columns WRITE setColumns DESIGNABLE false ) + TQ_PROPERTY( bool flat READ isFlat WRITE setFlat ) #ifndef QT_NO_CHECKBOX - Q_PROPERTY( bool checkable READ isCheckable WRITE setCheckable ) - Q_PROPERTY( bool checked READ isChecked WRITE setChecked ) + TQ_PROPERTY( bool checkable READ isCheckable WRITE setCheckable ) + TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) #endif public: TQGroupBox( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h index b079e3af..a6d9ce33 100644 --- a/src/widgets/ntqheader.h +++ b/src/widgets/ntqheader.h @@ -60,12 +60,12 @@ class Q_EXPORT TQHeader : public TQWidget friend class TQListView; TQ_OBJECT - Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) - Q_PROPERTY( bool tracking READ tracking WRITE setTracking ) - Q_PROPERTY( int count READ count ) - Q_PROPERTY( int offset READ offset WRITE setOffset ) - Q_PROPERTY( bool moving READ isMovingEnabled WRITE setMovingEnabled ) - Q_PROPERTY( bool stretching READ isStretchEnabled WRITE setStretchEnabled ) + TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) + TQ_PROPERTY( bool tracking READ tracking WRITE setTracking ) + TQ_PROPERTY( int count READ count ) + TQ_PROPERTY( int offset READ offset WRITE setOffset ) + TQ_PROPERTY( bool moving READ isMovingEnabled WRITE setMovingEnabled ) + TQ_PROPERTY( bool stretching READ isStretchEnabled WRITE setStretchEnabled ) public: TQHeader( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqlabel.h b/src/widgets/ntqlabel.h index 5e978931..b1d439fc 100644 --- a/src/widgets/ntqlabel.h +++ b/src/widgets/ntqlabel.h @@ -53,13 +53,13 @@ class TQLabelPrivate; class Q_EXPORT TQLabel : public TQFrame { TQ_OBJECT - Q_PROPERTY( TQString text READ text WRITE setText ) - Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat ) - Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) - Q_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents ) - Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) - Q_PROPERTY( int indent READ indent WRITE setIndent ) - Q_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true) + TQ_PROPERTY( TQString text READ text WRITE setText ) + TQ_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat ) + TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap ) + TQ_PROPERTY( bool scaledContents READ hasScaledContents WRITE setScaledContents ) + TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) + TQ_PROPERTY( int indent READ indent WRITE setIndent ) + TQ_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true) public: TQLabel( TQWidget *parent, const char* name=0, WFlags f=0 ); diff --git a/src/widgets/ntqlcdnumber.h b/src/widgets/ntqlcdnumber.h index 01d216ce..f76aa224 100644 --- a/src/widgets/ntqlcdnumber.h +++ b/src/widgets/ntqlcdnumber.h @@ -54,13 +54,13 @@ class TQLCDNumberPrivate; class Q_EXPORT TQLCDNumber : public TQFrame // LCD number widget { TQ_OBJECT - Q_ENUMS( Mode SegmentStyle ) - Q_PROPERTY( bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint ) - Q_PROPERTY( int numDigits READ numDigits WRITE setNumDigits ) - Q_PROPERTY( Mode mode READ mode WRITE setMode ) - Q_PROPERTY( SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle ) - Q_PROPERTY( double value READ value WRITE display ) - Q_PROPERTY( int intValue READ intValue WRITE display ) + TQ_ENUMS( Mode SegmentStyle ) + TQ_PROPERTY( bool smallDecimalPoint READ smallDecimalPoint WRITE setSmallDecimalPoint ) + TQ_PROPERTY( int numDigits READ numDigits WRITE setNumDigits ) + TQ_PROPERTY( Mode mode READ mode WRITE setMode ) + TQ_PROPERTY( SegmentStyle segmentStyle READ segmentStyle WRITE setSegmentStyle ) + TQ_PROPERTY( double value READ value WRITE display ) + TQ_PROPERTY( int intValue READ intValue WRITE display ) public: TQLCDNumber( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h index 8067cfba..9a230560 100644 --- a/src/widgets/ntqlineedit.h +++ b/src/widgets/ntqlineedit.h @@ -59,26 +59,26 @@ class TQTextCursor; class Q_EXPORT TQLineEdit : public TQFrame { TQ_OBJECT - Q_ENUMS( EchoMode ) - Q_PROPERTY( TQString text READ text WRITE setText ) - Q_PROPERTY( int maxLength READ maxLength WRITE setMaxLength ) - Q_PROPERTY( bool frame READ frame WRITE setFrame ) - Q_PROPERTY( EchoMode echoMode READ echoMode WRITE setEchoMode ) - Q_PROPERTY( TQString displayText READ displayText ) - Q_PROPERTY( int cursorPosition READ cursorPosition WRITE setCursorPosition ) - Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) - Q_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false ) - Q_PROPERTY( bool modified READ isModified ) - Q_PROPERTY( bool hasMarkedText READ hasMarkedText DESIGNABLE false ) - Q_PROPERTY( bool hasSelectedText READ hasSelectedText ) - Q_PROPERTY( TQString markedText READ markedText DESIGNABLE false ) - Q_PROPERTY( TQString selectedText READ selectedText ) - Q_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled ) - Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) - Q_PROPERTY( bool undoAvailable READ isUndoAvailable ) - Q_PROPERTY( bool redoAvailable READ isRedoAvailable ) - Q_PROPERTY( TQString inputMask READ inputMask WRITE setInputMask ) - Q_PROPERTY( bool acceptableInput READ hasAcceptableInput ) + TQ_ENUMS( EchoMode ) + TQ_PROPERTY( TQString text READ text WRITE setText ) + TQ_PROPERTY( int maxLength READ maxLength WRITE setMaxLength ) + TQ_PROPERTY( bool frame READ frame WRITE setFrame ) + TQ_PROPERTY( EchoMode echoMode READ echoMode WRITE setEchoMode ) + TQ_PROPERTY( TQString displayText READ displayText ) + TQ_PROPERTY( int cursorPosition READ cursorPosition WRITE setCursorPosition ) + TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) + TQ_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false ) + TQ_PROPERTY( bool modified READ isModified ) + TQ_PROPERTY( bool hasMarkedText READ hasMarkedText DESIGNABLE false ) + TQ_PROPERTY( bool hasSelectedText READ hasSelectedText ) + TQ_PROPERTY( TQString markedText READ markedText DESIGNABLE false ) + TQ_PROPERTY( TQString selectedText READ selectedText ) + TQ_PROPERTY( bool dragEnabled READ dragEnabled WRITE setDragEnabled ) + TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) + TQ_PROPERTY( bool undoAvailable READ isUndoAvailable ) + TQ_PROPERTY( bool redoAvailable READ isRedoAvailable ) + TQ_PROPERTY( TQString inputMask READ inputMask WRITE setInputMask ) + TQ_PROPERTY( bool acceptableInput READ hasAcceptableInput ) public: TQLineEdit( TQWidget* parent, const char* name=0 ); diff --git a/src/widgets/ntqlistbox.h b/src/widgets/ntqlistbox.h index 91cece44..c9790959 100644 --- a/src/widgets/ntqlistbox.h +++ b/src/widgets/ntqlistbox.h @@ -62,20 +62,20 @@ class Q_EXPORT TQListBox : public TQScrollView friend class TQListBoxPrivate; TQ_OBJECT - Q_ENUMS( SelectionMode LayoutMode ) - Q_PROPERTY( uint count READ count ) - Q_PROPERTY( int numItemsVisible READ numItemsVisible ) - Q_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem ) - Q_PROPERTY( TQString currentText READ currentText ) - Q_PROPERTY( int topItem READ topItem WRITE setTopItem DESIGNABLE false ) - Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode ) - Q_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false ) - Q_PROPERTY( LayoutMode columnMode READ columnMode WRITE setColumnMode ) - Q_PROPERTY( LayoutMode rowMode READ rowMode WRITE setRowMode ) - Q_PROPERTY( int numColumns READ numColumns ) - Q_PROPERTY( int numRows READ numRows ) - Q_PROPERTY( bool variableWidth READ variableWidth WRITE setVariableWidth ) - Q_PROPERTY( bool variableHeight READ variableHeight WRITE setVariableHeight ) + TQ_ENUMS( SelectionMode LayoutMode ) + TQ_PROPERTY( uint count READ count ) + TQ_PROPERTY( int numItemsVisible READ numItemsVisible ) + TQ_PROPERTY( int currentItem READ currentItem WRITE setCurrentItem ) + TQ_PROPERTY( TQString currentText READ currentText ) + TQ_PROPERTY( int topItem READ topItem WRITE setTopItem DESIGNABLE false ) + TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode ) + TQ_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false ) + TQ_PROPERTY( LayoutMode columnMode READ columnMode WRITE setColumnMode ) + TQ_PROPERTY( LayoutMode rowMode READ rowMode WRITE setRowMode ) + TQ_PROPERTY( int numColumns READ numColumns ) + TQ_PROPERTY( int numRows READ numRows ) + TQ_PROPERTY( bool variableWidth READ variableWidth WRITE setVariableWidth ) + TQ_PROPERTY( bool variableHeight READ variableHeight WRITE setVariableHeight ) public: TQListBox( TQWidget* parent=0, const char* name=0, WFlags f=0 ); diff --git a/src/widgets/ntqlistview.h b/src/widgets/ntqlistview.h index e647152a..5c976bd8 100644 --- a/src/widgets/ntqlistview.h +++ b/src/widgets/ntqlistview.h @@ -241,19 +241,19 @@ class Q_EXPORT TQListView: public TQScrollView friend class TQListViewToolTip; TQ_OBJECT - Q_ENUMS( SelectionMode ResizeMode RenameAction ) - Q_PROPERTY( int columns READ columns ) - Q_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false ) - Q_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode ) - Q_PROPERTY( int childCount READ childCount ) - Q_PROPERTY( bool allColumnsShowFocus READ allColumnsShowFocus WRITE setAllColumnsShowFocus ) - Q_PROPERTY( bool showSortIndicator READ showSortIndicator WRITE setShowSortIndicator ) - Q_PROPERTY( int itemMargin READ itemMargin WRITE setItemMargin ) - Q_PROPERTY( bool rootIsDecorated READ rootIsDecorated WRITE setRootIsDecorated ) - Q_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips ) - Q_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode ) - Q_PROPERTY( int treeStepSize READ treeStepSize WRITE setTreeStepSize ) - Q_PROPERTY( RenameAction defaultRenameAction READ defaultRenameAction WRITE setDefaultRenameAction ) + TQ_ENUMS( SelectionMode ResizeMode RenameAction ) + TQ_PROPERTY( int columns READ columns ) + TQ_PROPERTY( bool multiSelection READ isMultiSelection WRITE setMultiSelection DESIGNABLE false ) + TQ_PROPERTY( SelectionMode selectionMode READ selectionMode WRITE setSelectionMode ) + TQ_PROPERTY( int childCount READ childCount ) + TQ_PROPERTY( bool allColumnsShowFocus READ allColumnsShowFocus WRITE setAllColumnsShowFocus ) + TQ_PROPERTY( bool showSortIndicator READ showSortIndicator WRITE setShowSortIndicator ) + TQ_PROPERTY( int itemMargin READ itemMargin WRITE setItemMargin ) + TQ_PROPERTY( bool rootIsDecorated READ rootIsDecorated WRITE setRootIsDecorated ) + TQ_PROPERTY( bool showToolTips READ showToolTips WRITE setShowToolTips ) + TQ_PROPERTY( ResizeMode resizeMode READ resizeMode WRITE setResizeMode ) + TQ_PROPERTY( int treeStepSize READ treeStepSize WRITE setTreeStepSize ) + TQ_PROPERTY( RenameAction defaultRenameAction READ defaultRenameAction WRITE setDefaultRenameAction ) public: TQListView( TQWidget* parent=0, const char* name=0, WFlags f = 0 ); diff --git a/src/widgets/ntqmainwindow.h b/src/widgets/ntqmainwindow.h index 9cd213b9..03a9eee6 100644 --- a/src/widgets/ntqmainwindow.h +++ b/src/widgets/ntqmainwindow.h @@ -60,11 +60,11 @@ class TQPopupMenu; class Q_EXPORT TQMainWindow: public TQWidget { TQ_OBJECT - Q_PROPERTY( bool rightJustification READ rightJustification WRITE setRightJustification DESIGNABLE false ) - Q_PROPERTY( bool usesBigPixmaps READ usesBigPixmaps WRITE setUsesBigPixmaps ) - Q_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel ) - Q_PROPERTY( bool dockWindowsMovable READ dockWindowsMovable WRITE setDockWindowsMovable ) - Q_PROPERTY( bool opaqueMoving READ opaqueMoving WRITE setOpaqueMoving ) + TQ_PROPERTY( bool rightJustification READ rightJustification WRITE setRightJustification DESIGNABLE false ) + TQ_PROPERTY( bool usesBigPixmaps READ usesBigPixmaps WRITE setUsesBigPixmaps ) + TQ_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel ) + TQ_PROPERTY( bool dockWindowsMovable READ dockWindowsMovable WRITE setDockWindowsMovable ) + TQ_PROPERTY( bool opaqueMoving READ opaqueMoving WRITE setOpaqueMoving ) public: TQMainWindow( TQWidget* parent=0, const char* name=0, WFlags f = WType_TopLevel ); diff --git a/src/widgets/ntqmenubar.h b/src/widgets/ntqmenubar.h index 46468d8a..87e316fe 100644 --- a/src/widgets/ntqmenubar.h +++ b/src/widgets/ntqmenubar.h @@ -54,9 +54,9 @@ class TQPopupMenu; class Q_EXPORT TQMenuBar : public TQFrame, public TQMenuData { TQ_OBJECT - Q_ENUMS( Separator ) - Q_PROPERTY( Separator separator READ separator WRITE setSeparator DESIGNABLE false ) - Q_PROPERTY( bool defaultUp READ isDefaultUp WRITE setDefaultUp ) + TQ_ENUMS( Separator ) + TQ_PROPERTY( Separator separator READ separator WRITE setSeparator DESIGNABLE false ) + TQ_PROPERTY( bool defaultUp READ isDefaultUp WRITE setDefaultUp ) public: TQMenuBar( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqmultilineedit.h b/src/widgets/ntqmultilineedit.h index 88d33601..ad073e37 100644 --- a/src/widgets/ntqmultilineedit.h +++ b/src/widgets/ntqmultilineedit.h @@ -54,11 +54,11 @@ class TQMultiLineEditData; class Q_EXPORT TQMultiLineEdit : public TQTextEdit { TQ_OBJECT - Q_PROPERTY( int numLines READ numLines ) - Q_PROPERTY( bool atBeginning READ atBeginning ) - Q_PROPERTY( bool atEnd READ atEnd ) - Q_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) - Q_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false ) + TQ_PROPERTY( int numLines READ numLines ) + TQ_PROPERTY( bool atBeginning READ atBeginning ) + TQ_PROPERTY( bool atEnd READ atEnd ) + TQ_PROPERTY( Alignment alignment READ alignment WRITE setAlignment ) + TQ_PROPERTY( bool edited READ edited WRITE setEdited DESIGNABLE false ) public: TQMultiLineEdit( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqpopupmenu.h b/src/widgets/ntqpopupmenu.h index af67e914..c4415fdf 100644 --- a/src/widgets/ntqpopupmenu.h +++ b/src/widgets/ntqpopupmenu.h @@ -52,7 +52,7 @@ class TQPopupMenuPrivate; class Q_EXPORT TQPopupMenu : public TQFrame, public TQMenuData { TQ_OBJECT - Q_PROPERTY( bool checkable READ isCheckable WRITE setCheckable ) + TQ_PROPERTY( bool checkable READ isCheckable WRITE setCheckable ) public: TQPopupMenu( TQWidget* parent=0, const char* name=0 ); ~TQPopupMenu(); diff --git a/src/widgets/ntqprogressbar.h b/src/widgets/ntqprogressbar.h index 038ddf83..e4c66e99 100644 --- a/src/widgets/ntqprogressbar.h +++ b/src/widgets/ntqprogressbar.h @@ -54,12 +54,12 @@ class TQProgressBarPrivate; class Q_EXPORT TQProgressBar : public TQFrame { TQ_OBJECT - Q_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps ) - Q_PROPERTY( int progress READ progress WRITE setProgress ) - Q_PROPERTY( TQString progressString READ progressString ) - Q_PROPERTY( bool centerIndicator READ centerIndicator WRITE setCenterIndicator ) - Q_PROPERTY( bool indicatorFollowsStyle READ indicatorFollowsStyle WRITE setIndicatorFollowsStyle ) - Q_PROPERTY( bool percentageVisible READ percentageVisible WRITE setPercentageVisible ) + TQ_PROPERTY( int totalSteps READ totalSteps WRITE setTotalSteps ) + TQ_PROPERTY( int progress READ progress WRITE setProgress ) + TQ_PROPERTY( TQString progressString READ progressString ) + TQ_PROPERTY( bool centerIndicator READ centerIndicator WRITE setCenterIndicator ) + TQ_PROPERTY( bool indicatorFollowsStyle READ indicatorFollowsStyle WRITE setIndicatorFollowsStyle ) + TQ_PROPERTY( bool percentageVisible READ percentageVisible WRITE setPercentageVisible ) public: TQProgressBar( TQWidget* parent=0, const char* name=0, WFlags f=0 ); diff --git a/src/widgets/ntqpushbutton.h b/src/widgets/ntqpushbutton.h index e8a317a5..a0945782 100644 --- a/src/widgets/ntqpushbutton.h +++ b/src/widgets/ntqpushbutton.h @@ -54,14 +54,14 @@ class Q_EXPORT TQPushButton : public TQButton { TQ_OBJECT - Q_PROPERTY( bool autoDefault READ autoDefault WRITE setAutoDefault ) - Q_PROPERTY( bool default READ isDefault WRITE setDefault ) - Q_PROPERTY( bool menuButton READ isMenuButton DESIGNABLE false ) - Q_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet ) - Q_OVERRIDE( bool toggleButton WRITE setToggleButton ) - Q_OVERRIDE( bool on WRITE setOn ) - Q_PROPERTY( bool flat READ isFlat WRITE setFlat ) - Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) + TQ_PROPERTY( bool autoDefault READ autoDefault WRITE setAutoDefault ) + TQ_PROPERTY( bool default READ isDefault WRITE setDefault ) + TQ_PROPERTY( bool menuButton READ isMenuButton DESIGNABLE false ) + TQ_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet ) + TQ_OVERRIDE( bool toggleButton WRITE setToggleButton ) + TQ_OVERRIDE( bool on WRITE setOn ) + TQ_PROPERTY( bool flat READ isFlat WRITE setFlat ) + TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: TQPushButton( TQWidget *parent, const char* name=0 ); diff --git a/src/widgets/ntqradiobutton.h b/src/widgets/ntqradiobutton.h index cfeefa27..3ff6d61e 100644 --- a/src/widgets/ntqradiobutton.h +++ b/src/widgets/ntqradiobutton.h @@ -50,8 +50,8 @@ class Q_EXPORT TQRadioButton : public TQButton { TQ_OBJECT - Q_PROPERTY( bool checked READ isChecked WRITE setChecked ) - Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) + TQ_PROPERTY( bool checked READ isChecked WRITE setChecked ) + TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: TQRadioButton( TQWidget *parent, const char* name=0 ); diff --git a/src/widgets/ntqscrollbar.h b/src/widgets/ntqscrollbar.h index a14d3ce0..aff49247 100644 --- a/src/widgets/ntqscrollbar.h +++ b/src/widgets/ntqscrollbar.h @@ -53,14 +53,14 @@ class TQTimer; class Q_EXPORT TQScrollBar : public TQWidget, public TQRangeControl { TQ_OBJECT - Q_PROPERTY( int minValue READ minValue WRITE setMinValue ) - Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) - Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep ) - Q_PROPERTY( int pageStep READ pageStep WRITE setPageStep ) - Q_PROPERTY( int value READ value WRITE setValue ) - Q_PROPERTY( bool tracking READ tracking WRITE setTracking ) - Q_PROPERTY( bool draggingSlider READ draggingSlider ) - Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) + TQ_PROPERTY( int minValue READ minValue WRITE setMinValue ) + TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) + TQ_PROPERTY( int lineStep READ lineStep WRITE setLineStep ) + TQ_PROPERTY( int pageStep READ pageStep WRITE setPageStep ) + TQ_PROPERTY( int value READ value WRITE setValue ) + TQ_PROPERTY( bool tracking READ tracking WRITE setTracking ) + TQ_PROPERTY( bool draggingSlider READ draggingSlider ) + TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) public: TQScrollBar( TQWidget *parent, const char* name = 0 ); diff --git a/src/widgets/ntqscrollview.h b/src/widgets/ntqscrollview.h index b2b0869a..24a1322b 100644 --- a/src/widgets/ntqscrollview.h +++ b/src/widgets/ntqscrollview.h @@ -52,18 +52,18 @@ class TQScrollViewData; class Q_EXPORT TQScrollView : public TQFrame { TQ_OBJECT - Q_ENUMS( ResizePolicy ScrollBarMode ) - Q_PROPERTY( ResizePolicy resizePolicy READ resizePolicy WRITE setResizePolicy ) - Q_PROPERTY( ScrollBarMode vScrollBarMode READ vScrollBarMode WRITE setVScrollBarMode ) - Q_PROPERTY( ScrollBarMode hScrollBarMode READ hScrollBarMode WRITE setHScrollBarMode ) - Q_PROPERTY( int visibleWidth READ visibleWidth ) - Q_PROPERTY( int visibleHeight READ visibleHeight ) - Q_PROPERTY( int contentsWidth READ contentsWidth ) - Q_PROPERTY( int contentsHeight READ contentsHeight ) - Q_PROPERTY( int contentsX READ contentsX ) - Q_PROPERTY( int contentsY READ contentsY ) + TQ_ENUMS( ResizePolicy ScrollBarMode ) + TQ_PROPERTY( ResizePolicy resizePolicy READ resizePolicy WRITE setResizePolicy ) + TQ_PROPERTY( ScrollBarMode vScrollBarMode READ vScrollBarMode WRITE setVScrollBarMode ) + TQ_PROPERTY( ScrollBarMode hScrollBarMode READ hScrollBarMode WRITE setHScrollBarMode ) + TQ_PROPERTY( int visibleWidth READ visibleWidth ) + TQ_PROPERTY( int visibleHeight READ visibleHeight ) + TQ_PROPERTY( int contentsWidth READ contentsWidth ) + TQ_PROPERTY( int contentsHeight READ contentsHeight ) + TQ_PROPERTY( int contentsX READ contentsX ) + TQ_PROPERTY( int contentsY READ contentsY ) #ifndef QT_NO_DRAGANDDROP - Q_PROPERTY( bool dragAutoScroll READ dragAutoScroll WRITE setDragAutoScroll ) + TQ_PROPERTY( bool dragAutoScroll READ dragAutoScroll WRITE setDragAutoScroll ) #endif public: diff --git a/src/widgets/ntqslider.h b/src/widgets/ntqslider.h index 881e2abb..f5417949 100644 --- a/src/widgets/ntqslider.h +++ b/src/widgets/ntqslider.h @@ -55,16 +55,16 @@ class TQTimer; class Q_EXPORT TQSlider : public TQWidget, public TQRangeControl { TQ_OBJECT - Q_ENUMS( TickSetting ) - Q_PROPERTY( int minValue READ minValue WRITE setMinValue ) - Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) - Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep ) - Q_PROPERTY( int pageStep READ pageStep WRITE setPageStep ) - Q_PROPERTY( int value READ value WRITE setValue ) - Q_PROPERTY( bool tracking READ tracking WRITE setTracking ) - Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) - Q_PROPERTY( TickSetting tickmarks READ tickmarks WRITE setTickmarks ) - Q_PROPERTY( int tickInterval READ tickInterval WRITE setTickInterval ) + TQ_ENUMS( TickSetting ) + TQ_PROPERTY( int minValue READ minValue WRITE setMinValue ) + TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) + TQ_PROPERTY( int lineStep READ lineStep WRITE setLineStep ) + TQ_PROPERTY( int pageStep READ pageStep WRITE setPageStep ) + TQ_PROPERTY( int value READ value WRITE setValue ) + TQ_PROPERTY( bool tracking READ tracking WRITE setTracking ) + TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) + TQ_PROPERTY( TickSetting tickmarks READ tickmarks WRITE setTickmarks ) + TQ_PROPERTY( int tickInterval READ tickInterval WRITE setTickInterval ) public: enum TickSetting { NoMarks = 0, Above = 1, Left = Above, diff --git a/src/widgets/ntqspinbox.h b/src/widgets/ntqspinbox.h index deb0fd50..11271bbc 100644 --- a/src/widgets/ntqspinbox.h +++ b/src/widgets/ntqspinbox.h @@ -55,18 +55,18 @@ class TQSpinBoxPrivate; class Q_EXPORT TQSpinBox: public TQWidget, public TQRangeControl { TQ_OBJECT - Q_ENUMS( ButtonSymbols ) - Q_PROPERTY( TQString text READ text ) - Q_PROPERTY( TQString prefix READ prefix WRITE setPrefix ) - Q_PROPERTY( TQString suffix READ suffix WRITE setSuffix ) - Q_PROPERTY( TQString cleanText READ cleanText ) - Q_PROPERTY( TQString specialValueText READ specialValueText WRITE setSpecialValueText ) - Q_PROPERTY( bool wrapping READ wrapping WRITE setWrapping ) - Q_PROPERTY( ButtonSymbols buttonSymbols READ buttonSymbols WRITE setButtonSymbols ) - Q_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) - Q_PROPERTY( int minValue READ minValue WRITE setMinValue ) - Q_PROPERTY( int lineStep READ lineStep WRITE setLineStep ) - Q_PROPERTY( int value READ value WRITE setValue ) + TQ_ENUMS( ButtonSymbols ) + TQ_PROPERTY( TQString text READ text ) + TQ_PROPERTY( TQString prefix READ prefix WRITE setPrefix ) + TQ_PROPERTY( TQString suffix READ suffix WRITE setSuffix ) + TQ_PROPERTY( TQString cleanText READ cleanText ) + TQ_PROPERTY( TQString specialValueText READ specialValueText WRITE setSpecialValueText ) + TQ_PROPERTY( bool wrapping READ wrapping WRITE setWrapping ) + TQ_PROPERTY( ButtonSymbols buttonSymbols READ buttonSymbols WRITE setButtonSymbols ) + TQ_PROPERTY( int maxValue READ maxValue WRITE setMaxValue ) + TQ_PROPERTY( int minValue READ minValue WRITE setMinValue ) + TQ_PROPERTY( int lineStep READ lineStep WRITE setLineStep ) + TQ_PROPERTY( int value READ value WRITE setValue ) public: TQSpinBox( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqsplitter.h b/src/widgets/ntqsplitter.h index 1a3742c3..138cdbfd 100644 --- a/src/widgets/ntqsplitter.h +++ b/src/widgets/ntqsplitter.h @@ -86,10 +86,10 @@ public: class Q_EXPORT TQSplitter : public TQFrame { TQ_OBJECT - Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) - Q_PROPERTY( bool opaqueResize READ opaqueResize WRITE setOpaqueResize ) - Q_PROPERTY( int handleWidth READ handleWidth WRITE setHandleWidth ) - Q_PROPERTY( bool childrenCollapsible READ childrenCollapsible WRITE setChildrenCollapsible ) + TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation ) + TQ_PROPERTY( bool opaqueResize READ opaqueResize WRITE setOpaqueResize ) + TQ_PROPERTY( int handleWidth READ handleWidth WRITE setHandleWidth ) + TQ_PROPERTY( bool childrenCollapsible READ childrenCollapsible WRITE setChildrenCollapsible ) public: // ### TQt 4.0: remove Auto from public API diff --git a/src/widgets/ntqstatusbar.h b/src/widgets/ntqstatusbar.h index 53eb8ad5..894d1347 100644 --- a/src/widgets/ntqstatusbar.h +++ b/src/widgets/ntqstatusbar.h @@ -54,7 +54,7 @@ class TQStatusBarPrivate; class Q_EXPORT TQStatusBar: public TQWidget { TQ_OBJECT - Q_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled ) + TQ_PROPERTY( bool sizeGripEnabled READ isSizeGripEnabled WRITE setSizeGripEnabled ) public: TQStatusBar( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqtabbar.h b/src/widgets/ntqtabbar.h index a8271308..1fd1b742 100644 --- a/src/widgets/ntqtabbar.h +++ b/src/widgets/ntqtabbar.h @@ -88,11 +88,11 @@ struct TQTabPrivate; class Q_EXPORT TQTabBar: public TQWidget { TQ_OBJECT - Q_ENUMS( Shape ) - Q_PROPERTY( Shape shape READ shape WRITE setShape ) - Q_PROPERTY( int currentTab READ currentTab WRITE setCurrentTab ) - Q_PROPERTY( int count READ count ) - Q_PROPERTY( int keyboardFocusTab READ keyboardFocusTab ) + TQ_ENUMS( Shape ) + TQ_PROPERTY( Shape shape READ shape WRITE setShape ) + TQ_PROPERTY( int currentTab READ currentTab WRITE setCurrentTab ) + TQ_PROPERTY( int count READ count ) + TQ_PROPERTY( int keyboardFocusTab READ keyboardFocusTab ) public: TQTabBar( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqtabwidget.h b/src/widgets/ntqtabwidget.h index c599d278..0a58cf6a 100644 --- a/src/widgets/ntqtabwidget.h +++ b/src/widgets/ntqtabwidget.h @@ -57,14 +57,14 @@ class TQWidgetStack; class Q_EXPORT TQTabWidget : public TQWidget { TQ_OBJECT - Q_ENUMS( TabPosition ) - Q_ENUMS( TabShape ) - Q_PROPERTY( TabPosition tabPosition READ tabPosition WRITE setTabPosition ) - Q_PROPERTY( TabShape tabShape READ tabShape WRITE setTabShape ) - Q_PROPERTY( int margin READ margin WRITE setMargin ) - Q_PROPERTY( int currentPage READ currentPageIndex WRITE setCurrentPage ) - Q_PROPERTY( int count READ count ) - Q_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) + TQ_ENUMS( TabPosition ) + TQ_ENUMS( TabShape ) + TQ_PROPERTY( TabPosition tabPosition READ tabPosition WRITE setTabPosition ) + TQ_PROPERTY( TabShape tabShape READ tabShape WRITE setTabShape ) + TQ_PROPERTY( int margin READ margin WRITE setMargin ) + TQ_PROPERTY( int currentPage READ currentPageIndex WRITE setCurrentPage ) + TQ_PROPERTY( int count READ count ) + TQ_OVERRIDE( bool autoMask DESIGNABLE true SCRIPTABLE true ) public: TQTabWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/src/widgets/ntqtextbrowser.h b/src/widgets/ntqtextbrowser.h index 6f3f1bab..834f7241 100644 --- a/src/widgets/ntqtextbrowser.h +++ b/src/widgets/ntqtextbrowser.h @@ -55,12 +55,12 @@ class TQTextBrowserData; class Q_EXPORT TQTextBrowser : public TQTextEdit { TQ_OBJECT - Q_PROPERTY( TQString source READ source WRITE setSource ) - Q_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false ) - Q_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false ) - Q_OVERRIDE( bool modified SCRIPTABLE false) - Q_OVERRIDE( bool readOnly DESIGNABLE false SCRIPTABLE false ) - Q_OVERRIDE( bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false ) + TQ_PROPERTY( TQString source READ source WRITE setSource ) + TQ_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false ) + TQ_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false ) + TQ_OVERRIDE( bool modified SCRIPTABLE false) + TQ_OVERRIDE( bool readOnly DESIGNABLE false SCRIPTABLE false ) + TQ_OVERRIDE( bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false ) public: TQTextBrowser( TQWidget* parent=0, const char* name=0 ); diff --git a/src/widgets/ntqtextedit.h b/src/widgets/ntqtextedit.h index fd3c4e02..a001dadc 100644 --- a/src/widgets/ntqtextedit.h +++ b/src/widgets/ntqtextedit.h @@ -138,27 +138,27 @@ class Q_EXPORT TQTextEdit : public TQScrollView friend class TQSyntaxHighlighter; TQ_OBJECT - Q_ENUMS( WordWrap WrapPolicy ) - Q_SETS( AutoFormatting ) - Q_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat ) - Q_PROPERTY( TQString text READ text WRITE setText ) - Q_PROPERTY( TQBrush paper READ paper WRITE setPaper ) - Q_PROPERTY( bool linkUnderline READ linkUnderline WRITE setLinkUnderline ) - Q_PROPERTY( TQString documentTitle READ documentTitle ) - Q_PROPERTY( int length READ length ) - Q_PROPERTY( WordWrap wordWrap READ wordWrap WRITE setWordWrap ) - Q_PROPERTY( int wrapColumnOrWidth READ wrapColumnOrWidth WRITE setWrapColumnOrWidth ) - Q_PROPERTY( WrapPolicy wrapPolicy READ wrapPolicy WRITE setWrapPolicy ) - Q_PROPERTY( bool hasSelectedText READ hasSelectedText ) - Q_PROPERTY( TQString selectedText READ selectedText ) - Q_PROPERTY( int undoDepth READ undoDepth WRITE setUndoDepth ) - Q_PROPERTY( bool overwriteMode READ isOverwriteMode WRITE setOverwriteMode ) - Q_PROPERTY( bool modified READ isModified WRITE setModified DESIGNABLE false ) - Q_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) - Q_PROPERTY( bool undoRedoEnabled READ isUndoRedoEnabled WRITE setUndoRedoEnabled ) - Q_PROPERTY( int tabStopWidth READ tabStopWidth WRITE setTabStopWidth ) - Q_PROPERTY( bool tabChangesFocus READ tabChangesFocus WRITE setTabChangesFocus ) - Q_PROPERTY( AutoFormatting autoFormatting READ autoFormatting WRITE setAutoFormatting ) + TQ_ENUMS( WordWrap WrapPolicy ) + TQ_SETS( AutoFormatting ) + TQ_PROPERTY( TextFormat textFormat READ textFormat WRITE setTextFormat ) + TQ_PROPERTY( TQString text READ text WRITE setText ) + TQ_PROPERTY( TQBrush paper READ paper WRITE setPaper ) + TQ_PROPERTY( bool linkUnderline READ linkUnderline WRITE setLinkUnderline ) + TQ_PROPERTY( TQString documentTitle READ documentTitle ) + TQ_PROPERTY( int length READ length ) + TQ_PROPERTY( WordWrap wordWrap READ wordWrap WRITE setWordWrap ) + TQ_PROPERTY( int wrapColumnOrWidth READ wrapColumnOrWidth WRITE setWrapColumnOrWidth ) + TQ_PROPERTY( WrapPolicy wrapPolicy READ wrapPolicy WRITE setWrapPolicy ) + TQ_PROPERTY( bool hasSelectedText READ hasSelectedText ) + TQ_PROPERTY( TQString selectedText READ selectedText ) + TQ_PROPERTY( int undoDepth READ undoDepth WRITE setUndoDepth ) + TQ_PROPERTY( bool overwriteMode READ isOverwriteMode WRITE setOverwriteMode ) + TQ_PROPERTY( bool modified READ isModified WRITE setModified DESIGNABLE false ) + TQ_PROPERTY( bool readOnly READ isReadOnly WRITE setReadOnly ) + TQ_PROPERTY( bool undoRedoEnabled READ isUndoRedoEnabled WRITE setUndoRedoEnabled ) + TQ_PROPERTY( int tabStopWidth READ tabStopWidth WRITE setTabStopWidth ) + TQ_PROPERTY( bool tabChangesFocus READ tabChangesFocus WRITE setTabChangesFocus ) + TQ_PROPERTY( AutoFormatting autoFormatting READ autoFormatting WRITE setAutoFormatting ) public: enum WordWrap { diff --git a/src/widgets/ntqtextview.h b/src/widgets/ntqtextview.h index 848c692e..342ed0db 100644 --- a/src/widgets/ntqtextview.h +++ b/src/widgets/ntqtextview.h @@ -50,11 +50,11 @@ class Q_EXPORT TQTextView : public TQTextEdit { TQ_OBJECT - Q_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false ) - Q_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false ) - Q_OVERRIDE( bool modified SCRIPTABLE false) - Q_OVERRIDE( bool readOnly DESIGNABLE false SCRIPTABLE false ) - Q_OVERRIDE( bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false ) + TQ_OVERRIDE( int undoDepth DESIGNABLE false SCRIPTABLE false ) + TQ_OVERRIDE( bool overwriteMode DESIGNABLE false SCRIPTABLE false ) + TQ_OVERRIDE( bool modified SCRIPTABLE false) + TQ_OVERRIDE( bool readOnly DESIGNABLE false SCRIPTABLE false ) + TQ_OVERRIDE( bool undoRedoEnabled DESIGNABLE false SCRIPTABLE false ) public: TQTextView( const TQString& text, const TQString& context = TQString::null, diff --git a/src/widgets/ntqtoolbar.h b/src/widgets/ntqtoolbar.h index 52e6127a..2036cc71 100644 --- a/src/widgets/ntqtoolbar.h +++ b/src/widgets/ntqtoolbar.h @@ -55,7 +55,7 @@ class TQToolBarPrivate; class Q_EXPORT TQToolBar: public TQDockWindow { TQ_OBJECT - Q_PROPERTY( TQString label READ label WRITE setLabel ) + TQ_PROPERTY( TQString label READ label WRITE setLabel ) public: TQToolBar( const TQString &label, diff --git a/src/widgets/ntqtoolbox.h b/src/widgets/ntqtoolbox.h index 9ad92aaa..acd200cc 100644 --- a/src/widgets/ntqtoolbox.h +++ b/src/widgets/ntqtoolbox.h @@ -54,8 +54,8 @@ class TQWidgetList; class Q_EXPORT TQToolBox : public TQFrame { TQ_OBJECT - Q_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex ) - Q_PROPERTY( int count READ count ) + TQ_PROPERTY( int currentIndex READ currentIndex WRITE setCurrentIndex ) + TQ_PROPERTY( int count READ count ) public: TQToolBox( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h index e78cf33f..5ac2ad01 100644 --- a/src/widgets/ntqtoolbutton.h +++ b/src/widgets/ntqtoolbutton.h @@ -57,22 +57,22 @@ class TQPopupMenu; class Q_EXPORT TQToolButton : public TQButton { TQ_OBJECT - Q_ENUMS( TextPosition ) - - Q_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet ) - Q_PROPERTY( TQIconSet onIconSet READ onIconSet WRITE setOnIconSet DESIGNABLE false STORED false ) - Q_PROPERTY( TQIconSet offIconSet READ offIconSet WRITE setOffIconSet DESIGNABLE false STORED false ) - Q_PROPERTY( bool usesBigPixmap READ usesBigPixmap WRITE setUsesBigPixmap ) - Q_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel ) - Q_PROPERTY( TQString textLabel READ textLabel WRITE setTextLabel ) - Q_PROPERTY( int popupDelay READ popupDelay WRITE setPopupDelay ) - Q_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise ) - Q_PROPERTY( TextPosition textPosition READ textPosition WRITE setTextPosition ) - - Q_OVERRIDE( bool toggleButton WRITE setToggleButton ) - Q_OVERRIDE( bool on WRITE setOn ) - Q_OVERRIDE( TQPixmap pixmap DESIGNABLE false STORED false ) - Q_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true) + TQ_ENUMS( TextPosition ) + + TQ_PROPERTY( TQIconSet iconSet READ iconSet WRITE setIconSet ) + TQ_PROPERTY( TQIconSet onIconSet READ onIconSet WRITE setOnIconSet DESIGNABLE false STORED false ) + TQ_PROPERTY( TQIconSet offIconSet READ offIconSet WRITE setOffIconSet DESIGNABLE false STORED false ) + TQ_PROPERTY( bool usesBigPixmap READ usesBigPixmap WRITE setUsesBigPixmap ) + TQ_PROPERTY( bool usesTextLabel READ usesTextLabel WRITE setUsesTextLabel ) + TQ_PROPERTY( TQString textLabel READ textLabel WRITE setTextLabel ) + TQ_PROPERTY( int popupDelay READ popupDelay WRITE setPopupDelay ) + TQ_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise ) + TQ_PROPERTY( TextPosition textPosition READ textPosition WRITE setTextPosition ) + + TQ_OVERRIDE( bool toggleButton WRITE setToggleButton ) + TQ_OVERRIDE( bool on WRITE setOn ) + TQ_OVERRIDE( TQPixmap pixmap DESIGNABLE false STORED false ) + TQ_OVERRIDE( BackgroundMode backgroundMode DESIGNABLE true) public: enum TextPosition { diff --git a/src/widgets/ntqtooltip.h b/src/widgets/ntqtooltip.h index 21cb0c39..7a325ade 100644 --- a/src/widgets/ntqtooltip.h +++ b/src/widgets/ntqtooltip.h @@ -56,8 +56,8 @@ class TQListViewToolTip; class Q_EXPORT TQToolTipGroup: public TQObject { TQ_OBJECT - Q_PROPERTY( bool delay READ delay WRITE setDelay ) - Q_PROPERTY( bool enabled READ enabled WRITE setEnabled ) + TQ_PROPERTY( bool delay READ delay WRITE setDelay ) + TQ_PROPERTY( bool enabled READ enabled WRITE setEnabled ) public: TQToolTipGroup( TQObject *parent, const char *name = 0 ); diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h index 95696343..ade5fd7b 100644 --- a/src/widgets/ntqvalidator.h +++ b/src/widgets/ntqvalidator.h @@ -73,8 +73,8 @@ private: class Q_EXPORT TQIntValidator : public TQValidator { TQ_OBJECT - Q_PROPERTY( int bottom READ bottom WRITE setBottom ) - Q_PROPERTY( int top READ top WRITE setTop ) + TQ_PROPERTY( int bottom READ bottom WRITE setBottom ) + TQ_PROPERTY( int top READ top WRITE setTop ) public: TQIntValidator( TQObject * parent, const char *name = 0 ); @@ -105,9 +105,9 @@ private: class Q_EXPORT TQDoubleValidator : public TQValidator { TQ_OBJECT - Q_PROPERTY( double bottom READ bottom WRITE setBottom ) - Q_PROPERTY( double top READ top WRITE setTop ) - Q_PROPERTY( int decimals READ decimals WRITE setDecimals ) + TQ_PROPERTY( double bottom READ bottom WRITE setBottom ) + TQ_PROPERTY( double top READ top WRITE setTop ) + TQ_PROPERTY( int decimals READ decimals WRITE setDecimals ) public: TQDoubleValidator( TQObject * parent, const char *name = 0 ); @@ -140,7 +140,7 @@ private: class Q_EXPORT TQRegExpValidator : public TQValidator { TQ_OBJECT - // Q_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp ) + // TQ_PROPERTY( TQRegExp regExp READ regExp WRITE setRegExp ) public: TQRegExpValidator( TQObject *parent, const char *name = 0 ); diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp index 0f4a28e3..d4cd0b12 100644 --- a/src/widgets/qdockwindow.cpp +++ b/src/widgets/qdockwindow.cpp @@ -308,7 +308,7 @@ static TQPoint realWidgetPos( TQDockWindow *w ) class TQDockWindowHandle : public TQWidget { TQ_OBJECT - Q_PROPERTY( TQString caption READ caption ) + TQ_PROPERTY( TQString caption READ caption ) friend class TQDockWindow; friend class TQDockWindowTitleBar; diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h index bf6e9e81..2317b8da 100644 --- a/src/widgets/qtitlebar_p.h +++ b/src/widgets/qtitlebar_p.h @@ -69,8 +69,8 @@ class TQPixmap; class Q_EXPORT TQTitleBar : public TQWidget { TQ_OBJECT - Q_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise ) - Q_PROPERTY( bool movable READ isMovable WRITE setMovable ) + TQ_PROPERTY( bool autoRaise READ autoRaise WRITE setAutoRaise ) + TQ_PROPERTY( bool movable READ isMovable WRITE setMovable ) public: TQTitleBar (TQWidget* w, TQWidget* parent, const char* name=0); diff --git a/src/workspace/ntqworkspace.h b/src/workspace/ntqworkspace.h index 6d454cce..8a53303e 100644 --- a/src/workspace/ntqworkspace.h +++ b/src/workspace/ntqworkspace.h @@ -63,7 +63,7 @@ class TQDockWindow; class TQM_EXPORT_WORKSPACE TQWorkspace : public TQWidget { TQ_OBJECT - Q_PROPERTY( bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled ) + TQ_PROPERTY( bool scrollBarsEnabled READ scrollBarsEnabled WRITE setScrollBarsEnabled ) #ifdef QT_WORKSPACE_WINDOWMODE public: |