summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2023-09-12 21:15:07 +0900
committerMichele Calgaro <[email protected]>2023-09-12 21:15:07 +0900
commit3b2945d7a9f4abad5ce52316ec8c68264a7aa11f (patch)
treecfd8b7af235d07b19aaf90ea79699f974ee88e61
parent2df72b22c58bd6f986ee65e476314514996de9a6 (diff)
downloadtdeartwork-3b2945d7a9f4abad5ce52316ec8c68264a7aa11f.tar.gz
tdeartwork-3b2945d7a9f4abad5ce52316ec8c68264a7aa11f.zip
Replace various tqtinterface's TQ_* defines with actual types
Signed-off-by: Michele Calgaro <[email protected]>
-rw-r--r--styles/dotnet/dotnet.cpp4
-rw-r--r--styles/dotnet/dotnet.h4
-rw-r--r--styles/phase/phasestyle.cpp8
-rw-r--r--styles/phase/phasestyle.h4
4 files changed, 10 insertions, 10 deletions
diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index 484aec19..0a6e8027 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -425,7 +425,7 @@ void dotNETstyle::drawTDEStylePrimitive(TDEStylePrimitive kpe,
// This function draws primitive elements as well as their masks.
-void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe,
+void dotNETstyle::drawPrimitive(PrimitiveElement pe,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -1625,7 +1625,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control,
case CC_SpinWidget: {
const TQSpinWidget *sw = (const TQSpinWidget *) widget;
SFlags flags;
- TQ_PrimitiveElement pe;
+ PrimitiveElement pe;
TQRect swf = querySubControlMetrics(control, ceData, elementFlags, SC_SpinWidgetFrame, TQStyleOption::Default, sw);
swf = visualRect( swf, ceData, elementFlags );
diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h
index a90c624a..ea06b093 100644
--- a/styles/dotnet/dotnet.h
+++ b/styles/dotnet/dotnet.h
@@ -57,7 +57,7 @@ public:
const TQStyleOption& = TQStyleOption::Default,
const TQWidget* widget = 0 ) const;
- void drawPrimitive( TQ_PrimitiveElement pe,
+ void drawPrimitive( PrimitiveElement pe,
TQPainter *p,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -118,7 +118,7 @@ public:
const TQStyleOption &o,
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,
TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;
diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp
index 0e713362..6e75e953 100644
--- a/styles/phase/phasestyle.cpp
+++ b/styles/phase/phasestyle.cpp
@@ -576,7 +576,7 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter,
// ---------------
// Draw the primitive element
-void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element,
+void PhaseStyle::drawPrimitive(PrimitiveElement element,
TQPainter *painter,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -696,7 +696,7 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element,
drawPhaseBevel(painter, x, y, w, h,
group, group.button(), down, !horiz, true);
- TQ_PrimitiveElement arrow = ((horiz) ?
+ PrimitiveElement arrow = ((horiz) ?
((element == PE_ScrollBarAddLine) ?
PE_ArrowRight : PE_ArrowLeft) :
((element == PE_ScrollBarAddLine) ?
@@ -1492,7 +1492,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element,
}
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;
vrect = visualRect(TQRect(x + w - ARROWMARGIN - ITEMFRAME - dim,
y + h / 2 - dim / 2, dim, dim), rect);
@@ -1784,7 +1784,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
return;
}
- TQ_PrimitiveElement element;
+ PrimitiveElement element;
// draw frame
if (controls & SC_SpinWidgetFrame) {
diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h
index 0fb51f19..6c620250 100644
--- a/styles/phase/phasestyle.h
+++ b/styles/phase/phasestyle.h
@@ -67,7 +67,7 @@ class PhaseStyle : public TDEStyle
void polish(TQPalette &pal);
void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
- void drawPrimitive(TQ_PrimitiveElement element,
+ void drawPrimitive(PrimitiveElement element,
TQPainter *painter,
const TQStyleControlElementData &ceData,
ControlElementFlags elementFlags,
@@ -143,7 +143,7 @@ class PhaseStyle : public TDEStyle
const TQStyleOption& option = TQStyleOption::Default,
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,
TQStyleHintReturn * = 0, const TQWidget * = 0 ) const;