diff options
author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
---|---|---|
committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-18 00:09:52 -0500 |
commit | d1096751ddb25cdef23919c17389fc268c31edaf (patch) | |
tree | b910be3588cb706defc00c31aefa850bb2312784 /src/widgets | |
parent | af8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff) | |
parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
download | tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/qdialogbuttons.cpp | 8 | ||||
-rw-r--r-- | src/widgets/qdialogbuttons_p.h | 6 | ||||
-rw-r--r-- | src/widgets/qeffects.cpp | 16 |
3 files changed, 15 insertions, 15 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!"); diff --git a/src/widgets/qdialogbuttons_p.h b/src/widgets/qdialogbuttons_p.h index 0e7c20d6b..d41c6bea5 100644 --- a/src/widgets/qdialogbuttons_p.h +++ b/src/widgets/qdialogbuttons_p.h @@ -55,10 +55,10 @@ TQDialogButtons : public TQWidget public: enum Button { None=0, Accept=0x01, Reject=0x02, Help=0x04, Apply=0x08, All=0x10, Abort=0x20, Retry=0x40, Ignore=0x80 }; #ifndef QT_NO_DIALOG - TQDialogButtons(TQDialog *parent, bool autoConnect = TRUE, Q_UINT32 buttons = Accept | Reject, + TQDialogButtons(TQDialog *parent, bool autoConnect = TRUE, TQ_UINT32 buttons = Accept | Reject, Orientation orient = Horizontal, const char *name = NULL); #endif // QT_NO_DIALOG - TQDialogButtons(TQWidget *parent, Q_UINT32 buttons = Accept | Reject, + TQDialogButtons(TQWidget *parent, TQ_UINT32 buttons = Accept | Reject, Orientation orient = Horizontal, const char *name = NULL); ~TQDialogButtons(); @@ -112,7 +112,7 @@ signals: private: TQDialogButtonsPrivate *d; - void init(Q_UINT32, Orientation); + void init(TQ_UINT32, Orientation); }; #endif //QT_NO_DIALOGBUTTONS #endif //TQDIALOGBUTTONS_P_H diff --git a/src/widgets/qeffects.cpp b/src/widgets/qeffects.cpp index d2f207912..d431f21b3 100644 --- a/src/widgets/qeffects.cpp +++ b/src/widgets/qeffects.cpp @@ -307,18 +307,18 @@ void TQAlphaWidget::alphaBlend() switch( front.depth() ) { case 32: { - Q_UINT32** md = (Q_UINT32**)mixed.jumpTable(); - Q_UINT32** bd = (Q_UINT32**)back.jumpTable(); - Q_UINT32** fd = (Q_UINT32**)front.jumpTable(); + TQ_UINT32** md = (TQ_UINT32**)mixed.jumpTable(); + TQ_UINT32** bd = (TQ_UINT32**)back.jumpTable(); + TQ_UINT32** fd = (TQ_UINT32**)front.jumpTable(); for (int sy = 0; sy < sh; sy++ ) { - Q_UINT32* bl = ((Q_UINT32*)bd[sy]); - Q_UINT32* fl = ((Q_UINT32*)fd[sy]); + TQ_UINT32* bl = ((TQ_UINT32*)bd[sy]); + TQ_UINT32* fl = ((TQ_UINT32*)fd[sy]); for (int sx = 0; sx < sw; sx++ ) { - Q_UINT32 bp = bl[sx]; - Q_UINT32 fp = fl[sx]; + TQ_UINT32 bp = bl[sx]; + TQ_UINT32 fp = fl[sx]; - ((Q_UINT32*)(md[sy]))[sx] = tqRgb(int (tqRed(bp)*ia + tqRed(fp)*alpha), + ((TQ_UINT32*)(md[sy]))[sx] = tqRgb(int (tqRed(bp)*ia + tqRed(fp)*alpha), int (tqGreen(bp)*ia + tqGreen(fp)*alpha), int (tqBlue(bp)*ia + tqBlue(fp)*alpha) ); } |