summaryrefslogtreecommitdiffstats
path: root/tdestyles
diff options
context:
space:
mode:
Diffstat (limited to 'tdestyles')
-rw-r--r--tdestyles/asteroid/asteroid.cpp10
-rw-r--r--tdestyles/asteroid/asteroid.h10
-rw-r--r--tdestyles/highcolor/highcolor.cpp8
-rw-r--r--tdestyles/highcolor/highcolor.h8
-rw-r--r--tdestyles/highcontrast/highcontrast.cpp14
-rw-r--r--tdestyles/highcontrast/highcontrast.h10
-rw-r--r--tdestyles/keramik/keramik.cpp16
-rw-r--r--tdestyles/keramik/keramik.h12
-rw-r--r--tdestyles/kthemestyle/kthemebase.h8
-rw-r--r--tdestyles/kthemestyle/kthemestyle.cpp2
-rw-r--r--tdestyles/kthemestyle/kthemestyle.h2
-rw-r--r--tdestyles/light/lightstyle-v2.cpp12
-rw-r--r--tdestyles/light/lightstyle-v2.h10
-rw-r--r--tdestyles/light/lightstyle-v3.cpp12
-rw-r--r--tdestyles/light/lightstyle-v3.h10
-rw-r--r--tdestyles/plastik/plastik.cpp10
-rw-r--r--tdestyles/plastik/plastik.h10
17 files changed, 82 insertions, 82 deletions
diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp
index 7c56741a3..45739cff9 100644
--- a/tdestyles/asteroid/asteroid.cpp
+++ b/tdestyles/asteroid/asteroid.cpp
@@ -969,7 +969,7 @@ void AsteroidStyle::drawPrimitive(PrimitiveElement pe,
}
}
-void AsteroidStyle::drawControl(TQ_ControlElement ce,
+void AsteroidStyle::drawControl(ControlElement ce,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1710,7 +1710,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce,
}
}
-void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
+void AsteroidStyle::drawControlMask(ControlElement ce,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1757,7 +1757,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce,
}
}
-void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControl(ComplexControl cc,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -2173,7 +2173,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc,
}
}
-void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc,
+void AsteroidStyle::drawComplexControlMask(ComplexControl cc,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -2373,7 +2373,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat
}
}
-TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc,
+TQRect AsteroidStyle::querySubControlMetrics(ComplexControl cc,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
diff --git a/tdestyles/asteroid/asteroid.h b/tdestyles/asteroid/asteroid.h
index 9f08a01ff..8cea936c0 100644
--- a/tdestyles/asteroid/asteroid.h
+++ b/tdestyles/asteroid/asteroid.h
@@ -58,7 +58,7 @@ public:
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default) const;
- void drawControl(TQ_ControlElement,
+ void drawControl(ControlElement,
TQPainter *,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -68,7 +68,7 @@ public:
const TQStyleOption & = TQStyleOption::Default,
const TQWidget * = 0) const;
- void drawControlMask(TQ_ControlElement,
+ void drawControlMask(ControlElement,
TQPainter *,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -76,7 +76,7 @@ public:
const TQStyleOption &,
const TQWidget * = 0) const;
- void drawComplexControl(TQ_ComplexControl,
+ void drawComplexControl(ComplexControl,
TQPainter *,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -88,7 +88,7 @@ public:
const TQStyleOption & = TQStyleOption::Default,
const TQWidget * = 0) const;
- void drawComplexControlMask(TQ_ComplexControl,
+ void drawComplexControlMask(ComplexControl,
TQPainter *,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -102,7 +102,7 @@ public:
TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
- TQRect querySubControlMetrics(TQ_ComplexControl,
+ TQRect querySubControlMetrics(ComplexControl,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl,
diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp
index ba093b1ca..e2b2ccdaa 100644
--- a/tdestyles/highcolor/highcolor.cpp
+++ b/tdestyles/highcolor/highcolor.cpp
@@ -1144,7 +1144,7 @@ void HighColorStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
}
-void HighColorStyle::drawControl( TQ_ControlElement element,
+void HighColorStyle::drawControl( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1520,7 +1520,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element,
}
-void HighColorStyle::drawControlMask( TQ_ControlElement element,
+void HighColorStyle::drawControlMask( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1548,7 +1548,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element,
}
-void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
+void HighColorStyle::drawComplexControl( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1735,7 +1735,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control,
}
-void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control,
+void HighColorStyle::drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
diff --git a/tdestyles/highcolor/highcolor.h b/tdestyles/highcolor/highcolor.h
index 55b2fce8e..4019dc10b 100644
--- a/tdestyles/highcolor/highcolor.h
+++ b/tdestyles/highcolor/highcolor.h
@@ -90,7 +90,7 @@ class HighColorStyle : public TDEStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void drawControl( TQ_ControlElement element,
+ void drawControl( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -100,7 +100,7 @@ class HighColorStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- void drawControlMask( TQ_ControlElement element,
+ void drawControlMask( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -108,7 +108,7 @@ class HighColorStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- void drawComplexControl( TQ_ComplexControl control,
+ void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -120,7 +120,7 @@ class HighColorStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- void drawComplexControlMask( TQ_ComplexControl control,
+ void drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp
index 7631a5376..5ef1f36d6 100644
--- a/tdestyles/highcontrast/highcontrast.cpp
+++ b/tdestyles/highcontrast/highcontrast.cpp
@@ -784,7 +784,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe,
}
-void HighContrastStyle::drawControl (TQ_ControlElement element,
+void HighContrastStyle::drawControl (ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1162,7 +1162,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element,
}
}
-void HighContrastStyle::drawControlMask (TQ_ControlElement element,
+void HighContrastStyle::drawControlMask (ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1207,7 +1207,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item)
return sibling;
}
-void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
+void HighContrastStyle::drawComplexControl (ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1262,12 +1262,12 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
setColorsButton (p, cg, flags);
// Draw arrows if required
if (controls & SC_SpinWidgetDown) {
- TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags);
+ TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags);
drawRoundRect (p, r2);
drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth);
}
if (controls & SC_SpinWidgetUp) {
- TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags);
+ TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags);
drawRoundRect (p, r2);
drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth);
}
@@ -1490,7 +1490,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control,
}
}
-void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c,
+void HighContrastStyle::drawComplexControlMask(ComplexControl c,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -1535,7 +1535,7 @@ void HighContrastStyle::drawItem( TQPainter *p,
p->restore();
}
-TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
diff --git a/tdestyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h
index 20469a064..688742fb6 100644
--- a/tdestyles/highcontrast/highcontrast.h
+++ b/tdestyles/highcontrast/highcontrast.h
@@ -78,7 +78,7 @@ class HighContrastStyle : public TDEStyle
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void drawControl( TQ_ControlElement element,
+ void drawControl( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -88,7 +88,7 @@ class HighContrastStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- void drawControlMask( TQ_ControlElement element,
+ void drawControlMask( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -96,7 +96,7 @@ class HighContrastStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- void drawComplexControl( TQ_ComplexControl control,
+ void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -108,7 +108,7 @@ class HighContrastStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- void drawComplexControlMask( TQ_ComplexControl control,
+ void drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -116,7 +116,7 @@ class HighContrastStyle : public TDEStyle
const TQStyleOption& = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- TQRect querySubControlMetrics( TQ_ComplexControl control,
+ TQRect querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp
index 404ffbabe..918a96c14 100644
--- a/tdestyles/keramik/keramik.cpp
+++ b/tdestyles/keramik/keramik.cpp
@@ -1380,7 +1380,7 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C
return false;
}
-void KeramikStyle::drawControl( TQ_ControlElement element,
+void KeramikStyle::drawControl( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1603,7 +1603,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
tb->orientation() == TQt::Horizontal);
}
else
- TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
+ TDEStyle::drawControl( (ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags,
r, cg, flags, opt, widget );
break;
}
@@ -1963,7 +1963,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element,
}
}
-void KeramikStyle::drawControlMask( TQ_ControlElement element,
+void KeramikStyle::drawControlMask( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1995,7 +1995,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData &ceDat
}
}
-void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControl( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -2164,7 +2164,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
case CC_SpinWidget:
{
const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget );
- TQRect br = visualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags );
+ TQRect br = visualRect( querySubControlMetrics( (ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags );
if ( controls & SC_SpinWidgetButtonField )
{
Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() );
@@ -2361,7 +2361,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control,
}
}
-void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control,
+void KeramikStyle::drawComplexControlMask( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -2574,7 +2574,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents,
}
-TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQPoint& point,
@@ -2594,7 +2594,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control,
return result;
}
-TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control,
+TQRect KeramikStyle::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
diff --git a/tdestyles/keramik/keramik.h b/tdestyles/keramik/keramik.h
index ba7139c63..23cc0d044 100644
--- a/tdestyles/keramik/keramik.h
+++ b/tdestyles/keramik/keramik.h
@@ -74,7 +74,7 @@ public:
SFlags flags = Style_Default,
const TQStyleOption& = TQStyleOption::Default ) const;
- void drawControl( TQ_ControlElement element,
+ void drawControl( ControlElement element,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -84,7 +84,7 @@ public:
const TQStyleOption& opt = TQStyleOption::Default,
const TQWidget* widget = 0 ) const;
- void drawControlMask( TQ_ControlElement element,
+ void drawControlMask( ControlElement element,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -92,7 +92,7 @@ public:
const TQStyleOption& opt = TQStyleOption::Default,
const TQWidget* widget = 0 ) const;
- void drawComplexControl( TQ_ComplexControl control,
+ void drawComplexControl( ComplexControl control,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -104,7 +104,7 @@ public:
const TQStyleOption& = TQStyleOption::Default,
const TQWidget* widget = 0 ) const;
- void drawComplexControlMask( TQ_ComplexControl control,
+ void drawComplexControlMask( ComplexControl control,
TQPainter* p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -121,14 +121,14 @@ public:
const TQStyleOption& opt,
const TQWidget* widget = 0 ) const;
- SubControl querySubControl( TQ_ComplexControl control,
+ SubControl querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQPoint& point,
const TQStyleOption& opt = TQStyleOption::Default,
const TQWidget* widget = 0 ) const;
- TQRect querySubControlMetrics( TQ_ComplexControl control,
+ TQRect querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
diff --git a/tdestyles/kthemestyle/kthemebase.h b/tdestyles/kthemestyle/kthemebase.h
index 12b2e7908..5317c806c 100644
--- a/tdestyles/kthemestyle/kthemebase.h
+++ b/tdestyles/kthemestyle/kthemebase.h
@@ -517,12 +517,12 @@ protected:
SFlags flags = Style_Default,
const TQStyleOption& option = TQStyleOption::Default ) const
{
- TDEStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg,
+ TDEStyle::drawPrimitive ( pe, p, ceData, elementFlags, r, cg,
flags, option );
}
- virtual void drawControl( TQ_ControlElement element,
+ virtual void drawControl( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -536,7 +536,7 @@ protected:
r, cg, how, opt, widget );
}
- virtual void drawControlMask( TQ_ControlElement element,
+ virtual void drawControlMask( ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -548,7 +548,7 @@ protected:
}
- virtual void drawComplexControl( TQ_ComplexControl control,
+ virtual void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
diff --git a/tdestyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp
index 723b0b764..f9f2c81c4 100644
--- a/tdestyles/kthemestyle/kthemestyle.cpp
+++ b/tdestyles/kthemestyle/kthemestyle.cpp
@@ -2013,7 +2013,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
-void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
+void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
const TQRect & r, const TQColorGroup & g, SFlags how ,
SCFlags controls, SCFlags active,
const TQStyleOption & opt, const TQWidget * widget ) const
diff --git a/tdestyles/kthemestyle/kthemestyle.h b/tdestyles/kthemestyle/kthemestyle.h
index e53187b2f..029301aae 100644
--- a/tdestyles/kthemestyle/kthemestyle.h
+++ b/tdestyles/kthemestyle/kthemestyle.h
@@ -104,7 +104,7 @@ public:
const TQWidget *widget = 0 ) const;
- virtual void drawComplexControl( TQ_ComplexControl control,
+ virtual void drawComplexControl( ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
diff --git a/tdestyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp
index 6e6cfa788..fbf197b88 100644
--- a/tdestyles/light/lightstyle-v2.cpp
+++ b/tdestyles/light/lightstyle-v2.cpp
@@ -642,7 +642,7 @@ void LightStyleV2::drawPrimitive( PrimitiveElement pe,
}
}
-void LightStyleV2::drawControl( TQ_ControlElement control,
+void LightStyleV2::drawControl( ControlElement control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -999,7 +999,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control,
}
}
-void LightStyleV2::drawControlMask( TQ_ControlElement control,
+void LightStyleV2::drawControlMask( ControlElement control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1045,7 +1045,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQStyleControlElementData &c
return rect;
}
-void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
+void LightStyleV2::drawComplexControl( ComplexControl control,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1119,7 +1119,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
TQRect frame, up, down;
- frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags,
+ frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags,
SC_SpinWidgetFrame, data, widget);
up = ceData.spinWidgetData.upRect;
down = ceData.spinWidgetData.downRect;
@@ -1329,7 +1329,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control,
}
}
-TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
+TQRect LightStyleV2::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
@@ -1424,7 +1424,7 @@ TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control,
return ret;
}
-TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQPoint &pos,
diff --git a/tdestyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h
index 2151d7f55..17240ac88 100644
--- a/tdestyles/light/lightstyle-v2.h
+++ b/tdestyles/light/lightstyle-v2.h
@@ -48,23 +48,23 @@ public:
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+ void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
- void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+ void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
- void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+ void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
SCFlags = SC_All, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
- TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
+ TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
- SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
+ SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const;
int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;
diff --git a/tdestyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp
index 38159134c..790c03d79 100644
--- a/tdestyles/light/lightstyle-v3.cpp
+++ b/tdestyles/light/lightstyle-v3.cpp
@@ -830,7 +830,7 @@ void LightStyleV3::drawPrimitive( PrimitiveElement pe,
}
}
-void LightStyleV3::drawControl( TQ_ControlElement control,
+void LightStyleV3::drawControl( ControlElement control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1114,7 +1114,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control,
}
}
-void LightStyleV3::drawControlMask( TQ_ControlElement control,
+void LightStyleV3::drawControlMask( ControlElement control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1178,7 +1178,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQStyleControlElementData &c
return rect;
}
-void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
+void LightStyleV3::drawComplexControl( ComplexControl control,
TQPainter* p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1248,7 +1248,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget;
TQRect frame, up, down;
- frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags,
+ frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags,
SC_SpinWidgetFrame, data, widget);
up = ceData.spinWidgetData.upRect;
down = ceData.spinWidgetData.downRect;
@@ -1455,7 +1455,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control,
}
}
-TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
+TQRect LightStyleV3::querySubControlMetrics( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl sc,
@@ -1606,7 +1606,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control,
return ret;
}
-TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control,
+TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
const TQPoint &pos,
diff --git a/tdestyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h
index 7c2ba8e65..8f03cca74 100644
--- a/tdestyles/light/lightstyle-v3.h
+++ b/tdestyles/light/lightstyle-v3.h
@@ -52,23 +52,23 @@ public:
SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default ) const;
- void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+ void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
- void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+ void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const;
TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const;
- void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
+ void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
const TQColorGroup &, SFlags = Style_Default,
SCFlags = SC_All, SCFlags = SC_None,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
- TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
+ TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl,
const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
- SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
+ SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &,
const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const;
int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const;
diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp
index 06816aa32..01026122f 100644
--- a/tdestyles/plastik/plastik.cpp
+++ b/tdestyles/plastik/plastik.cpp
@@ -2181,7 +2181,7 @@ void PlastikStyle::drawPrimitive(PrimitiveElement pe,
}
-void PlastikStyle::drawControl(TQ_ControlElement element,
+void PlastikStyle::drawControl(ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -2737,7 +2737,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element,
}
}
-void PlastikStyle::drawControlMask(TQ_ControlElement element,
+void PlastikStyle::drawControlMask(ControlElement element,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -2759,7 +2759,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element,
}
}
-void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
+void PlastikStyle::drawComplexControlMask(ComplexControl c,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
@@ -2782,7 +2782,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c,
}
}
-void PlastikStyle::drawComplexControl(TQ_ComplexControl control,
+void PlastikStyle::drawComplexControl(ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -3199,7 +3199,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData,
}
}
-TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control,
+TQRect PlastikStyle::querySubControlMetrics(ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
diff --git a/tdestyles/plastik/plastik.h b/tdestyles/plastik/plastik.h
index b1edd6c04..89946fd48 100644
--- a/tdestyles/plastik/plastik.h
+++ b/tdestyles/plastik/plastik.h
@@ -85,7 +85,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,
@@ -95,9 +95,9 @@ 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(TQ_ComplexControl control,
+ void drawComplexControl(ComplexControl control,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -115,14 +115,14 @@ public:
TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags,
const TQWidget *widget ) const;
- TQRect querySubControlMetrics(TQ_ComplexControl control,
+ TQRect querySubControlMetrics(ComplexControl control,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
SubControl subcontrol,
const TQStyleOption &opt = TQStyleOption::Default,
const TQWidget *widget = 0 ) const;
- void drawComplexControlMask(TQStyle::TQ_ComplexControl c,
+ void drawComplexControlMask(TQStyle::ComplexControl c,
TQPainter *p,
const TQStyleControlElementData &ceData,
const ControlElementFlags elementFlags,
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 08:10:57 +0000