summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--styles/dotnet/dotnet.cpp4
-rw-r--r--styles/dotnet/dotnet.h4
-rw-r--r--styles/phase/phasestyle.cpp10
-rw-r--r--styles/phase/phasestyle.h10
4 files changed, 14 insertions, 14 deletions
diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index defe823d..089170b4 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -797,7 +797,7 @@ void dotNETstyle::drawPrimitive(PrimitiveElement pe,
}
-void dotNETstyle::drawControl(TQ_ControlElement element,
+void dotNETstyle::drawControl(ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1403,7 +1403,7 @@ void dotNETstyle::drawControl(TQ_ControlElement element,
}
}
-void dotNETstyle::drawControlMask(TQ_ControlElement element,
+void dotNETstyle::drawControlMask(ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h
index ea06b093..0123811d 100644
--- a/styles/dotnet/dotnet.h
+++ b/styles/dotnet/dotnet.h
@@ -66,7 +66,7 @@ public:
SFlags flags = Style_Default,
const TQStyleOption &opt = TQStyleOption::Default ) const;
- void drawControl( TQ_ControlElement element,
+ void drawControl( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -76,7 +76,7 @@ public:
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- void drawControlMask( TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const;
+ void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const;
void drawComplexControl( ComplexControl control,
TQPainter *p,
diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp
index 1185048d..b19682bf 100644
--- a/styles/phase/phasestyle.cpp
+++ b/styles/phase/phasestyle.cpp
@@ -1153,7 +1153,7 @@ void PhaseStyle::drawTDEStylePrimitive(TDEStylePrimitive element,
// -------------
// Draw the control
-void PhaseStyle::drawControl(TQ_ControlElement element,
+void PhaseStyle::drawControl(ControlElement element,
TQPainter *painter,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1597,7 +1597,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element,
// -----------------
// Draw a bitmask for the element
-void PhaseStyle::drawControlMask(TQ_ControlElement element,
+void PhaseStyle::drawControlMask(ControlElement element,
TQPainter *painter,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1621,7 +1621,7 @@ void PhaseStyle::drawControlMask(TQ_ControlElement element,
// --------------------
// Draw a complex control
-void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
+void PhaseStyle::drawComplexControl(ComplexControl control,
TQPainter *painter,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1919,7 +1919,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
// ------------------------
// Draw a bitmask for the control
-void PhaseStyle::drawComplexControlMask(TQ_ComplexControl control,
+void PhaseStyle::drawComplexControlMask(ComplexControl control,
TQPainter *painter,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -2030,7 +2030,7 @@ TQRect PhaseStyle::subRect(SubRect rect, const TQStyleControlElementData &ceData
// ------------------------
// Get metrics for subcontrols of complex controls
-TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control,
+TQRect PhaseStyle::querySubControlMetrics(ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h
index 6c620250..bba45997 100644
--- a/styles/phase/phasestyle.h
+++ b/styles/phase/phasestyle.h
@@ -86,7 +86,7 @@ class PhaseStyle : public TDEStyle
const TQStyleOption &option = TQStyleOption::Default,
const TQWidget *widget = 0) const;
- void drawControl(TQ_ControlElement element,
+ void drawControl(ControlElement element,
TQPainter *painter,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -96,7 +96,7 @@ class PhaseStyle : public TDEStyle
const TQStyleOption &option = TQStyleOption::Default,
const TQWidget *widget = 0) const;
- void drawControlMask(TQ_ControlElement element,
+ void drawControlMask(ControlElement element,
TQPainter *painter,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -104,7 +104,7 @@ class PhaseStyle : public TDEStyle
const TQStyleOption &option = TQStyleOption::Default,
const TQWidget *widget = 0) const;
- void drawComplexControl(TQ_ComplexControl control,
+ void drawComplexControl(ComplexControl control,
TQPainter *painter,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -116,7 +116,7 @@ class PhaseStyle : public TDEStyle
const TQStyleOption &option = TQStyleOption::Default,
const TQWidget *widget = 0) const;
- void drawComplexControlMask(TQ_ComplexControl control,
+ void drawComplexControlMask(ComplexControl control,
TQPainter *painter,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -129,7 +129,7 @@ class PhaseStyle : public TDEStyle
TQRect subRect(SubRect rect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0) const;
- TQRect querySubControlMetrics(TQ_ComplexControl control,
+ TQRect querySubControlMetrics(ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,