summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-20 20:01:48 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-10-20 20:01:48 -0500
commit7608f0043b6dfc0b1adcaa8912793e1d3fe7b636 (patch)
tree7ffddfefaf990c9a33ee6a0f317b9133dc58305c /tools
parentedec8306fb4f7dab5e6b0f368e889581f38ea3bc (diff)
downloadtqt3-7608f0043b6dfc0b1adcaa8912793e1d3fe7b636.tar.gz
tqt3-7608f0043b6dfc0b1adcaa8912793e1d3fe7b636.zip
Automated update from Qt3
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/lib/ntqassistantclient.h2
-rw-r--r--tools/designer/designer/formwindow.h2
-rw-r--r--tools/designer/designer/layout.h12
-rw-r--r--tools/designer/designer/propertyeditor.cpp2
-rw-r--r--tools/designer/designer/qcompletionedit.h4
-rw-r--r--tools/designer/designer/styledbutton.h10
-rw-r--r--tools/designer/designer/widgetfactory.h46
-rw-r--r--tools/designer/examples/filechooser/widget/filechooser.h6
-rw-r--r--tools/designer/examples/opengl/glwidget.h8
-rw-r--r--tools/designer/examples/sizeaware/sizeaware.h4
10 files changed, 48 insertions, 48 deletions
diff --git a/tools/assistant/lib/ntqassistantclient.h b/tools/assistant/lib/ntqassistantclient.h
index 9adf7830a..fc309cf29 100644
--- a/tools/assistant/lib/ntqassistantclient.h
+++ b/tools/assistant/lib/ntqassistantclient.h
@@ -42,7 +42,7 @@ class TQProcess;
class TQAssistantClient : public TQObject
{
TQ_OBJECT
- Q_PROPERTY( bool open READ isOpen )
+ TQ_PROPERTY( bool open READ isOpen )
public:
TQAssistantClient( const TQString &path, TQObject *parent = 0, const char *name = 0 );
diff --git a/tools/designer/designer/formwindow.h b/tools/designer/designer/formwindow.h
index 130d719a3..cfbfed213 100644
--- a/tools/designer/designer/formwindow.h
+++ b/tools/designer/designer/formwindow.h
@@ -72,7 +72,7 @@ class OrderIndicator;
class FormWindow : public TQWidget
{
TQ_OBJECT
- Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+ TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
public:
FormWindow( FormFile *f, MainWindow *mw, TQWidget *parent, const char *name = 0 );
diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h
index 85b5b6af8..c9dab83ae 100644
--- a/tools/designer/designer/layout.h
+++ b/tools/designer/designer/layout.h
@@ -126,12 +126,12 @@ class Spacer : public TQWidget
{
TQ_OBJECT
- Q_OVERRIDE( TQCString name )
- Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
- Q_ENUMS( SizeType )
- Q_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
- Q_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
- Q_OVERRIDE( TQRect geometry DESIGNABLE false )
+ TQ_OVERRIDE( TQCString name )
+ TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+ TQ_ENUMS( SizeType )
+ TQ_PROPERTY( SizeType sizeType READ sizeType WRITE setSizeType )
+ TQ_PROPERTY( TQSize sizeHint READ sizeHint WRITE setSizeHint DESIGNABLE true STORED true )
+ TQ_OVERRIDE( TQRect geometry DESIGNABLE false )
private:
enum { HSize = 6, HMask = 0x3f, VMask = HMask << HSize,
diff --git a/tools/designer/designer/propertyeditor.cpp b/tools/designer/designer/propertyeditor.cpp
index cfb20c47e..27f9bfeb5 100644
--- a/tools/designer/designer/propertyeditor.cpp
+++ b/tools/designer/designer/propertyeditor.cpp
@@ -3141,7 +3141,7 @@ void PropertyList::setupProperties()
continue;
if ( qstrcmp( p->name(), "maximumWidth" ) == 0 )
continue;
- if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in Q_PROPERTY can take a function (isInButtonGroup() in this case)
+ if ( qstrcmp( p->name(), "buttonGroupId" ) == 0 ) { // #### remove this when designable in TQ_PROPERTY can take a function (isInButtonGroup() in this case)
if ( !editor->widget()->isWidgetType() ||
!editor->widget()->parent() ||
!::tqt_cast<TQButtonGroup*>(editor->widget()->parent()) )
diff --git a/tools/designer/designer/qcompletionedit.h b/tools/designer/designer/qcompletionedit.h
index fcc8b4aec..98caedba6 100644
--- a/tools/designer/designer/qcompletionedit.h
+++ b/tools/designer/designer/qcompletionedit.h
@@ -43,8 +43,8 @@ class TQVBox;
class TQCompletionEdit : public TQLineEdit
{
TQ_OBJECT
- Q_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd )
- Q_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
+ TQ_PROPERTY( bool autoAdd READ autoAdd WRITE setAutoAdd )
+ TQ_PROPERTY( bool caseSensitive READ isCaseSensitive WRITE setCaseSensitive )
public:
TQCompletionEdit( TQWidget *parent = 0, const char *name = 0 );
diff --git a/tools/designer/designer/styledbutton.h b/tools/designer/designer/styledbutton.h
index e9639d03b..81cc634be 100644
--- a/tools/designer/designer/styledbutton.h
+++ b/tools/designer/designer/styledbutton.h
@@ -45,12 +45,12 @@ class StyledButton : public TQButton
{
TQ_OBJECT
- Q_PROPERTY( TQColor color READ color WRITE setColor )
- Q_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
- Q_PROPERTY( EditorType editor READ editor WRITE setEditor )
- Q_PROPERTY( bool scale READ scale WRITE setScale )
+ TQ_PROPERTY( TQColor color READ color WRITE setColor )
+ TQ_PROPERTY( TQPixmap pixmap READ pixmap WRITE setPixmap )
+ TQ_PROPERTY( EditorType editor READ editor WRITE setEditor )
+ TQ_PROPERTY( bool scale READ scale WRITE setScale )
- Q_ENUMS( EditorType )
+ TQ_ENUMS( EditorType )
public:
enum EditorType { ColorEditor, PixmapEditor };
diff --git a/tools/designer/designer/widgetfactory.h b/tools/designer/designer/widgetfactory.h
index 55d229077..c49066b4f 100644
--- a/tools/designer/designer/widgetfactory.h
+++ b/tools/designer/designer/widgetfactory.h
@@ -129,9 +129,9 @@ private:
class TQDesignerTabWidget : public TQTabWidget
{
TQ_OBJECT
- Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
- Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
- Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+ TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
+ TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
+ TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
public:
TQDesignerTabWidget( TQWidget *parent, const char *name );
@@ -158,8 +158,8 @@ private:
class TQDesignerWidgetStack : public TQWidgetStack
{
TQ_OBJECT
- Q_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
- Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+ TQ_PROPERTY( int currentPage READ currentPage WRITE setCurrentPage STORED false DESIGNABLE true )
+ TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
public:
TQDesignerWidgetStack( TQWidget *parent, const char *name );
@@ -201,10 +201,10 @@ private:
class TQDesignerWizard : public TQWizard
{
TQ_OBJECT
- Q_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true )
- Q_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
- Q_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
- Q_OVERRIDE( bool modal READ isModal WRITE setModal )
+ TQ_PROPERTY( int currentPage READ currentPageNum WRITE setCurrentPage STORED false DESIGNABLE true )
+ TQ_PROPERTY( TQString pageTitle READ pageTitle WRITE setPageTitle STORED false DESIGNABLE true )
+ TQ_PROPERTY( TQCString pageName READ pageName WRITE setPageName STORED false DESIGNABLE true )
+ TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
public:
TQDesignerWizard( TQWidget *parent, const char *name )
@@ -294,11 +294,11 @@ class Line : public TQFrame
{
TQ_OBJECT
- Q_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
- Q_OVERRIDE( int frameWidth DESIGNABLE false )
- Q_OVERRIDE( Shape frameShape DESIGNABLE false )
- Q_OVERRIDE( TQRect frameRect DESIGNABLE false )
- Q_OVERRIDE( TQRect contentsRect DESIGNABLE false )
+ TQ_PROPERTY( Orientation orientation READ orientation WRITE setOrientation )
+ TQ_OVERRIDE( int frameWidth DESIGNABLE false )
+ TQ_OVERRIDE( Shape frameShape DESIGNABLE false )
+ TQ_OVERRIDE( TQRect frameRect DESIGNABLE false )
+ TQ_OVERRIDE( TQRect contentsRect DESIGNABLE false )
public:
Line( TQWidget *parent, const char *name )
: TQFrame( parent, name, WMouseNoMask ) {
@@ -320,7 +320,7 @@ class TQDesignerLabel : public TQLabel
{
TQ_OBJECT
- Q_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
+ TQ_PROPERTY( TQCString buddy READ buddyWidget WRITE setBuddyWidget )
public:
TQDesignerLabel( TQWidget *parent = 0, const char *name = 0 )
@@ -371,7 +371,7 @@ private:
class TQDesignerDialog : public TQDialog
{
TQ_OBJECT
- Q_OVERRIDE( bool modal READ isModal WRITE setModal )
+ TQ_OVERRIDE( bool modal READ isModal WRITE setModal )
public:
TQDesignerDialog( FormWindow *fw, TQWidget *parent, const char *name )
@@ -392,7 +392,7 @@ private:
class TQDesignerToolButton : public TQToolButton
{
TQ_OBJECT
- Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+ TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
public:
TQDesignerToolButton( TQWidget *parent, const char *name )
@@ -415,7 +415,7 @@ public:
class TQDesignerRadioButton : public TQRadioButton
{
TQ_OBJECT
- Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+ TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
public:
TQDesignerRadioButton( TQWidget *parent, const char *name )
@@ -440,7 +440,7 @@ public:
class TQDesignerPushButton : public TQPushButton
{
TQ_OBJECT
- Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+ TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
public:
TQDesignerPushButton( TQWidget *parent, const char *name )
@@ -464,7 +464,7 @@ public:
class TQDesignerCheckBox : public TQCheckBox
{
TQ_OBJECT
- Q_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
+ TQ_PROPERTY( int buttonGroupId READ buttonGroupId WRITE setButtonGroupId )
public:
TQDesignerCheckBox( TQWidget *parent, const char *name )
@@ -488,9 +488,9 @@ public:
class TQDesignerToolBox : public TQToolBox
{
TQ_OBJECT
- Q_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true )
- Q_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true )
- Q_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
+ TQ_PROPERTY( TQString itemLabel READ itemLabel WRITE setItemLabel STORED false DESIGNABLE true )
+ TQ_PROPERTY( TQCString itemName READ itemName WRITE setItemName STORED false DESIGNABLE true )
+ TQ_PROPERTY( BackgroundMode itemBackgroundMode READ itemBackgroundMode WRITE setItemBackgroundMode STORED false DESIGNABLE true )
public:
TQDesignerToolBox( TQWidget *parent, const char *name );
diff --git a/tools/designer/examples/filechooser/widget/filechooser.h b/tools/designer/examples/filechooser/widget/filechooser.h
index 8a8232946..4210dc24c 100644
--- a/tools/designer/examples/filechooser/widget/filechooser.h
+++ b/tools/designer/examples/filechooser/widget/filechooser.h
@@ -16,9 +16,9 @@ class QT_WIDGET_PLUGIN_EXPORT FileChooser : public TQWidget
{
TQ_OBJECT
- Q_ENUMS( Mode )
- Q_PROPERTY( Mode mode READ mode WRITE setMode )
- Q_PROPERTY( TQString fileName READ fileName WRITE setFileName )
+ TQ_ENUMS( Mode )
+ TQ_PROPERTY( Mode mode READ mode WRITE setMode )
+ TQ_PROPERTY( TQString fileName READ fileName WRITE setFileName )
public:
FileChooser( TQWidget *parent = 0, const char *name = 0);
diff --git a/tools/designer/examples/opengl/glwidget.h b/tools/designer/examples/opengl/glwidget.h
index 43d68783b..565efb4a5 100644
--- a/tools/designer/examples/opengl/glwidget.h
+++ b/tools/designer/examples/opengl/glwidget.h
@@ -40,10 +40,10 @@
class GLWidget : public TQGLWidget
{
TQ_OBJECT
- Q_PROPERTY( double xRot READ xRot WRITE setXRot )
- Q_PROPERTY( double yRot READ yRot WRITE setYRot )
- Q_PROPERTY( double zRot READ zRot WRITE setZRot )
- Q_PROPERTY( double scale READ scale WRITE setScale )
+ TQ_PROPERTY( double xRot READ xRot WRITE setXRot )
+ TQ_PROPERTY( double yRot READ yRot WRITE setYRot )
+ TQ_PROPERTY( double zRot READ zRot WRITE setZRot )
+ TQ_PROPERTY( double scale READ scale WRITE setScale )
public:
GLWidget( TQWidget* parent, const char* name );
diff --git a/tools/designer/examples/sizeaware/sizeaware.h b/tools/designer/examples/sizeaware/sizeaware.h
index 8e1adaae1..b939cfe4e 100644
--- a/tools/designer/examples/sizeaware/sizeaware.h
+++ b/tools/designer/examples/sizeaware/sizeaware.h
@@ -5,8 +5,8 @@
class SizeAware : public TQDialog
{
TQ_OBJECT
- Q_PROPERTY( TQString company READ company WRITE setCompany )
- Q_PROPERTY( TQString settingsFile READ settingsFile WRITE setSettingsFile )
+ TQ_PROPERTY( TQString company READ company WRITE setCompany )
+ TQ_PROPERTY( TQString settingsFile READ settingsFile WRITE setSettingsFile )
public:
SizeAware( TQDialog *parent = 0, const char *name = 0, bool modal = FALSE );
~SizeAware();