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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/widgets/qdialogbuttons.cpp b/src/widgets/qdialogbuttons.cpp
index a14eec3a2..0762e6c79 100644
--- a/src/widgets/qdialogbuttons.cpp
+++ b/src/widgets/qdialogbuttons.cpp
@@ -56,14 +56,14 @@ struct TQDialogButtonsPrivate
     TQMap<int, TQString> text;
     TQMap<TQDialogButtons::Button, TQWidget *> buttons;
     TQGuardedPtr<TQWidget> custom;
-    Q_UINT32 enabled, visible;
+    TQ_UINT32 enabled, visible;
     TQDialogButtons::Button def;
     TQt::Orientation orient;
     bool questionMode;
 };
 
 #ifndef QT_NO_DIALOG
-TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, Q_UINT32 buttons,
+TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, TQ_UINT32 buttons,
 			       Orientation orient, const char *name ) : TQWidget(parent, name)
 {
     init(buttons, orient);
@@ -74,14 +74,14 @@ TQDialogButtons::TQDialogButtons(TQDialog *parent, bool autoConnect, Q_UINT32 bu
 }
 #endif // QT_NO_DIALOG
 
-TQDialogButtons::TQDialogButtons(TQWidget *parent, Q_UINT32 buttons, 
+TQDialogButtons::TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons, 
 			       Orientation orient, const char *name ) : TQWidget(parent, name)
 {
     init(buttons, orient);
 }
 
 void
-TQDialogButtons::init(Q_UINT32 buttons, Orientation orient)
+TQDialogButtons::init(TQ_UINT32 buttons, Orientation orient)
 {
     if(buttons == All) {
 	tqWarning("TQDialogButtons: cannot specify All by itself!");