Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3

6 files changed, 29 insertions, 29 deletions

diff --git a/src/dialogs/ntqdialog.h b/src/dialogs/ntqdialog.h
index 113703d6f..5c9e1499f 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 aeaee742a..577958bc5 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 50522e813..c4436dfc4 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 77b8af109..404fa5e3d 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 d0c90b384..d9fb8d1cc 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 a4863f868..7efb55ff6 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 );