diff options
Diffstat (limited to 'kstyles')
33 files changed, 323 insertions, 323 deletions
diff --git a/kstyles/asteroid/Makefile.am b/kstyles/asteroid/Makefile.am index 2b8735e08..3d2bcab8c 100644 --- a/kstyles/asteroid/Makefile.am +++ b/kstyles/asteroid/Makefile.am @@ -11,7 +11,7 @@ noinst_HEADERS = asteroid.h kde_style_LTLIBRARIES = asteroid.la asteroid_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -asteroid_la_LIBADD = -ltdefx -lkutils +asteroid_la_LIBADD = -ltdefx -ltdeutils asteroid_la_SOURCES = asteroid.cpp themercdir = $(kde_datadir)/kstyle/themes diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp index 11a06f29a..7119af5a8 100644 --- a/kstyles/asteroid/asteroid.cpp +++ b/kstyles/asteroid/asteroid.cpp @@ -91,10 +91,10 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin); /* Ok, now we get to the good stuff. */ -AsteroidStyle::AsteroidStyle() : KStyle(AllowMenuTransparency) +AsteroidStyle::AsteroidStyle() : TDEStyle(AllowMenuTransparency) { - if (tqApp->inherits("KApplication")) { - connect(tqApp, TQT_SIGNAL(kdisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + if (tqApp->inherits("TDEApplication")) { + connect(tqApp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); } backwards = TQApplication::reverseLayout(); @@ -139,13 +139,13 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme installObjectEventHandler(ceData, elementFlags, ptr, this); } else { - KStyle::polish(ceData, elementFlags, ptr); + TDEStyle::polish(ceData, elementFlags, ptr); } } void AsteroidStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - KStyle::unPolish(ceData, elementFlags, ptr); + TDEStyle::unPolish(ceData, elementFlags, ptr); } /*! @@ -179,7 +179,7 @@ void AsteroidStyle::renderMenuBlendPixmap(KPixmap &pix, p.fillRect(0, 0, pix.width(), pix.height(), cg.background()); } -void AsteroidStyle::drawKStylePrimitive(KStylePrimitive ksp, +void AsteroidStyle::drawTDEStylePrimitive(TDEStylePrimitive ksp, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -289,7 +289,7 @@ void AsteroidStyle::drawKStylePrimitive(KStylePrimitive ksp, } default: { - KStyle::drawKStylePrimitive(ksp, p, ceData, elementFlags, r, cg, sf, o, w); + TDEStyle::drawTDEStylePrimitive(ksp, p, ceData, elementFlags, r, cg, sf, o, w); } } } @@ -320,7 +320,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint, } default: - return KStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget); + return TDEStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget); } } @@ -975,7 +975,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, } default: { - KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, sf, o); + TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, sf, o); } } } @@ -1716,7 +1716,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } default: { - KStyle::drawControl(ce, p, ceData, elementFlags, r, cg, sf, o, w); + TDEStyle::drawControl(ce, p, ceData, elementFlags, r, cg, sf, o, w); } } } @@ -1763,7 +1763,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce, CE_HeaderLabel */ default: { - KStyle::drawControlMask(ce, p, ceData, elementFlags, r, o, w); + TDEStyle::drawControlMask(ce, p, ceData, elementFlags, r, o, w); } } } @@ -2091,7 +2091,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, // Draw slider groove if ((sc & SC_SliderGroove) && groove.isValid()) { - drawKStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, sf, o, w ); + drawTDEStylePrimitive( KPE_SliderGroove, &p2, ceData, elementFlags, groove, cg, sf, o, w ); // Draw the focus rect around the groove if (elementFlags & CEF_HasFocus) @@ -2109,7 +2109,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, if ((sc & SC_SliderHandle) && handle.isValid()) { if (sa == SC_SliderHandle) sf |= Style_Active; - drawKStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, sf, o, w ); + drawTDEStylePrimitive( KPE_SliderHandle, &p2, ceData, elementFlags, handle, cg, sf, o, w ); } p2.end(); @@ -2179,7 +2179,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, default: { - KStyle::drawComplexControl(cc, p, ceData, elementFlags, r, cg, sf, sc, sa, o, w); + TDEStyle::drawComplexControl(cc, p, ceData, elementFlags, r, cg, sf, sc, sa, o, w); } } } @@ -2204,7 +2204,7 @@ void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc, CC_ListView */ default: { - KStyle::drawComplexControlMask(cc, p, ceData, elementFlags, r, o, w); + TDEStyle::drawComplexControlMask(cc, p, ceData, elementFlags, r, o, w); } } } @@ -2303,7 +2303,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData & if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) { return 3; } else { - return KStyle::pixelMetric(pm, ceData, elementFlags, w); + return TDEStyle::pixelMetric(pm, ceData, elementFlags, w); } } @@ -2335,7 +2335,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData & return 0; default: { - return KStyle::pixelMetric(pm, ceData, elementFlags, w); + return TDEStyle::pixelMetric(pm, ceData, elementFlags, w); } } } @@ -2379,7 +2379,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat SR_DialogButtonCustom */ default: { - return KStyle::subRect(sr, ceData, elementFlags, w); + return TDEStyle::subRect(sr, ceData, elementFlags, w); } } } @@ -2441,7 +2441,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc, return TQRect(r.x()+2, r.y()+2, r.width()-20, r.height()-4); } default: { - return KStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w); + return TDEStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w); } } @@ -2474,7 +2474,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc, case SC_SpinWidgetFrame: return ceData.rect; default: - return KStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w); + return TDEStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w); break; } @@ -2482,7 +2482,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc, } default: { - return KStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w); + return TDEStyle::querySubControlMetrics(cc, ceData, elementFlags, sc, o, w); } } } @@ -2516,7 +2516,7 @@ TQSize AsteroidStyle::sizeFromContents(ContentsType ct, case CT_PushButton: { const TQPushButton *pb = dynamic_cast<const TQPushButton *>(w); - const TQSize ret = KStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w); + const TQSize ret = TDEStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w); int rw = ret.width(), rh = ret.height(); int mw; int mh; @@ -2615,7 +2615,7 @@ TQSize AsteroidStyle::sizeFromContents(ContentsType ct, } default: { - return KStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w); + return TDEStyle::sizeFromContents(ct, ceData, elementFlags, s, o, w); } } } diff --git a/kstyles/asteroid/asteroid.h b/kstyles/asteroid/asteroid.h index 7bd652a12..d6be130aa 100644 --- a/kstyles/asteroid/asteroid.h +++ b/kstyles/asteroid/asteroid.h @@ -7,9 +7,9 @@ #ifndef __ASTEROID_H #define __ASTEROID_H -#include <kstyle.h> +#include <tdestyle.h> -class AsteroidStyle : public KStyle +class AsteroidStyle : public TDEStyle { Q_OBJECT @@ -34,7 +34,7 @@ public: const TQColorGroup &, const TQPopupMenu *) const; - void drawKStylePrimitive(KStylePrimitive, + void drawTDEStylePrimitive(TDEStylePrimitive, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -98,7 +98,7 @@ public: int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0) const; - int kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const; + int kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const; TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp index 0dc02e7ec..4fccff059 100644 --- a/kstyles/highcolor/highcolor.cpp +++ b/kstyles/highcolor/highcolor.cpp @@ -174,7 +174,7 @@ KPixmap* GradientSet::gradient(GradientType type) // --------------------------------------------------------------------------- HighColorStyle::HighColorStyle( StyleType styleType ) - : KStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ) + : TDEStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ) { type = styleType; highcolor = (type == HighColor && TQPixmap::defaultDepth() > 8); @@ -209,7 +209,7 @@ void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElem } } - KStyle::polish( ceData, elementFlags, ptr ); + TDEStyle::polish( ceData, elementFlags, ptr ); } @@ -230,7 +230,7 @@ void HighColorStyle::unPolish(const TQStyleControlElementData &ceData, ControlEl } } - KStyle::unPolish( ceData, elementFlags, ptr ); + TDEStyle::unPolish( ceData, elementFlags, ptr ); } @@ -796,7 +796,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, p->drawLine(x+1, y+1, x+1, y2-1); p->setPen(oldPen); } else - KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt); + TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt); break; } @@ -959,13 +959,13 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, p->restore(); } else - KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt ); + TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt ); } } } -void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe, +void HighColorStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1139,7 +1139,7 @@ void HighColorStyle::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); } } @@ -1515,7 +1515,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element, } default: - KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); + TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); } } @@ -1543,7 +1543,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element, } default: - KStyle::drawControlMask(element, p, ceData, elementFlags, r, opt, widget); + TDEStyle::drawControlMask(element, p, ceData, elementFlags, r, opt, widget); } } @@ -1728,7 +1728,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control, default: - KStyle::drawComplexControl(control, p, ceData, elementFlags, + TDEStyle::drawComplexControl(control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget); break; } @@ -1759,7 +1759,7 @@ void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control, } default: - KStyle::drawComplexControlMask(control, p, ceData, elementFlags, r, opt, widget); + TDEStyle::drawComplexControlMask(control, p, ceData, elementFlags, r, opt, widget); } } @@ -1786,7 +1786,7 @@ void HighColorStyle::drawItem( TQPainter *p, } else col = penColor; - KStyle::drawItem( p, r, flags, cg, enabled, pixmap, + TDEStyle::drawItem( p, r, flags, cg, enabled, pixmap, text, len, col ); } @@ -1813,7 +1813,7 @@ TQRect HighColorStyle::subRect(SubRect r, const TQStyleControlElementData &ceDat wrect.width() - dfw2 - dbw2 - 1, wrect.height() - dfw2 - dbw2 - 1); } else - return KStyle::subRect(r, ceData, elementFlags, widget); + return TDEStyle::subRect(r, ceData, elementFlags, widget); } @@ -1856,7 +1856,7 @@ int HighColorStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData & return 0; default: - return KStyle::pixelMetric(m, ceData, elementFlags, widget); + return TDEStyle::pixelMetric(m, ceData, elementFlags, widget); } } @@ -1878,7 +1878,7 @@ int HighColorStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceD } break; default: - ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); + ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); break; } @@ -1984,7 +1984,7 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents, default: - return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); + return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); } } @@ -2005,13 +2005,13 @@ TQPixmap HighColorStyle::stylePixmap(StylePixmap stylepixmap, break; } - return KStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget); + return TDEStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget); } bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - if (KStyle::objectEventHandler( ceData, elementFlags, source, event )) + if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event )) return true; TQToolBar* toolbar; diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h index 5f58b3f9c..7fa618a92 100644 --- a/kstyles/highcolor/highcolor.h +++ b/kstyles/highcolor/highcolor.h @@ -34,7 +34,7 @@ #include <tqintdict.h> #include <kdrawutil.h> #include <kpixmap.h> -#include <kstyle.h> +#include <tdestyle.h> enum GradientType{ VSmall=0, VMed, VLarge, HMed, HLarge, GradientCount }; @@ -55,7 +55,7 @@ class GradientSet class TQPopupMenu; -class HighColorStyle : public KStyle +class HighColorStyle : public TDEStyle { Q_OBJECT @@ -71,7 +71,7 @@ class HighColorStyle : public KStyle void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg, const TQPopupMenu* popup ) const; - void drawKStylePrimitive( KStylePrimitive kpe, + void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/kstyles/highcontrast/config/highcontrastconfig.cpp index 233fb7365..f271113ca 100644 --- a/kstyles/highcontrast/config/highcontrastconfig.cpp +++ b/kstyles/highcontrast/config/highcontrastconfig.cpp @@ -28,8 +28,8 @@ DEALINGS IN THE SOFTWARE. #include <tqlayout.h> #include <tqsettings.h> #include <kdialog.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "highcontrastconfig.h" @@ -44,7 +44,7 @@ HighContrastStyleConfig::HighContrastStyleConfig( { // Should have no margins here, the dialog provides them TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); - KGlobal::locale()->insertCatalogue("kstyle_highcontrast_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_highcontrast_config"); wideLinesBox = new TQCheckBox(i18n("Use wider lines"), this); @@ -62,7 +62,7 @@ HighContrastStyleConfig::HighContrastStyleConfig( HighContrastStyleConfig::~HighContrastStyleConfig() { - KGlobal::locale()->removeCatalogue("kstyle_keramik_config"); + TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config"); } diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp index d212f7445..af021a91a 100644 --- a/kstyles/highcontrast/highcontrast.cpp +++ b/kstyles/highcontrast/highcontrast.cpp @@ -113,7 +113,7 @@ void addOffset (TQRect* r, int offset, int lineWidth = 0) // --------------------------------------------------------------------------- HighContrastStyle::HighContrastStyle() - : KStyle( 0, ThreeButtonScrollBar ) + : TDEStyle( 0, ThreeButtonScrollBar ) { TQSettings settings; settings.beginGroup("/highcontraststyle/Settings/"); @@ -175,7 +175,7 @@ void HighContrastStyle::polish (const TQStyleControlElementData &ceData, Control } } - KStyle::polish (ceData, elementFlags, ptr); + TDEStyle::polish (ceData, elementFlags, ptr); } @@ -188,7 +188,7 @@ void HighContrastStyle::unPolish (const TQStyleControlElementData &ceData, Contr } } - KStyle::unPolish (ceData, elementFlags, ptr); + TDEStyle::unPolish (ceData, elementFlags, ptr); } void HighContrastStyle::setColorsNormal (TQPainter* p, const TQColorGroup& cg, int flags, int highlight) const @@ -687,13 +687,13 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, } default: { - KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt ); + TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt ); } } } -void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe, +void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -758,11 +758,11 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe, case KPE_ListViewExpander: { // TODO There is no pixelMetric associated with the - // ListViewExpander in KStyle. + // ListViewExpander in TDEStyle. // To have a properly large expander, the CC_ListView case of // drawComplexControl should be handled. // Probably it would be better to add a KPM_ListViewExpander metric - // to the KStyle KStylePixelMetric enum, and have the KStyle + // to the TDEStyle TDEStylePixelMetric enum, and have the TDEStyle // drawComplexControl handle it. TQ_PrimitiveElement direction; if (flags & Style_On) { // Collapsed = On @@ -776,10 +776,10 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe, break; } case KPE_ListViewBranch: - // TODO Draw (thick) dotted line. Check kstyle.cpp + // TODO Draw (thick) dotted line. Check tdestyle.cpp // Fall down for now default: - KStyle::drawKStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget); + TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget); } } @@ -1158,7 +1158,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, } default: - KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); + TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); } } @@ -1188,13 +1188,13 @@ void HighContrastStyle::drawControlMask (TQ_ControlElement element, } default: { - KStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w); + TDEStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w); } } } // Helper to find the next sibling that's not hidden -// Lifted from kstyle.cpp +// Lifted from tdestyle.cpp static TQListViewItem* nextVisibleSibling(TQListViewItem* item) { TQListViewItem* sibling = item; @@ -1329,7 +1329,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, // ------------------------------------------------------------------- case CC_ListView: { /* - * Sigh... Lifted and modified from kstyle.cpp + * Sigh... Lifted and modified from tdestyle.cpp */ /* * Many thanks to TrollTech AS for donating CC_ListView from TQWindowsStyle. @@ -1405,8 +1405,8 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, boxrect = TQRect( bx-h/2, linebot-h/2, h, h ); boxflags = child->isOpen() ? TQStyle::Style_Off : TQStyle::Style_On; - // KStyle extension: Draw the box and expand/collapse indicator - drawKStylePrimitive( KPE_ListViewExpander, p, ceData, elementFlags, boxrect, cg, boxflags, opt, NULL ); + // TDEStyle extension: Draw the box and expand/collapse indicator + drawTDEStylePrimitive( KPE_ListViewExpander, p, ceData, elementFlags, boxrect, cg, boxflags, opt, NULL ); // dotlinery p->setPen( cg.mid() ); @@ -1459,8 +1459,8 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, branchrect = TQRect( point, other-(thickness/2), end-point, thickness ); branchflags = TQStyle::Style_Horizontal; - // KStyle extension: Draw the horizontal branch - drawKStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL ); + // TDEStyle extension: Draw the horizontal branch + drawTDEStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL ); } else { // Vertical branch @@ -1475,8 +1475,8 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, else branchflags = TQStyle::Style_Default; - // KStyle extension: Draw the vertical branch - drawKStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL ); + // TDEStyle extension: Draw the vertical branch + drawTDEStylePrimitive( KPE_ListViewBranch, p, ceData, elementFlags, branchrect, cg, branchflags, opt, NULL ); } } } @@ -1484,7 +1484,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, } default: - KStyle::drawComplexControl(control, p, ceData, elementFlags, + TDEStyle::drawComplexControl(control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget); break; } @@ -1506,7 +1506,7 @@ void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c, break; } default: { - KStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w); + TDEStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w); } } } @@ -1530,7 +1530,7 @@ void HighContrastStyle::drawItem( TQPainter *p, enabled = true; //do not ghost it in Qt - KStyle::drawItem (p, r, flags, cg, enabled, pixmap, text, len, penColor); + TDEStyle::drawItem (p, r, flags, cg, enabled, pixmap, text, len, penColor); p->restore(); } @@ -1585,7 +1585,7 @@ TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control, default: break; } - return KStyle::querySubControlMetrics (control, ceData, elementFlags, subcontrol, opt, widget); + return TDEStyle::querySubControlMetrics (control, ceData, elementFlags, subcontrol, opt, widget); } @@ -1679,19 +1679,19 @@ int HighContrastStyle::pixelMetric(PixelMetric m, const TQStyleControlElementDat return 0; default: - return KStyle::pixelMetric(m, ceData, elementFlags, widget); + return TDEStyle::pixelMetric(m, ceData, elementFlags, widget); } } -int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const +int HighContrastStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const { switch (kpm) { case KPM_ListViewBranchThickness: // XXX Proper support of thick branches requires reimplementation of - // the drawKStylePrimitive KPE_ListViewBranch case. + // the drawTDEStylePrimitive KPE_ListViewBranch case. return basicLineWidth; default: - return KStyle::kPixelMetric(kpm, ceData, elementFlags, widget); + return TDEStyle::kPixelMetric(kpm, ceData, elementFlags, widget); } } @@ -1817,7 +1817,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents, default: - return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); + return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); } } @@ -1829,13 +1829,13 @@ TQRect HighContrastStyle::subRect (SubRect subrect, const TQStyleControlElementD case SR_ProgressBarLabel: return ceData.rect; default: - return KStyle::subRect (subrect, ceData, elementFlags, widget); + return TDEStyle::subRect (subrect, ceData, elementFlags, widget); } } bool HighContrastStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - return KStyle::objectEventHandler (ceData, elementFlags, source, event); + return TDEStyle::objectEventHandler (ceData, elementFlags, source, event); } /*! \reimp */ @@ -1856,7 +1856,7 @@ int HighContrastStyle::styleHint(StyleHint sh, const TQStyleControlElementData & } break; default: - ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); + ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); break; } diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h index 89a716dc1..552526254 100644 --- a/kstyles/highcontrast/highcontrast.h +++ b/kstyles/highcontrast/highcontrast.h @@ -14,7 +14,7 @@ * (C) 2000 Dirk Mueller <[email protected]> * (C) 2001 Martijn Klingens <[email protected]> * - * Includes portions from KStyle, + * Includes portions from TDEStyle, * Copyright (C) 2001-2002 Karol Szwed <[email protected]> * * Many thanks to Bradley T. Hughes for the 3 button scrollbar code. @@ -41,12 +41,12 @@ #include <tqintdict.h> #include <kdrawutil.h> #include <kpixmap.h> -#include <kstyle.h> +#include <tdestyle.h> class TQPopupMenu; -class HighContrastStyle : public KStyle +class HighContrastStyle : public TDEStyle { Q_OBJECT @@ -59,7 +59,7 @@ class HighContrastStyle : public KStyle void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); - void drawKStylePrimitive( KStylePrimitive kpe, + void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -137,7 +137,7 @@ class HighContrastStyle : public KStyle int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const; - int kPixelMetric( KStylePixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int kPixelMetric( TDEStylePixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const; TQSize sizeFromContents( ContentsType contents, diff --git a/kstyles/keramik/Makefile.am b/kstyles/keramik/Makefile.am index 83e1d4a03..4f3dbebae 100644 --- a/kstyles/keramik/Makefile.am +++ b/kstyles/keramik/Makefile.am @@ -15,7 +15,7 @@ noinst_PROGRAMS = genembed genembed_SOURCES = genembed.cpp genembed_LDADD = ../../tdefx/libtdefx.la -genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +genembed_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor pixmaps.keramik: pics/checkbox-off.png pics/checkbox-on.png pics/combobox-list-bc.png\ pics/combobox-list-bl.png pics/combobox-list-br.png pics/combobox-list-cl.png pics/combobox-list-cr.png\ diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index 7105d81c5..fa1848203 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -12,7 +12,7 @@ (C) 2000 Dirk Mueller <[email protected]> (C) 2001 Martijn Klingens <[email protected]> - Progressbar code based on KStyle, Copyright (C) 2001-2002 Karol Szwed <[email protected]>, + Progressbar code based on TDEStyle, Copyright (C) 2001-2002 Karol Szwed <[email protected]>, Improvements to progressbar animation from Plastik, Copyright (C) 2003 Sandro Giessl <[email protected]> This library is free software; you can redistribute it and/or @@ -237,7 +237,7 @@ TQRect KeramikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, } default: - return KStyle::subRect( r, ceData, elementFlags, widget ); + return TDEStyle::subRect( r, ceData, elementFlags, widget ); } } @@ -269,14 +269,14 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap, break; } - return KStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget); + return TDEStyle::stylePixmap(stylepixmap, ceData, elementFlags, opt, widget); } KeramikStyle::KeramikStyle() - :KStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ), + :TDEStyle( AllowMenuTransparency | FilledFrameWorkaround, ThreeButtonScrollBar ), maskMode(false), formMode(false), toolbarBlendWidget(0), titleBarMode(None), flatMode(false), customScrollMode(false), kickerMode(false) { @@ -354,7 +354,7 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen else if ( widget->parentWidget() && ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || - widget->inherits( "KCompletionBox" ) ) ) { + widget->inherits( "TDECompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 4 ); listbox->setBackgroundMode( NoBackground ); @@ -379,7 +379,7 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen } } - KStyle::polish(ceData, elementFlags, ptr); + TDEStyle::polish(ceData, elementFlags, ptr); } void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) @@ -399,7 +399,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem else if ( widget->parentWidget() && ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || - widget->inherits( "KCompletionBox" ) ) ) { + widget->inherits( "TDECompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 1 ); listbox->setBackgroundMode( PaletteBackground ); @@ -418,7 +418,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem } } - KStyle::unPolish(ceData, elementFlags, ptr); + TDEStyle::unPolish(ceData, elementFlags, ptr); } void KeramikStyle::progressBarDestroyed(TQObject* obj) @@ -985,7 +985,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, return; } } - KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt); + TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt); break; } case PE_WindowFrame: @@ -1014,7 +1014,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, p->drawLine(x+1, y+1, x+1, y2-1); p->setPen(oldPen); } else - KStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt); + TDEStyle::drawPrimitive(pe, p, ceData, elementFlags, r, cg, flags, opt); break; } @@ -1215,12 +1215,12 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, } else - KStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt ); + TDEStyle::drawPrimitive( pe, p, ceData, elementFlags, r, cg, flags, opt ); } } } -void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe, +void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1350,14 +1350,14 @@ void KeramikStyle::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); } } bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const { if (widget) { - //Form widgets are in the KHTMLView, but that has 2 further inner levels + //Form widgets are in the TDEHTMLView, but that has 2 further inner levels //of widgets - QClipperWidget, and outside of that, QViewportWidget TQWidget* potentialClipPort = widget->parentWidget(); if ((ceData.parentWidgetData.widgetObjectTypes.isEmpty()) && (ceData.parentWidgetFlags & CEF_IsTopLevel)) { @@ -1369,9 +1369,9 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C qstrcmp(potentialViewPort->name(), "qt_viewport") ) return false; - TQWidget* potentialKHTML = potentialViewPort->parentWidget(); - if (!potentialKHTML || potentialKHTML->isTopLevel() || - qstrcmp(potentialKHTML->className(), "KHTMLView") ) + TQWidget* potentialTDEHTML = potentialViewPort->parentWidget(); + if (!potentialTDEHTML || potentialTDEHTML->isTopLevel() || + qstrcmp(potentialTDEHTML->className(), "TDEHTMLView") ) return false; @@ -1539,7 +1539,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, // nr.setWidth(r.width()-2); //Account for shadow } - KStyle::drawControl(element, p, ceData, elementFlags, nr, cg, flags, opt, widget); + TDEStyle::drawControl(element, p, ceData, elementFlags, nr, cg, flags, opt, widget); break; } @@ -1602,7 +1602,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, tb->orientation() == Qt::Horizontal); } else - KStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, + TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, r, cg, flags, opt, widget ); break; } @@ -1958,7 +1958,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, default: - KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); + TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); } } @@ -2353,7 +2353,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, case CC_TitleBar: titleBarMode = Regular; //Handle buttons on titlebar different from toolbuttons default: - KStyle::drawComplexControl( control, p, ceData, elementFlags, + TDEStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget ); titleBarMode = None; @@ -2457,7 +2457,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce return 2; default: - return KStyle::pixelMetric(m, ceData, elementFlags, widget); + return TDEStyle::pixelMetric(m, ceData, elementFlags, widget); } } @@ -2500,7 +2500,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, } else { - return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); + return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); } } @@ -2568,7 +2568,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, } default: - return KStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); + return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentSize, opt, widget ); } } @@ -2580,7 +2580,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, const TQStyleOption& opt, const TQWidget* widget ) const { - SubControl result = KStyle::querySubControl( control, ceData, elementFlags, point, opt, widget ); + SubControl result = TDEStyle::querySubControl( control, ceData, elementFlags, point, opt, widget ); if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine ) { TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget ); @@ -2771,7 +2771,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, } default: break; } - return KStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget ); + return TDEStyle::querySubControlMetrics( control, ceData, elementFlags, subcontrol, opt, widget ); } @@ -2791,7 +2791,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - if (KStyle::objectEventHandler( ceData, elementFlags, source, event )) + if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event )) return true; if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { @@ -2993,7 +2993,7 @@ int KeramikStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDat ret = 1; break; default: - ret = KStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); + ret = TDEStyle::styleHint(sh, ceData, elementFlags, opt, returnData, w); break; } diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h index 5acaabf8d..7bf8cd3d4 100644 --- a/kstyles/keramik/keramik.h +++ b/kstyles/keramik/keramik.h @@ -33,13 +33,13 @@ #define __keramik_h__ #include <tqframe.h> -#include <kstyle.h> +#include <tdestyle.h> #include "pixmaploader.h" class TQProgressBar; -class KeramikStyle : public KStyle +class KeramikStyle : public TDEStyle { Q_OBJECT @@ -55,7 +55,7 @@ public: void polish( TQPalette& ); void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); - void drawKStylePrimitive( KStylePrimitive kpe, + void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, diff --git a/kstyles/keramik/keramikimage.h b/kstyles/keramik/keramikimage.h index c8e684a00..05bc75900 100644 --- a/kstyles/keramik/keramikimage.h +++ b/kstyles/keramik/keramikimage.h @@ -12,7 +12,7 @@ (C) 2000 Dirk Mueller <[email protected]> (C) 2001 Martijn Klingens <[email protected]> - Progressbar code based on KStyle, Copyright (C) 2001-2002 Karol Szwed <[email protected]> + Progressbar code based on TDEStyle, Copyright (C) 2001-2002 Karol Szwed <[email protected]> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp index 7be529840..a169de874 100644 --- a/kstyles/klegacy/klegacystyle.cpp +++ b/kstyles/klegacy/klegacystyle.cpp @@ -24,7 +24,7 @@ #include "klegacystyle.h" #include "klegacystyle.moc" -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #define INCLUDE_MENUITEM_DEF @@ -1743,7 +1743,7 @@ bool KLegacyStylePrivate::parseStyle() { } -KLegacyStyle::KLegacyStyle(void) : KStyle() { +KLegacyStyle::KLegacyStyle(void) : TDEStyle() { setButtonDefaultIndicatorWidth(6); setScrollBarExtent(15, 15); setButtonMargin(3); @@ -1873,7 +1873,7 @@ void KLegacyStyle::polish(TQApplication *app) { qt_set_draw_menu_bar_impl((QDrawMenuBarItemImpl) &KLegacyStyle::drawMenuBarItem); - KStyle::polish(app); + TDEStyle::polish(app); } @@ -2066,12 +2066,12 @@ void KLegacyStyle::polish(TQWidget *widget) { widget->setMouseTracking(mouseTrack); } - KStyle::polish(widget); + TDEStyle::polish(widget); } void KLegacyStyle::polishPopupMenu(TQPopupMenu *popup) { - KStyle::polishPopupMenu(popup); + TDEStyle::polishPopupMenu(popup); popup->setMouseTracking(true); popup->setCheckable(true); @@ -2089,7 +2089,7 @@ void KLegacyStyle::unPolish(TQWidget *widget) { widget->removeEventFilter(this); widget->unsetPalette(); widget->setAutoMask(false); - KStyle::unPolish(widget); + TDEStyle::unPolish(widget); } @@ -2099,7 +2099,7 @@ void KLegacyStyle::unPolish(TQApplication *app) { qt_set_draw_menu_bar_impl(0); - KStyle::unPolish(app); + TDEStyle::unPolish(app); } @@ -2150,7 +2150,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h, GtkObject *gobj = priv->gtkDict.find(TQButton::staticMetaObject()); if (! gobj) { - KStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill); + TDEStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill); return; } @@ -2165,7 +2165,7 @@ void KLegacyStyle::drawBevelButton(TQPainter *p, int x, int y, int w, int h, if (pix && (! pix->isNull())) p->drawPixmap(x, y, *pix); else - KStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill); + TDEStyle::drawBevelButton(p, x, y, w, h, g, sunken, fill); } @@ -2173,7 +2173,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) { GtkObject *gobj = priv->gtkDict.find(TQPushButton::staticMetaObject()); if (! gobj) { - KStyle::drawPushButton(btn, p); + TDEStyle::drawPushButton(btn, p); return; } @@ -2199,7 +2199,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) { if (pix) p->drawPixmap(x1, y1, *pix); else - KStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1, + TDEStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1, g, true, &fill); } @@ -2227,7 +2227,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) { if (pix && ! pix->isNull()) p->drawPixmap(x1, y1, *pix); else { - KStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1, + TDEStyle::drawBevelButton(p, x1, y1, x2 - x1 + 1, y2 - y1 + 1, g, btn->isOn() || btn->isDown(), &fill); } } @@ -2240,7 +2240,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h, GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject()); if (! gobj) { - KStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled); + TDEStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled); return; } @@ -2255,7 +2255,7 @@ void KLegacyStyle::drawIndicator(TQPainter *p, int x, int y, int w, int h, if (pix && (! pix->isNull())) p->drawPixmap(x, y, *pix); else - KStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled); + TDEStyle::drawIndicator(p, x, y, w, h, g, state, down, enabled); } @@ -2263,7 +2263,7 @@ void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, i GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject()); if (! gobj) { - KStyle::drawIndicatorMask(p, x, y, w, h, state); + TDEStyle::drawIndicatorMask(p, x, y, w, h, state); return; } @@ -2278,14 +2278,14 @@ void KLegacyStyle::drawIndicatorMask(TQPainter *p, int x, int y, int w, int h, i if (pix && pix->mask() && ! pix->mask()->isNull()) p->drawPixmap(x, y, *(pix->mask())); else - KStyle::drawIndicatorMask(p, x, y, w, h, state); + TDEStyle::drawIndicatorMask(p, x, y, w, h, state); } TQSize KLegacyStyle::indicatorSize(void) const { GtkObject *gobj = priv->gtkDict.find(TQCheckBox::staticMetaObject()); - if (! gobj) return KStyle::indicatorSize(); + if (! gobj) return TDEStyle::indicatorSize(); KLegacyImageDataKey key; key.cachekey = 0; @@ -2293,7 +2293,7 @@ TQSize KLegacyStyle::indicatorSize(void) const { key.data.shadow = KLegacy::Out; KLegacyImageData *id = gobj->getImageData(key, "checkbutton"); - if (! id) return KStyle::indicatorSize(); + if (! id) return TDEStyle::indicatorSize(); TQString filename; if (! id->file.isNull()) @@ -2301,13 +2301,13 @@ TQSize KLegacyStyle::indicatorSize(void) const { else if (! id->overlayFile.isNull()) filename = id->overlayFile; else - return KStyle::indicatorSize(); + return TDEStyle::indicatorSize(); TQImage *image = imageCache->find(filename); if (! image) { image = new TQImage(filename); - if (! image) return KStyle::indicatorSize(); + if (! image) return TDEStyle::indicatorSize(); imageCache->insert(filename, image); } @@ -2338,7 +2338,7 @@ void KLegacyStyle::drawExclusiveIndicator(TQPainter *p, int x, int y, int w, int if (pix && (! pix->isNull())) p->drawPixmap(x, y, *pix); else - KStyle::drawExclusiveIndicator(p, x, y, w, h, g, down, enabled); + TDEStyle::drawExclusiveIndicator(p, x, y, w, h, g, down, enabled); } @@ -2348,7 +2348,7 @@ void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w, GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject()); if (! gobj) { - KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on); + TDEStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on); return; } @@ -2363,7 +2363,7 @@ void KLegacyStyle::drawExclusiveIndicatorMask(TQPainter *p, int x, int y, int w, if (pix && pix->mask() && ! pix->mask()->isNull()) p->drawPixmap(x, y, *(pix->mask())); else - KStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on); + TDEStyle::drawExclusiveIndicatorMask(p, x, y, w, h, on); } @@ -2371,7 +2371,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const { GtkObject *gobj = priv->gtkDict.find(TQRadioButton::staticMetaObject()); if (! gobj) { - return KStyle::indicatorSize(); + return TDEStyle::indicatorSize(); } KLegacyImageDataKey key; @@ -2380,7 +2380,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const { key.data.shadow = KLegacy::Out; KLegacyImageData *id = gobj->getImageData(key, "radiobutton"); - if (! id) return KStyle::indicatorSize(); + if (! id) return TDEStyle::indicatorSize(); TQString filename; if (! id->file.isNull()) { @@ -2388,7 +2388,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const { } else if (! id->overlayFile.isNull()) { filename = id->overlayFile; } else { - return KStyle::indicatorSize(); + return TDEStyle::indicatorSize(); } TQImage *image = imageCache->find(filename); @@ -2396,7 +2396,7 @@ TQSize KLegacyStyle::exclusiveIndicatorSize(void) const { image = new TQImage(filename); if (! image) { - return KStyle::indicatorSize(); + return TDEStyle::indicatorSize(); } imageCache->insert(filename, image); @@ -2534,7 +2534,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h, GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject()); if (! gobj) { - KStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b); + TDEStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b); return; } @@ -2552,7 +2552,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h, if (pix && ! pix->isNull()) { p->drawPixmap(x, y, *pix); } else { - KStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b); + TDEStyle::drawComboButton(p, x, y, w, h, g, sunken, editable, enabled, b); return; } @@ -2574,7 +2574,7 @@ TQRect KLegacyStyle::comboButtonRect(int x, int y, int w, int h) { GtkObject *gobj = priv->gtkDict.find(TQComboBox::staticMetaObject()); if (! gobj) { - return KStyle::comboButtonRect(x, y, w, h); + return TDEStyle::comboButtonRect(x, y, w, h); } KLegacyImageDataKey key; @@ -2583,7 +2583,7 @@ TQRect KLegacyStyle::comboButtonRect(int x, int y, int w, int h) { KLegacyImageData *id = gobj->getImageData(key, "optionmenu"); if (! id) { - return KStyle::comboButtonRect(x, y, w, h); + return TDEStyle::comboButtonRect(x, y, w, h); } return TQRect(x + id->border.left() + 1, y + id->border.top() + 1, @@ -2651,7 +2651,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll GtkObject *gobj = priv->gtkDict.find(TQScrollBar::staticMetaObject()); if (! gobj) { - KStyle::drawScrollBarControls(p, scrollbar, start, controls, active); + TDEStyle::drawScrollBarControls(p, scrollbar, start, controls, active); return; } @@ -2663,7 +2663,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll KLegacyImageData *groove_id = gobj->getImageData(gkey, "trough"); if (! groove_id) { - KStyle::drawScrollBarControls(p, scrollbar, start, controls, active); + TDEStyle::drawScrollBarControls(p, scrollbar, start, controls, active); return; } @@ -2704,7 +2704,7 @@ void KLegacyStyle::drawScrollBarControls(TQPainter *p, const TQScrollBar *scroll KLegacyImageData *slider_id = gobj->getImageData(skey, "slider"); if (! slider_id) { - KStyle::drawScrollBarControls(p, scrollbar, start, controls, active); + TDEStyle::drawScrollBarControls(p, scrollbar, start, controls, active); return; } @@ -2765,7 +2765,7 @@ void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQ GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject()); if (! gobj) { - KStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow); + TDEStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow); return; } @@ -2781,7 +2781,7 @@ void KLegacyStyle::drawSlider(TQPainter *p, int x, int y, int w, int h, const TQ if (pix && ! pix->isNull()) p->drawPixmap(x, y, *pix); else - KStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow); + TDEStyle::drawSlider(p, x, y, w, h, g, orientation, tickAbove, tickBelow); } @@ -2792,7 +2792,7 @@ void KLegacyStyle::drawSliderGroove(TQPainter *p, int x, int y, int w, int h, GtkObject *gobj = priv->gtkDict.find(TQSlider::staticMetaObject()); if (! gobj) { - KStyle::drawSliderGroove(p, x, y, w, h, g, c, o); + TDEStyle::drawSliderGroove(p, x, y, w, h, g, c, o); return; } @@ -2808,7 +2808,7 @@ void KLegacyStyle::drawSliderGroove(TQPainter *p, int x, int y, int w, int h, if (pix && ! pix->isNull()) p->drawPixmap(x, y, *pix); else - KStyle::drawSliderGroove(p, x, y, w, h, g, c, o); + TDEStyle::drawSliderGroove(p, x, y, w, h, g, c, o); } @@ -2819,7 +2819,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down, GtkObject *gobj = priv->gtkDict.find(&arrow_ptr); if (! gobj) { - KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); + TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); return; } @@ -2840,7 +2840,7 @@ void KLegacyStyle::drawArrow(TQPainter *p, ArrowType type, bool down, if (pix && ! pix->isNull()) p->drawPixmap(x, y, *pix); else - KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); + TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); } @@ -2851,7 +2851,7 @@ void KLegacyStyle::drawMenuArrow(TQPainter *p, ArrowType type, bool down, GtkObject *gobj = priv->gtkDict.find(&menuitem_ptr); if (! gobj) { - KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); + TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); return; } @@ -2868,14 +2868,14 @@ void KLegacyStyle::drawMenuArrow(TQPainter *p, ArrowType type, bool down, p->drawPixmap(x + ((w - pix->width()) / 2), y + ((h - pix->height()) / 2), *pix); else - KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); + TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, b); } void KLegacyStyle::drawPanel(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, bool sunken, int, const TQBrush *brush) { - KStyle::drawPanel(p, x, y, w, h, g, sunken, 1, brush); + TDEStyle::drawPanel(p, x, y, w, h, g, sunken, 1, brush); } @@ -2894,7 +2894,7 @@ void KLegacyStyle::drawCheckMark(TQPainter *p, int x, int y, int w, int h, GtkObject *gobj = priv->gtkDict.find(&checkmenuitem_ptr); if (! gobj) { - KStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled); + TDEStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled); return; } @@ -2910,7 +2910,7 @@ void KLegacyStyle::drawCheckMark(TQPainter *p, int x, int y, int w, int h, y += (h - pix->height()) / 2; p->drawPixmap(x, y, *pix); } else { - KStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled); + TDEStyle::drawCheckMark(p, x, y, w, h, g, activated, disabled); } } @@ -2945,7 +2945,7 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo GtkObject *gobj = priv->gtkDict.find(TQTabBar::staticMetaObject()); if (! gobj) { - KStyle::drawTab(p, tabbar, tab, selected); + TDEStyle::drawTab(p, tabbar, tab, selected); return; } @@ -2974,17 +2974,17 @@ void KLegacyStyle::drawTab(TQPainter *p, const TQTabBar *tabbar, TQTab *tab, boo if (pix && ! pix->isNull()) p->drawPixmap(tab->r.left(), ry, *pix); else - KStyle::drawTab(p, tabbar, tab, selected); + TDEStyle::drawTab(p, tabbar, tab, selected); } void KLegacyStyle::drawKBarHandle(TQPainter *p, int x, int y, int w, int h, - const TQColorGroup &g, KToolBarPos type, TQBrush *fill) + const TQColorGroup &g, TDEToolBarPos type, TQBrush *fill) { GtkObject *gobj = priv->gtkDict.find(TQToolBar::staticMetaObject()); if (! gobj) { - KStyle::drawKBarHandle(p, x, y, w, h, g, type, fill); + TDEStyle::drawKBarHandle(p, x, y, w, h, g, type, fill); return; } @@ -3040,7 +3040,7 @@ void KLegacyStyle::drawKickerTaskButton(TQPainter *p, int x, int y, int w, int h TQString s(title); - static const TQString &modStr = KGlobal::staticQString( + static const TQString &modStr = TDEGlobal::staticQString( TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]")); int modStrPos = s.find(modStr); @@ -3362,5 +3362,5 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { } } - return KStyle::eventFilter(obj, e); + return TDEStyle::eventFilter(obj, e); } diff --git a/kstyles/klegacy/klegacystyle.h b/kstyles/klegacy/klegacystyle.h index 18c073f9a..f82fd5d0a 100644 --- a/kstyles/klegacy/klegacystyle.h +++ b/kstyles/klegacy/klegacystyle.h @@ -25,13 +25,13 @@ #ifndef __KLegacyStyle_hh #define __KLegacyStyle_hh -#include <kstyle.h> +#include <tdestyle.h> // forward declaration class KLegacyStylePrivate; -class Q_EXPORT KLegacyStyle : public KStyle { +class Q_EXPORT KLegacyStyle : public TDEStyle { Q_OBJECT public: KLegacyStyle(void); @@ -60,7 +60,7 @@ public: // toolbar stuffs virtual void drawKBarHandle(TQPainter *p, int x, int y, int w, int h, - const TQColorGroup &g, KToolBarPos type, TQBrush *fill = 0); + const TQColorGroup &g, TDEToolBarPos type, TQBrush *fill = 0); virtual void drawKickerHandle(TQPainter *p, int x, int y, int w, int h, const TQColorGroup &g, TQBrush *fill = 0); virtual void drawKickerAppletHandle(TQPainter *p, int x, int y, int w, int h, diff --git a/kstyles/klegacy/plugin.cpp b/kstyles/klegacy/plugin.cpp index a146de2c3..558b54e73 100644 --- a/kstyles/klegacy/plugin.cpp +++ b/kstyles/klegacy/plugin.cpp @@ -1,14 +1,14 @@ #include "klegacystyle.h" -#include <klocale.h> +#include <tdelocale.h> extern "C" { - KStyle* allocate(); + TDEStyle* allocate(); int minor_version(); int major_version(); const char *description(); } -KStyle* allocate() +TDEStyle* allocate() { return(new KLegacyStyle()); } diff --git a/kstyles/kthemestyle/kstyledirs.cpp b/kstyles/kthemestyle/kstyledirs.cpp index 7e548d0d5..8755fb294 100644 --- a/kstyles/kthemestyle/kstyledirs.cpp +++ b/kstyles/kthemestyle/kstyledirs.cpp @@ -1,7 +1,7 @@ /* $Id$ - Simple helper routines for style's use of KStandardDirs with TQSettings, etc. + Simple helper routines for style's use of TDEStandardDirs with TQSettings, etc. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public @@ -25,19 +25,19 @@ #include <kstandarddirs.h> #include "kstyledirs.h" -KStyleDirs* KStyleDirs::instance = 0; +TDEStyleDirs* TDEStyleDirs::instance = 0; -KStyleDirs::KStyleDirs() +TDEStyleDirs::TDEStyleDirs() { - addResourceType( "themepixmap", KStandardDirs::kde_default( "data" ) + "kstyle/pixmaps/" ); - addResourceType( "themerc", KStandardDirs::kde_default( "data" ) + "kstyle/themes/" ); + addResourceType( "themepixmap", TDEStandardDirs::kde_default( "data" ) + "kstyle/pixmaps/" ); + addResourceType( "themerc", TDEStandardDirs::kde_default( "data" ) + "kstyle/themes/" ); } -KStyleDirs::~KStyleDirs() +TDEStyleDirs::~TDEStyleDirs() { } -void KStyleDirs::addToSearch( const char* type, TQSettings& s ) const +void TDEStyleDirs::addToSearch( const char* type, TQSettings& s ) const { const TQStringList & dirs = resourceDirs(type); for ( int c = dirs.size()-1; c >= 0 ; c-- ) diff --git a/kstyles/kthemestyle/kstyledirs.h b/kstyles/kthemestyle/kstyledirs.h index 9d2635136..410fad2ef 100644 --- a/kstyles/kthemestyle/kstyledirs.h +++ b/kstyles/kthemestyle/kstyledirs.h @@ -30,22 +30,22 @@ /** * @short Access to the standard KDE directories for the pixmap style * @author Maksim Orlovich<[email protected]> is responsible for this file, - but all the interesting work is done by KStandardDirs + but all the interesting work is done by TDEStandardDirs * @version $Id$ * -* This class provides a this wrapper for styles around KStandardDirs, +* This class provides a this wrapper for styles around TDEStandardDirs, * permitting integration with TQSettings and easy loading of pixmaps * * It add share/apps/kstyle/themes as "themerc", * share/apps/kstyle/pixmaps "themepixmap" */ -class KStyleDirs: public KStandardDirs +class TDEStyleDirs: public TDEStandardDirs { public: - static KStyleDirs* dirs() + static TDEStyleDirs* dirs() { if ( !instance) - instance = new KStyleDirs; + instance = new TDEStyleDirs; return instance; } @@ -60,7 +60,7 @@ public: For example, when one does the following: TQSettings settings; - KStyleDirs dirs; + TDEStyleDirs dirs; dirs.addToSearch("config",settings); The one can do settings.readEntry("kstyle/KDE/WidgetStyle") to access a settings in kstylerc. @@ -68,15 +68,15 @@ public: void addToSearch( const char* type, TQSettings& q) const; //Better name? protected: - static KStyleDirs* instance; + static TDEStyleDirs* instance; /** Creates an instance of the class, and calculates the path information. */ - KStyleDirs(); - KStyleDirs(const KStyleDirs&); - KStyleDirs& operator= (const KStyleDirs&); + TDEStyleDirs(); + TDEStyleDirs(const TDEStyleDirs&); + TDEStyleDirs& operator= (const TDEStyleDirs&); - virtual ~KStyleDirs(); + virtual ~TDEStyleDirs(); }; #endif diff --git a/kstyles/kthemestyle/kthemebase.cpp b/kstyles/kthemestyle/kthemebase.cpp index 56cbeb09f..adbf49084 100644 --- a/kstyles/kthemestyle/kthemebase.cpp +++ b/kstyles/kthemestyle/kthemebase.cpp @@ -7,7 +7,7 @@ KDE3 port (C) 2001-2002 Maksim Orlovich <[email protected]> Port version 0.9.7 - Palette setup code is from KApplication, + Palette setup code is from TDEApplication, Copyright (C) 1997 Matthias Kalle Dalheimer ([email protected]) Copyright (C) 1998, 1999, 2000 KDE Team @@ -60,7 +60,7 @@ Bugs: Can't delete old slider image when calculating the rotated one for some reason. */ -//Shamelessly stolen from KConfigBase +//Shamelessly stolen from TDEConfigBase static TQColor readColorEntry( TQSettings* s, const char *pKey, const TQColor* pDefault ) { @@ -423,7 +423,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ ) TQSettings config; if (configDirName.isEmpty() || configDirName == ".") { - KStyleDirs::dirs()->addToSearch( "themerc", config ); + TDEStyleDirs::dirs()->addToSearch( "themerc", config ); } else config.insertSearchPath( TQSettings::Unix, configDirName ); @@ -525,7 +525,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ ) } KThemeBase::KThemeBase( const TQString& dir, const TQString & configFile ) - : KStyle( FilledFrameWorkaround ), configFileName( configFile ) + : TDEStyle( FilledFrameWorkaround ), configFileName( configFile ) { d = new KThemeBasePrivate; if ( configFileName.isEmpty() ) @@ -648,7 +648,7 @@ KThemeBase::~KThemeBase() if ( grHighColors[ i ] ) delete( grHighColors[ i ] ); } - KStyleDirs::release(); + TDEStyleDirs::release(); delete cache; delete d; } @@ -656,7 +656,7 @@ KThemeBase::~KThemeBase() TQImage* KThemeBase::loadImage( const TQString &name ) { TQImage * image = new TQImage; - TQString path = KStyleDirs::dirs()->findResource( "themepixmap",name ); + TQString path = TDEStyleDirs::dirs()->findResource( "themepixmap",name ); image->load( path ); if ( !image->isNull() ) return ( image ); @@ -668,7 +668,7 @@ TQImage* KThemeBase::loadImage( const TQString &name ) KThemePixmap* KThemeBase::loadPixmap( const TQString &name ) { KThemePixmap * pixmap = new KThemePixmap( false ); - TQString path = KStyleDirs::dirs()->findResource( "themepixmap", name ); + TQString path = TDEStyleDirs::dirs()->findResource( "themepixmap", name ); pixmap->load( path ); if ( !pixmap->isNull() ) return pixmap; diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h index 3e2019383..1e16bcee7 100644 --- a/kstyles/kthemestyle/kthemebase.h +++ b/kstyles/kthemestyle/kthemebase.h @@ -6,7 +6,7 @@ KDE3 port (C) 2001 Maksim Orlovich <[email protected]> - Palette setup code is from KApplication, + Palette setup code is from TDEApplication, Copyright (C) 1997 Matthias Kalle Dalheimer ([email protected]) Copyright (C) 1998, 1999, 2000 KDE Team @@ -34,7 +34,7 @@ Copyright (C) 1998, 1999, 2000 KDE Team #include <kpixmap.h> #include <tqintcache.h> #include <tqstring.h> -#include <kstyle.h> +#include <tdestyle.h> #include <tqsettings.h> #include <tqpalette.h> // for QColorGroup #include "kstyledirs.h" @@ -211,7 +211,7 @@ class KThemeBasePrivate; * * @author Daniel M. Duley <[email protected]> */ -class KThemeBase: public KStyle +class KThemeBase: public TDEStyle { Q_OBJECT public: @@ -280,7 +280,7 @@ public: Background, RotSliderGroove, RotInactiveTab, RotActiveTab, WIDGETS}; /** - * The scaling type specified by the KConfig file. + * The scaling type specified by the TDEConfig file. * * @param widget A Widgets enum value. * @@ -288,7 +288,7 @@ public: */ ScaleHint scaleHint( WidgetType widget ) const; /** - * The gradient type specified by the KConfig file. + * The gradient type specified by the TDEConfig file. * * @param widget A Widgets enum value. * @@ -510,14 +510,14 @@ protected: */ virtual int pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget = 0 ) const { - return KStyle::pixelMetric( metric, ceData, elementFlags, widget ); + return TDEStyle::pixelMetric( metric, ceData, elementFlags, widget ); } virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & cg, SFlags flags = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const { - KStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg, + TDEStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg, flags, option ); } @@ -532,7 +532,7 @@ protected: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const { - KStyle::drawControl( element, p, ceData, elementFlags, + TDEStyle::drawControl( element, p, ceData, elementFlags, r, cg, how, opt, widget ); } @@ -544,7 +544,7 @@ protected: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const { - KStyle::drawControlMask( element, p, ceData, elementFlags, r, opt, widget ); + TDEStyle::drawControlMask( element, p, ceData, elementFlags, r, opt, widget ); } @@ -560,11 +560,11 @@ protected: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const { - KStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget ); + TDEStyle::drawComplexControl( control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget ); } - virtual void drawKStylePrimitive( KStylePrimitive kpe, + virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -574,7 +574,7 @@ protected: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const { - KStyle::drawKStylePrimitive( kpe, + TDEStyle::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget ); } @@ -585,7 +585,7 @@ protected: TQStyleHintReturn* returnData = 0, const TQWidget *widget = 0 ) const { - return KStyle::styleHint( sh, + return TDEStyle::styleHint( sh, ceData, elementFlags, opt, @@ -600,7 +600,7 @@ protected: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const { - return KStyle::sizeFromContents( contents, + return TDEStyle::sizeFromContents( contents, ceData, elementFlags, contentsSize, opt, widget ); } diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index ff7199939..a164821b1 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -53,7 +53,7 @@ Port version 0.9.7 #include <tqpalette.h> #include <tqtabbar.h> #include <tqtoolbutton.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdrawutil.h> #include <tqdrawutil.h> #include <tqprogressbar.h> @@ -130,7 +130,7 @@ public: TQStringList keys() const { TQSettings cfg; - KStyleDirs::dirs()->addToSearch( "config", cfg ); + TDEStyleDirs::dirs()->addToSearch( "config", cfg ); TQStringList keys; bool ok; @@ -145,7 +145,7 @@ public: TQStyle* create( const TQString& key ) { TQSettings cfg; - KStyleDirs::dirs()->addToSearch( "config", cfg ); + TDEStyleDirs::dirs()->addToSearch( "config", cfg ); TQString file = cfg.readEntry( "/kthemestyle/" + key + "/file" ); if ( !key.isEmpty() ) @@ -330,7 +330,7 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQStyleControlElementData &ceData, return checkbox; } } - return KStyle::subRect(sr, ceData, elementFlags, widget); + return TDEStyle::subRect(sr, ceData, elementFlags, widget); } int KThemeStyle::pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget ) const @@ -515,7 +515,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C } } - return KStyle::objectEventHandler(ceData, elementFlags, source, event); + return TDEStyle::objectEventHandler(ceData, elementFlags, source, event); } void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) @@ -569,7 +569,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen { w->setBackgroundMode( TQWidget::NoBackground ); } - else if ( w->inherits( "KToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) ) + else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) ) { w->setBackgroundMode( TQWidget::PaletteBackground ); } @@ -626,7 +626,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen } } - KStyle::polish( ceData, elementFlags, ptr ); + TDEStyle::polish( ceData, elementFlags, ptr ); } void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) @@ -652,7 +652,7 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem w->setBackgroundMode( TQWidget::PaletteButton ); //For toolbar internal separators, return to button, too (can't use tqqt_cast here since don't have access to the class) - else if ( w->inherits( "KToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) ) + else if ( w->inherits( "TDEToolBarSeparator" ) || w->inherits( "QToolBarSeparator" ) ) w->setBackgroundMode( TQWidget::PaletteButton ); //For scrollbars, we don't do much, since the widget queries the style on the switch @@ -662,7 +662,7 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem w->unsetPalette(); } - KStyle::unPolish( ceData, elementFlags, ptr ); + TDEStyle::unPolish( ceData, elementFlags, ptr ); } @@ -1831,7 +1831,7 @@ void KThemeStyle::drawControlMask( ControlElement element, } -void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, +void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2004,7 +2004,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, if ( !handled ) { - KThemeBase::drawKStylePrimitive( kpe, p, ceData, elementFlags, + KThemeBase::drawTDEStylePrimitive( kpe, p, ceData, elementFlags, r, cg, flags, opt, widget ); } diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h index 457064a56..24f24e1a8 100644 --- a/kstyles/kthemestyle/kthemestyle.h +++ b/kstyles/kthemestyle/kthemestyle.h @@ -72,8 +72,8 @@ public: /** * Constructs a new KThemeStyle object. * - * @param configDir The directory which has the KConfig file. - * @param configFile A KConfig file to use as the theme configuration. + * @param configDir The directory which has the TDEConfig file. + * @param configFile A TDEConfig file to use as the theme configuration. * Defaults to ~/.kderc. */ KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null ); @@ -116,7 +116,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - virtual void drawKStylePrimitive( KStylePrimitive kpe, + virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index ef71e3c7f..0d343f778 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/light/lightstyle-v2.cpp @@ -67,7 +67,7 @@ static LightStyleV2Private *singleton = 0; LightStyleV2::LightStyleV2() - : KStyle(AllowMenuTransparency) + : TDEStyle(AllowMenuTransparency) { if (! singleton) singleton = new LightStyleV2Private; @@ -85,7 +85,7 @@ LightStyleV2::~LightStyleV2() void LightStyleV2::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - KStyle::polishPopupMenu(ceData, elementFlags, ptr); + TDEStyle::polishPopupMenu(ceData, elementFlags, ptr); } static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg, diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h index 3141ad978..90b3e89c9 100644 --- a/kstyles/light/lightstyle-v2.h +++ b/kstyles/light/lightstyle-v2.h @@ -24,7 +24,7 @@ #define LIGHTSTYLE_V2_H -#include <kstyle.h> +#include <tdestyle.h> #ifdef QT_PLUGIN @@ -34,7 +34,7 @@ #endif // QT_PLUGIN -class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public KStyle +class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle { Q_OBJECT diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index bf0163029..735bd3169 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -45,7 +45,7 @@ // The Light Style, 3rd revision LightStyleV3::LightStyleV3() - : KStyle(AllowMenuTransparency) + : TDEStyle(AllowMenuTransparency) { basestyle = TQStyleFactory::create( "Windows" ); if ( ! basestyle ) @@ -61,7 +61,7 @@ LightStyleV3::~LightStyleV3() void LightStyleV3::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - KStyle::polishPopupMenu(ceData, elementFlags, ptr); + TDEStyle::polishPopupMenu(ceData, elementFlags, ptr); // empty to satisy pure virtual requirements } diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h index ccda6cada..0330c8f87 100644 --- a/kstyles/light/lightstyle-v3.h +++ b/kstyles/light/lightstyle-v3.h @@ -28,7 +28,7 @@ #include <tqcommonstyle.h> #endif // QT_H -#include "kstyle.h" +#include "tdestyle.h" #ifdef QT_PLUGIN # define Q_EXPORT_STYLE_LIGHT_V3 @@ -37,7 +37,7 @@ #endif // QT_PLUGIN -class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public KStyle +class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle { Q_OBJECT TQStyle *basestyle; diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastikconf.cpp index 70d4f6cfa..491f06ffa 100644 --- a/kstyles/plastik/config/plastikconf.cpp +++ b/kstyles/plastik/config/plastikconf.cpp @@ -30,8 +30,8 @@ DEALINGS IN THE SOFTWARE. #include <tqsettings.h> #include <tqcolor.h> #include <tqgroupbox.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kcolorbutton.h> #include <kdemacros.h> @@ -41,7 +41,7 @@ extern "C" { KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent) { - KGlobal::locale()->insertCatalogue("kstyle_plastik_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config"); return new PlastikStyleConfig(parent); } } @@ -50,7 +50,7 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent) { //Should have no margins here, the dialog provides them TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0); - KGlobal::locale()->insertCatalogue("kstyle_plastik_config"); + TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config"); // scrollBarLines = new TQCheckBox(i18n("Scrollbar handle lines"), this); animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this); diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index e97cf6aed..e7b6acd7f 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -20,7 +20,7 @@ Copyright (C) 2000 Daniel M. Duley <[email protected]> (C) 2000 Dirk Mueller <[email protected]> (C) 2001 Martijn Klingens <[email protected]> - Progressbar code based on KStyle, + Progressbar code based on TDEStyle, Copyright (C) 2001-2002 Karol Szwed <[email protected]> This library is free software; you can redistribute it and/or @@ -151,7 +151,7 @@ class PlastikStylePlugin : public TQStylePlugin KDE_Q_EXPORT_PLUGIN( PlastikStylePlugin ) // -- end -- -PlastikStyle::PlastikStyle() : KStyle( AllowMenuTransparency, ThreeButtonScrollBar), +PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrollBar), kickerMode(false), kornMode(false), flatMode(false) @@ -240,9 +240,9 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...? - khtmlWidgets[widget] = true; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(khtmlWidgetDestroyed(TQObject*))); + if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? + tdehtmlWidgets[widget] = true; + connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*))); } // use tqqt_cast where possible to check if the widget inheits one of the classes. might improve @@ -275,7 +275,7 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen } } - KStyle::polish(ceData, elementFlags, ptr); + TDEStyle::polish(ceData, elementFlags, ptr); } void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) @@ -283,8 +283,8 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if( !strcmp(widget->name(), "__khtml") ) { // is it a khtml widget...? - khtmlWidgets.remove(widget); + if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? + tdehtmlWidgets.remove(widget); } // use tqqt_cast to check if the widget inheits one of the classes. @@ -311,12 +311,12 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem } } - KStyle::unPolish(ceData, elementFlags, ptr); + TDEStyle::unPolish(ceData, elementFlags, ptr); } -void PlastikStyle::khtmlWidgetDestroyed(TQObject* obj) +void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj) { - khtmlWidgets.remove(TQT_TQWIDGET(obj)); + tdehtmlWidgets.remove(TQT_TQWIDGET(obj)); } void PlastikStyle::progressBarDestroyed(TQObject* obj) @@ -719,7 +719,7 @@ void PlastikStyle::renderButton(TQPainter *p, bool mouseOver, bool horizontal, bool enabled, - bool khtmlMode) const + bool tdehtmlMode) const { // small fix for the kicker buttons... if(kickerMode) enabled = true; @@ -728,7 +728,7 @@ void PlastikStyle::renderButton(TQPainter *p, uint contourFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom; if(!enabled) contourFlags|=Is_Disabled; - if(khtmlMode) contourFlags|=Draw_AlphaBlend; + if(tdehtmlMode) contourFlags|=Draw_AlphaBlend; uint surfaceFlags = Draw_Left|Draw_Right|Draw_Top|Draw_Bottom; if(horizontal) surfaceFlags|=Is_Horizontal; @@ -1198,7 +1198,7 @@ void PlastikStyle::renderTab(TQPainter *p, } } -void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe, +void PlastikStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1373,7 +1373,7 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe, break; } - // copied and slightly modified from KStyle. + // copied and slightly modified from TDEStyle. case KPE_ListViewBranch: { // Typical Windows style listview branch element (dotted line). @@ -1446,7 +1446,7 @@ void PlastikStyle::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); } } @@ -1526,8 +1526,8 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, case PE_ButtonTool: case PE_ButtonDropDown: case PE_ButtonCommand: { - bool khtmlMode = opt.isDefault() ? false : khtmlWidgets.contains(opt.widget()); - renderButton(p, r, cg, (on||down), mouseOver, true, enabled, khtmlMode ); + bool tdehtmlMode = opt.isDefault() ? false : tdehtmlWidgets.contains(opt.widget()); + renderButton(p, r, cg, (on||down), mouseOver, true, enabled, tdehtmlMode ); break; } @@ -1884,12 +1884,12 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, // HACK!! // - // In order to draw nice edges in khtml, we need to paint alpha-blended. + // In order to draw nice edges in tdehtml, we need to paint alpha-blended. // On the other hand, we can't paint alpha-blended in normal widgets. // - // In this place there is no reliable way to detect if we are in khtml; the - // only thing we know is that khtml buffers its widgets into a pixmap. So - // when the paint device is a TQPixmap, chances are high that we are in khtml. + // In this place there is no reliable way to detect if we are in tdehtml; the + // only thing we know is that tdehtml buffers its widgets into a pixmap. So + // when the paint device is a TQPixmap, chances are high that we are in tdehtml. // It's possible that this breaks other things, so let's see how it works... if (p->device() && dynamic_cast<TQPixmap*>(p->device() ) ) { contourFlags += Draw_AlphaBlend; @@ -2175,7 +2175,7 @@ void PlastikStyle::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); } } } @@ -2375,7 +2375,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element, renderTab(p, r, cg, mouseOver, selected, true, pos, false, cornerWidget); break; default: - KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); + TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); } break; @@ -2734,7 +2734,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element, break; default: - KStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); + TDEStyle::drawControl(element, p, ceData, elementFlags, r, cg, flags, opt, widget); } } @@ -2755,7 +2755,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element, } default: { - KStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w); + TDEStyle::drawControlMask (element, p, ceData, elementFlags, r, opt, w); } } } @@ -2778,7 +2778,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, break; } default: { - KStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w); + TDEStyle::drawComplexControlMask (c, p, ceData, elementFlags, r, o, w); } } } @@ -2816,7 +2816,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control, :cg.background(); uint contourFlags = 0; - if( khtmlWidgets.contains(cb) ) + if( tdehtmlWidgets.contains(cb) ) contourFlags |= Draw_AlphaBlend; if (_inputFocusHighlight && hasFocus && editable && enabled) @@ -3168,7 +3168,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control, } default: - KStyle::drawComplexControl(control, p, ceData, elementFlags, + TDEStyle::drawComplexControl(control, p, ceData, elementFlags, r, cg, flags, controls, active, opt, widget); break; @@ -3183,7 +3183,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, return querySubControlMetrics( CC_ComboBox, ceData, elementFlags, SC_ComboBoxEditField, TQStyleOption::Default, widget ); } - // Don't use KStyles progressbar subrect + // Don't use TDEStyles progressbar subrect // TODO: case SR_ProgressBarGroove: { return TQRect(ceData.rect); @@ -3195,7 +3195,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, } default: { - return KStyle::subRect(r, ceData, elementFlags, widget); + return TDEStyle::subRect(r, ceData, elementFlags, widget); } } } @@ -3216,7 +3216,7 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control, return TQRect(r.left()+2, r.top()+2, r.width()-4-15-1, r.height()-4); } default: { - return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); + return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); } } break; @@ -3260,13 +3260,13 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control, return TQRect(buttonsLeft, r.top()+1, bs.width(), r.height()-2); } default: { - return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); + return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); } } break; } default: { - return KStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); + return TDEStyle::querySubControlMetrics(control, ceData, elementFlags, subcontrol, opt, widget); } } } @@ -3373,7 +3373,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce return 2; default: - return KStyle::pixelMetric(m, ceData, elementFlags, widget); + return TDEStyle::pixelMetric(m, ceData, elementFlags, widget); } } @@ -3456,14 +3456,14 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, if(widget->parent() && ::tqqt_cast<TQToolBar*>(widget->parent()) ) return TQSize( s.width()+2*4, s.height()+2*4 ); else - return KStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); + return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); } 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); } int PlastikStyle::styleHint( TQ_StyleHint stylehint, @@ -3489,13 +3489,13 @@ int PlastikStyle::styleHint( TQ_StyleHint stylehint, } default: - return KStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget); + return TDEStyle::styleHint(stylehint, ceData, elementFlags, option, returnData, widget); } } bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *ev ) { - if (KStyle::objectEventHandler(ceData, elementFlags, source, ev) ) + if (TDEStyle::objectEventHandler(ceData, elementFlags, source, ev) ) return true; if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h index 708666a7f..68f707d79 100644 --- a/kstyles/plastik/plastik.h +++ b/kstyles/plastik/plastik.h @@ -18,7 +18,7 @@ Copyright (C) 2000 Daniel M. Duley <[email protected]> (C) 2000 Dirk Mueller <[email protected]> (C) 2001 Martijn Klingens <[email protected]> - Progressbar code based on KStyle, + Progressbar code based on TDEStyle, Copyright (C) 2001-2002 Karol Szwed <[email protected]> This library is free software; you can redistribute it and/or @@ -39,7 +39,7 @@ #ifndef __PLASTIK_H #define __PLASTIK_H -#include <kstyle.h> +#include <tdestyle.h> #include <tqbitmap.h> #include <tqintcache.h> @@ -54,7 +54,7 @@ class TQSettings; class TQTab; class TQTimer; -class PlastikStyle : public KStyle +class PlastikStyle : public TDEStyle { Q_OBJECT @@ -66,7 +66,7 @@ public: void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); - void drawKStylePrimitive(KStylePrimitive kpe, + void drawTDEStylePrimitive(TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -233,7 +233,7 @@ protected: bool mouseOver = false, bool horizontal = true, bool enabled = true, - bool khtmlMode = false) const; + bool tdehtmlMode = false) const; void renderPanel(TQPainter *p, const TQRect &r, @@ -269,7 +269,7 @@ protected: virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); protected slots: - void khtmlWidgetDestroyed(TQObject* w); + void tdehtmlWidgetDestroyed(TQObject* w); //Animation slots. void updateProgressPos(); @@ -300,8 +300,8 @@ private: TQColor _focusHighlightColor; TQColor _checkMarkColor; - // track khtml widgets. - TQMap<const TQWidget*,bool> khtmlWidgets; + // track tdehtml widgets. + TQMap<const TQWidget*,bool> tdehtmlWidgets; //Animation support. TQMap<TQWidget*, int> progAnimWidgets; diff --git a/kstyles/utils/installtheme/Makefile.am b/kstyles/utils/installtheme/Makefile.am index 2d7fab839..84272a681 100644 --- a/kstyles/utils/installtheme/Makefile.am +++ b/kstyles/utils/installtheme/Makefile.am @@ -10,7 +10,7 @@ bin_PROGRAMS = kinstalltheme kinstalltheme_SOURCES = main.cpp # the library search path. -kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kinstalltheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor # the libraries to link against. Be aware of the order. First the libraries, # that depend on the following ones. diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp index b9ab927cc..3ce63dfdf 100644 --- a/kstyles/utils/installtheme/main.cpp +++ b/kstyles/utils/installtheme/main.cpp @@ -25,10 +25,10 @@ #include <tqstringlist.h> #include <tqsettings.h> -#include <kapplication.h> -#include <kcmdlineargs.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeapplication.h> +#include <tdecmdlineargs.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> @@ -37,11 +37,11 @@ static const char ver[] = "0.9.1"; int main(int argc, char **argv) { - KCmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver); - KApplication qapp(false, false); //We don't allow styles.. Kind of ironic, isn't it? + TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver); + TDEApplication qapp(false, false); //We don't allow styles.. Kind of ironic, isn't it? - KGlobal::dirs()->addResourceType("themercs", KGlobal::dirs()->kde_default("data")+TQString("kstyle/themes")); - TQStringList themercs = KGlobal::dirs()->findAllResources("themercs","*.themerc"); + TDEGlobal::dirs()->addResourceType("themercs", TDEGlobal::dirs()->kde_default("data")+TQString("kstyle/themes")); + TQStringList themercs = TDEGlobal::dirs()->findAllResources("themercs","*.themerc"); TQMap <TQString, TQString> themes; //Name->file mapping.. @@ -62,7 +62,7 @@ int main(int argc, char **argv) } } - KSimpleConfig cache( KGlobal::dirs()->saveLocation("config")+"kthemestylerc"); + KSimpleConfig cache( TDEGlobal::dirs()->saveLocation("config")+"kthemestylerc"); #if 0 //Doesn't seem to work with present Qt.. diff --git a/kstyles/web/plugin.cpp b/kstyles/web/plugin.cpp index c22bb08fa..bd4371ce3 100644 --- a/kstyles/web/plugin.cpp +++ b/kstyles/web/plugin.cpp @@ -1,9 +1,9 @@ -#include <klocale.h> +#include <tdelocale.h> #include "webstyle.h" extern "C" { - KStyle * allocate() { return new WebStyle; } + TDEStyle * allocate() { return new WebStyle; } int minor_version() { return 0; } int major_version() { return 1; } const char * description() { return(i18n("Web style plugin").utf8()); } diff --git a/kstyles/web/webstyle.cpp b/kstyles/web/webstyle.cpp index ab5282e06..b3b461954 100644 --- a/kstyles/web/webstyle.cpp +++ b/kstyles/web/webstyle.cpp @@ -32,9 +32,9 @@ #include <tqdrawutil.h> #include <tqpainter.h> -#include <kapplication.h> +#include <tdeapplication.h> #include <kdrawutil.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kdebug.h> @@ -218,7 +218,7 @@ drawFunkyRect } WebStyle::WebStyle() - : KStyle() + : TDEStyle() { setButtonDefaultIndicatorWidth(6); setScrollBarExtent(_scrollBarExtent, _scrollBarExtent); @@ -423,7 +423,7 @@ WebStyle::drawPushButtonLabel(TQPushButton * b, TQPainter * p) { // This is complicated stuff and we don't really want to mess with it. - KStyle::drawPushButtonLabel(b, p); + TDEStyle::drawPushButtonLabel(b, p); } void @@ -474,7 +474,7 @@ WebStyle::drawScrollBarControls Qt::ArrowType t = sb->orientation() == Horizontal ? Qt::RightArrow : Qt::DownArrow; - // Is it me or is KStyle::drawArrow broken ? + // Is it me or is TDEStyle::drawArrow broken ? drawArrow ( @@ -930,7 +930,7 @@ WebStyle::drawArrow const TQBrush * fill ) { - KStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, fill); + TDEStyle::drawArrow(p, type, down, x, y, w, h, g, enabled, fill); } void @@ -965,7 +965,7 @@ WebStyle::drawSlider } void -WebStyle::drawKToolBar +WebStyle::drawTDEToolBar ( TQPainter * p, int x, @@ -973,7 +973,7 @@ WebStyle::drawKToolBar int w, int h, const TQColorGroup & g, - KToolBarPos /* pos */, + TDEToolBarPos /* pos */, TQBrush * /* fill */ ) { @@ -993,7 +993,7 @@ WebStyle::drawKBarHandle int w, int h, const TQColorGroup & g, - KToolBarPos /* pos */, + TDEToolBarPos /* pos */, TQBrush * /* fill */ ) { @@ -1025,7 +1025,7 @@ WebStyle::drawKMenuBar } void -WebStyle::drawKToolBarButton +WebStyle::drawTDEToolBarButton ( TQPainter * p, int x, @@ -1037,7 +1037,7 @@ WebStyle::drawKToolBarButton bool raised, bool enabled, bool popup, - KToolButtonType type, + TDEToolButtonType type, const TQString & btext, const TQPixmap * pixmap, TQFont * font, @@ -1308,7 +1308,7 @@ WebStyle::drawPopupMenuItem ) { // TODO - KStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h); + TDEStyle::drawPopupMenuItem(p, checkable, maxpmw, tab, mi, pal, act, enabled, x, y, w, h); } void diff --git a/kstyles/web/webstyle.h b/kstyles/web/webstyle.h index 5cd930c73..0e4c59dbd 100644 --- a/kstyles/web/webstyle.h +++ b/kstyles/web/webstyle.h @@ -20,7 +20,7 @@ #ifndef WEB_STYLE_H #define WEB_STYLE_H -#include <kstyle.h> +#include <tdestyle.h> #include <tqpalette.h> class TQPainter; @@ -28,7 +28,7 @@ class TQScrollBar; class TQPushButton; class TQWidget; -class WebStyle : public KStyle +class WebStyle : public TDEStyle { public: @@ -210,7 +210,7 @@ class WebStyle : public KStyle bool tickBelow ); - void drawKToolBar + void drawTDEToolBar ( TQPainter *, int x, @@ -218,7 +218,7 @@ class WebStyle : public KStyle int w, int h, const TQColorGroup &, - KToolBarPos, + TDEToolBarPos, TQBrush * fill = 0 ); @@ -230,7 +230,7 @@ class WebStyle : public KStyle int w, int h, const TQColorGroup &, - KToolBarPos, + TDEToolBarPos, TQBrush * fill = 0 ); @@ -246,7 +246,7 @@ class WebStyle : public KStyle TQBrush * fill = 0 ); - void drawKToolBarButton + void drawTDEToolBarButton ( TQPainter * p, int x, @@ -258,7 +258,7 @@ class WebStyle : public KStyle bool raised = true, bool enabled = true, bool popup = false, - KToolButtonType = Icon, + TDEToolButtonType = Icon, const TQString & btext = TQString::null, const TQPixmap * = 0, TQFont * = 0, |