Replace various tqtinterface's TQ_* defines with actual types

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3b2945d7a9)
r14.1.x
Michele Calgaro 1 year ago
parent dbcdda9374
commit 9fa5c7dee8
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -425,7 +425,7 @@ void dotNETstyle::drawTDEStylePrimitive(TDEStylePrimitive kpe,
// This function draws primitive elements as well as their masks. // This function draws primitive elements as well as their masks.
void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe, void dotNETstyle::drawPrimitive(PrimitiveElement pe,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -1625,7 +1625,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
case CC_SpinWidget: { case CC_SpinWidget: {
const TQSpinWidget *sw = (const TQSpinWidget *) widget; const TQSpinWidget *sw = (const TQSpinWidget *) widget;
SFlags flags; SFlags flags;
TQ_PrimitiveElement pe; PrimitiveElement pe;
TQRect swf = querySubControlMetrics(control, ceData, elementFlags, SC_SpinWidgetFrame, TQStyleOption::Default, sw); TQRect swf = querySubControlMetrics(control, ceData, elementFlags, SC_SpinWidgetFrame, TQStyleOption::Default, sw);
swf = visualRect( swf, ceData, elementFlags ); swf = visualRect( swf, ceData, elementFlags );

@ -57,7 +57,7 @@ public:
const TQStyleOption& = TQStyleOption::Default, const TQStyleOption& = TQStyleOption::Default,
const TQWidget* widget = 0 ) const; const TQWidget* widget = 0 ) const;
void drawPrimitive( TQ_PrimitiveElement pe, void drawPrimitive( PrimitiveElement pe,
TQPainter *p, TQPainter *p,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -118,7 +118,7 @@ public:
const TQStyleOption &o, const TQStyleOption &o,
const TQWidget *w = 0) const; const TQWidget *w = 0) const;
int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQStyleOption & = TQStyleOption::Default, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;

@ -576,7 +576,7 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter,
// --------------- // ---------------
// Draw the primitive element // Draw the primitive element
void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element, void PhaseStyle::drawPrimitive(PrimitiveElement element,
TQPainter *painter, TQPainter *painter,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -696,7 +696,7 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element,
drawPhaseBevel(painter, x, y, w, h, drawPhaseBevel(painter, x, y, w, h,
group, group.button(), down, !horiz, true); group, group.button(), down, !horiz, true);
TQ_PrimitiveElement arrow = ((horiz) ? PrimitiveElement arrow = ((horiz) ?
((element == PE_ScrollBarAddLine) ? ((element == PE_ScrollBarAddLine) ?
PE_ArrowRight : PE_ArrowLeft) : PE_ArrowRight : PE_ArrowLeft) :
((element == PE_ScrollBarAddLine) ? ((element == PE_ScrollBarAddLine) ?
@ -1492,7 +1492,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element,
} }
if (mi->popup()) { // draw submenu arrow if (mi->popup()) { // draw submenu arrow
TQ_PrimitiveElement arrow = reverse_ ? PE_ArrowLeft : PE_ArrowRight; PrimitiveElement arrow = reverse_ ? PE_ArrowLeft : PE_ArrowRight;
int dim = (h-2*ITEMFRAME) / 2; int dim = (h-2*ITEMFRAME) / 2;
vrect = visualRect(TQRect(x + w - ARROWMARGIN - ITEMFRAME - dim, vrect = visualRect(TQRect(x + w - ARROWMARGIN - ITEMFRAME - dim,
y + h / 2 - dim / 2, dim, dim), rect); y + h / 2 - dim / 2, dim, dim), rect);
@ -1784,7 +1784,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
return; return;
} }
TQ_PrimitiveElement element; PrimitiveElement element;
// draw frame // draw frame
if (controls & SC_SpinWidgetFrame) { if (controls & SC_SpinWidgetFrame) {

@ -67,7 +67,7 @@ class PhaseStyle : public TDEStyle
void polish(TQPalette &pal); void polish(TQPalette &pal);
void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
void drawPrimitive(TQ_PrimitiveElement element, void drawPrimitive(PrimitiveElement element,
TQPainter *painter, TQPainter *painter,
const TQStyleControlElementData &ceData, const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags, ControlElementFlags elementFlags,
@ -143,7 +143,7 @@ class PhaseStyle : public TDEStyle
const TQStyleOption& option = TQStyleOption::Default, const TQStyleOption& option = TQStyleOption::Default,
const TQWidget *widget = 0) const; const TQWidget *widget = 0) const;
int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQStyleOption & = TQStyleOption::Default, const TQStyleOption & = TQStyleOption::Default,
TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;

Loading…
Cancel
Save