From 9f373c006102fed0926a4da42b4f1a608a2a518c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 3 Feb 2013 22:59:08 -0600 Subject: [PATCH] Rename KStyle to TDEStyle to avoid conflicts with KDE4 --- styles/dotnet/dotnet.cpp | 36 ++++++++++++------------ styles/dotnet/dotnet.h | 4 +-- styles/phase/phasestyle.cpp | 56 ++++++++++++++++++------------------- styles/phase/phasestyle.h | 4 +-- 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp index 3e3ff314..84b8b245 100644 --- a/styles/dotnet/dotnet.cpp +++ b/styles/dotnet/dotnet.cpp @@ -74,7 +74,7 @@ KDE_Q_EXPORT_PLUGIN( dotNETstylePlugin ) // --------------------------------------------------- -dotNETstyle::dotNETstyle() : KStyle( AllowMenuTransparency ), kickerMode(false) +dotNETstyle::dotNETstyle() : TDEStyle( AllowMenuTransparency ), kickerMode(false) { winstyle = 0L; winstyle = TQStyleFactory::create("Windows"); @@ -89,9 +89,9 @@ dotNETstyle::dotNETstyle() : KStyle( AllowMenuTransparency ), kickerMode(false) } TQSettings settings; - pseudo3D = settings.readBoolEntry("/KStyle/Settings/Pseudo3D", true); - roundedCorners = settings.readBoolEntry("/KStyle/Settings/RoundedCorners", true); - useTextShadows = settings.readBoolEntry("/KStyle/Settings/UseTextShadows", false); + pseudo3D = settings.readBoolEntry("/TDEStyle/Settings/Pseudo3D", true); + roundedCorners = settings.readBoolEntry("/TDEStyle/Settings/RoundedCorners", true); + useTextShadows = settings.readBoolEntry("/TDEStyle/Settings/UseTextShadows", false); reverseLayout = TQApplication::TQApplication::reverseLayout(); } @@ -376,7 +376,7 @@ void dotNETstyle::renderPanel(TQPainter *p, } -void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe, +void dotNETstyle::drawTDEStylePrimitive(TDEStylePrimitive kpe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -419,7 +419,7 @@ void dotNETstyle::drawKStylePrimitive(KStylePrimitive kpe, } default: - KStyle::drawKStylePrimitive(kpe, p, ceData, elementFlags, r, cg, flags, opt, widget); + TDEStyle::drawTDEStylePrimitive(kpe, p, ceData, elementFlags, r, cg, flags, opt, widget); } } @@ -791,7 +791,7 @@ void dotNETstyle::drawPrimitive(TQ_PrimitiveElement pe, } default: { - return KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt); + return TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt); } } } @@ -1428,7 +1428,7 @@ void dotNETstyle::drawControlMask(TQ_ControlElement element, } default: { - KStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w); + TDEStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w); } } } @@ -1457,7 +1457,7 @@ void dotNETstyle::drawComplexControlMask(ComplexControl c, break; } default: { - KStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w); + TDEStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w); } } } @@ -1710,7 +1710,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, } default: - KStyle::drawComplexControl(control, p, ceData, elementFlags, + TDEStyle::drawComplexControl(control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget); break; @@ -1720,7 +1720,7 @@ void dotNETstyle::drawComplexControl(ComplexControl control, TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const { -// Don't use KStyles progressbar subrect +// Don't use TDEStyles progressbar subrect switch (r) { case SR_ComboBoxFocusRect: { return querySubControlMetrics( CC_ComboBox, ceData, elementFlags, SC_ComboBoxEditField, TQStyleOption::Default, widget ); @@ -1740,7 +1740,7 @@ TQRect dotNETstyle::subRect(SubRect r, const TQStyleControlElementData &ceData, return winstyle->subRect(r, ceData, elementFlags, widget); } default: { - return KStyle::subRect(r, ceData, elementFlags, widget); + return TDEStyle::subRect(r, ceData, elementFlags, widget); } } } @@ -1760,7 +1760,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control, return TQRect(r.x() + 2, r.y() + 2, r.width() - 19, r.height() - 4); } default: { - return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); + return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); } } break; @@ -1801,7 +1801,7 @@ TQRect dotNETstyle::querySubControlMetrics(ComplexControl control, default: { } } - return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); + return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); } int dotNETstyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const @@ -1901,7 +1901,7 @@ int dotNETstyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceD return 2; default: - return KStyle::pixelMetric(m, ceData, elementFlags, widget); + return TDEStyle::pixelMetric(m, ceData, elementFlags, widget); } } @@ -2008,10 +2008,10 @@ TQSize dotNETstyle::sizeFromContents(ContentsType t, } default: - return KStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); + return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); } - return KStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); + return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); // return winstyle->sizeFromContents(t, ceData, elementFlags, s, opt, widget); } @@ -2113,7 +2113,7 @@ int dotNETstyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData } break; default: - ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); + ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); break; } diff --git a/styles/dotnet/dotnet.h b/styles/dotnet/dotnet.h index 416f20ae..72436526 100644 --- a/styles/dotnet/dotnet.h +++ b/styles/dotnet/dotnet.h @@ -32,7 +32,7 @@ #define TQCOORDARRLEN(x) sizeof(x)/(sizeof(TQCOORD)*2) -class dotNETstyle : public KStyle +class dotNETstyle : public TDEStyle { Q_OBJECT @@ -47,7 +47,7 @@ public: void renderMenuBlendPixmap( KPixmap&, const TQColorGroup&, const TQPopupMenu * ) const; - void drawKStylePrimitive( KStylePrimitive kpe, + void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp index 92ead628..077d91d8 100644 --- a/styles/phase/phasestyle.cpp +++ b/styles/phase/phasestyle.cpp @@ -9,7 +9,7 @@ // // Some miscellaneous notes // -// Reimplemented scrollbar metric and drawing routines from KStyle to allow +// Reimplemented scrollbar metric and drawing routines from TDEStyle to allow // better placement of subcontrols. This is because the subcontrols slightly // overlap to share part of their border. // @@ -81,7 +81,7 @@ static unsigned contrast = 110; // Constructor PhaseStyle::PhaseStyle() - : KStyle(FilledFrameWorkaround | AllowMenuTransparency, + : TDEStyle(FilledFrameWorkaround | AllowMenuTransparency, ThreeButtonScrollBar), gradients_(TQPixmap::defaultDepth() > 8), kicker_(false) { @@ -180,7 +180,7 @@ void PhaseStyle::polish(const TQStyleControlElementData &ceData, ControlElementF } } - KStyle::polish(ceData, elementFlags, ptr); + TDEStyle::polish(ceData, elementFlags, ptr); } ////////////////////////////////////////////////////////////////////////////// @@ -238,7 +238,7 @@ void PhaseStyle::unPolish(const TQStyleControlElementData &ceData, ControlElemen } } - KStyle::unPolish(ceData, elementFlags, ptr); + TDEStyle::unPolish(ceData, elementFlags, ptr); } ////////////////////////////////////////////////////////////////////////////// @@ -1025,16 +1025,16 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element, } default: - KStyle::drawPrimitive(element, painter, ceData, elementFlags, rect, group, flags, option); + TDEStyle::drawPrimitive(element, painter, ceData, elementFlags, rect, group, flags, option); } } ////////////////////////////////////////////////////////////////////////////// -// drawKStylePrimitive() +// drawTDEStylePrimitive() // --------------------- // Draw the element -void PhaseStyle::drawKStylePrimitive(KStylePrimitive element, +void PhaseStyle::drawTDEStylePrimitive(TDEStylePrimitive element, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1143,7 +1143,7 @@ void PhaseStyle::drawKStylePrimitive(KStylePrimitive element, } default: - KStyle::drawKStylePrimitive(element, painter, ceData, elementFlags, rect, + TDEStyle::drawTDEStylePrimitive(element, painter, ceData, elementFlags, rect, group, flags, option, widget); } } @@ -1205,7 +1205,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, case CE_PushButtonLabel: { const TQPushButton* button = ::tqqt_cast(widget); if (!button) { - KStyle::drawControl(element, painter, ceData, elementFlags, rect, group, + TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; } @@ -1320,7 +1320,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, case CE_MenuBarItem: { const TQMenuBar *mbar = ::tqqt_cast(widget); if (!mbar) { - KStyle::drawControl(element, painter, ceData, elementFlags, rect, group, + TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; } @@ -1350,7 +1350,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, case CE_PopupMenuItem: { if (!ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) { - KStyle::drawControl(element, painter, ceData, elementFlags, rect, group, + TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; } @@ -1508,7 +1508,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, drawPhaseTab(painter, x, y, w, h, group, ceData, elementFlags, option, flags); } else { // not a tabbar - KStyle::drawControl(element, painter, ceData, elementFlags, rect, group, + TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; } @@ -1523,7 +1523,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, case CE_ProgressBarContents: { if (!ceData.widgetObjectTypes.contains(TQPROGRESSBAR_OBJECT_NAME_STRING)) { - KStyle::drawControl(element, painter, ceData, elementFlags, rect, group, + TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; } @@ -1552,7 +1552,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, case CE_ToolBoxTab: { const TQToolBox *box = ::tqqt_cast(widget); if (!box) { - KStyle::drawControl(element, painter, ceData, elementFlags, rect, group, + TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); return; } @@ -1587,7 +1587,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element, } default: - KStyle::drawControl(element, painter, ceData, elementFlags, rect, group, + TDEStyle::drawControl(element, painter, ceData, elementFlags, rect, group, flags, option, widget); } } @@ -1612,7 +1612,7 @@ void PhaseStyle::drawControlMask(TQ_ControlElement element, break; default: - KStyle::drawControlMask(element, painter, ceData, elementFlags, rect, option, widget); + TDEStyle::drawControlMask(element, painter, ceData, elementFlags, rect, option, widget); } } @@ -1779,7 +1779,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, case CC_SpinWidget: { const TQSpinWidget *spin = ::tqqt_cast(widget); if (!spin) { - KStyle::drawComplexControl(control, painter, ceData, elementFlags, rect, group, + TDEStyle::drawComplexControl(control, painter, ceData, elementFlags, rect, group, flags, controls, active, option, widget); return; } @@ -1908,7 +1908,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control, } default: - KStyle::drawComplexControl(control, painter, ceData, elementFlags, rect, group, + TDEStyle::drawComplexControl(control, painter, ceData, elementFlags, rect, group, flags, controls, active, option, widget); break; } @@ -1936,7 +1936,7 @@ void PhaseStyle::drawComplexControlMask(TQ_ComplexControl control, } default: - KStyle::drawComplexControlMask(control,painter,ceData,elementFlags,rect,option,widget); + TDEStyle::drawComplexControlMask(control,painter,ceData,elementFlags,rect,option,widget); } } @@ -2001,7 +2001,7 @@ int PhaseStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementData return ITEMFRAME; default: - return KStyle::pixelMetric(metric, ceData, elementFlags, widget); + return TDEStyle::pixelMetric(metric, ceData, elementFlags, widget); } } @@ -2021,7 +2021,7 @@ TQRect PhaseStyle::subRect(SubRect rect, const TQStyleControlElementData &ceData } default: - return KStyle::subRect(rect, ceData, elementFlags, widget); + return TDEStyle::subRect(rect, ceData, elementFlags, widget); } } @@ -2073,7 +2073,7 @@ TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control, case CC_ScrollBar: { bool horizontal = (ceData.orientation == TQt::Horizontal); - rect = KStyle::querySubControlMetrics(control, ceData, elementFlags, + rect = TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, option, widget); // adjust the standard metrics so controls can "overlap" @@ -2116,7 +2116,7 @@ TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control, } default: - rect = KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, + rect = TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, option, widget); } @@ -2142,7 +2142,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, case CT_PushButton: { const TQPushButton* button = ::tqqt_cast(widget); if (!button) { - return KStyle::sizeFromContents(contents, ceData, elementFlags, contentsize, + return TDEStyle::sizeFromContents(contents, ceData, elementFlags, contentsize, option, widget); } int margin = pixelMetric(PM_ButtonMargin, ceData, elementFlags, widget) @@ -2162,7 +2162,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, case CT_PopupMenuItem: { if (!widget || option.isDefault()) return contentsize; if (!ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) { - return KStyle::sizeFromContents(contents, ceData, elementFlags, contentsize, + return TDEStyle::sizeFromContents(contents, ceData, elementFlags, contentsize, option, widget); } TQMenuItem *item = option.menuItem(); @@ -2206,7 +2206,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents, } default: - return KStyle::sizeFromContents(contents, ceData, elementFlags, contentsize, + return TDEStyle::sizeFromContents(contents, ceData, elementFlags, contentsize, option, widget); } } @@ -2246,7 +2246,7 @@ int PhaseStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, } break; default: - ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); + ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); break; } @@ -2264,7 +2264,7 @@ bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, Co if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { TQObject* object = reinterpret_cast(source); - if (KStyle::objectEventHandler(ceData, elementFlags, source, event)) return true; + if (TDEStyle::objectEventHandler(ceData, elementFlags, source, event)) return true; if (!object->isWidgetType()) return false; bool horiz; diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h index 4cf7fabf..faeb2507 100644 --- a/styles/phase/phasestyle.h +++ b/styles/phase/phasestyle.h @@ -54,7 +54,7 @@ class GradientSet int size_; }; -class PhaseStyle : public KStyle +class PhaseStyle : public TDEStyle { Q_OBJECT @@ -76,7 +76,7 @@ class PhaseStyle : public KStyle SFlags flags = Style_Default, const TQStyleOption &option = TQStyleOption::Default) const; - void drawKStylePrimitive(KStylePrimitive element, + void drawTDEStylePrimitive(TDEStylePrimitive element, TQPainter *painter, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,