diff options
Diffstat (limited to 'tdestyles')
37 files changed, 529 insertions, 576 deletions
diff --git a/tdestyles/asteroid/asteroid.cpp b/tdestyles/asteroid/asteroid.cpp index 7119af5a8..8a66cbe80 100644 --- a/tdestyles/asteroid/asteroid.cpp +++ b/tdestyles/asteroid/asteroid.cpp @@ -46,8 +46,6 @@ #include "asteroid.h" -// #define MINIMUM_PUSHBUTTON_WIDTH 75; -// #define MINIMUM_PUSHBUTTON_HEIGHT 23; #define MINIMUM_PUSHBUTTON_WIDTH 73; #define MINIMUM_PUSHBUTTON_HEIGHT 21; @@ -56,15 +54,6 @@ #define SPINBOX_BUTTON_WIDTH 12 -//#define POPUPMENUITEM_TEXT_ETCH_CONDITIONS ( etchtext && !enabled && !active ) -#define POPUPMENUITEM_TEXT_ETCH_CONDITIONS ( etchtext && !enabled ) - -#define PUSHBUTTON_TEXT_ETCH_CONDITIONS ( etchtext && !enabled ) -#define HEADER_TEXT_ETCH_CONDITIONS ( etchtext && !enabled ) -#define TABBAR_TEXT_ETCH_CONDITIONS ( etchtext && !enabled ) -#define CHECKBOX_TEXT_ETCH_CONDITIONS ( etchtext && !enabled ) -#define RADIOBUTTON_TEXT_ETCH_CONDITIONS ( etchtext && !enabled ) - /* Hackery to make metasources work */ #include "asteroid.moc" @@ -94,7 +83,7 @@ TQ_EXPORT_PLUGIN(AsteroidStylePlugin); AsteroidStyle::AsteroidStyle() : TDEStyle(AllowMenuTransparency) { if (tqApp->inherits("TDEApplication")) { - connect(tqApp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(paletteChanged())); + connect(tqApp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(paletteChanged())); } backwards = TQApplication::reverseLayout(); @@ -108,7 +97,7 @@ AsteroidStyle::~AsteroidStyle() void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *w = reinterpret_cast<TQWidget*>(ptr); /* Screwing with the palette is fun! and required in order to make it feel authentic. -clee */ @@ -118,7 +107,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to? bool isProtectedObject = false; - TQObject *curparent = TQT_TQOBJECT(w); + TQObject *curparent = w; while (curparent) { if (curparent->inherits("KonqFileTip") || curparent->inherits("AppletItem") || curparent->inherits("KJanusWidget") @@ -135,7 +124,7 @@ void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlEleme } } - if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQPushButton")) { installObjectEventHandler(ceData, elementFlags, ptr, this); } else { @@ -159,7 +148,7 @@ AsteroidStyle::applicationPolish(const TQStyleControlElementData&, ControlElemen TQPalette wp = TQApplication::palette(); wp.setColor(TQColorGroup::Dark, TQColor(128, 128, 128)); wp.setColor(TQColorGroup::Mid, wp.active().color(TQColorGroup::Button).dark(150)); // Which GUI element(s) does this correspond to? - TQApplication::setPalette( wp, TRUE ); + TQApplication::setPalette( wp, true ); } /*! \reimp @@ -294,7 +283,7 @@ void AsteroidStyle::drawTDEStylePrimitive(TDEStylePrimitive ksp, } } -int AsteroidStyle::styleHint( TQ_StyleHint stylehint, +int AsteroidStyle::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, @@ -324,7 +313,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint, } } -void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, +void AsteroidStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -918,7 +907,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, } } - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { p->setPen(sf & Style_Enabled ? cg.foreground() : cg.light()); } @@ -980,7 +969,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, } } -void AsteroidStyle::drawControl(TQ_ControlElement ce, +void AsteroidStyle::drawControl(ControlElement ce, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1026,8 +1015,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, const TQTab * t = o.tab(); bool selected = sf & Style_Selected; - bool lastTab = (ceData.tabBarData.identIndexMap[t->identifier()] == ceData.tabBarData.tabCount-1) ? - TRUE : FALSE; + bool lastTab = (ceData.tabBarData.identIndexMap[t->identifier()] == ceData.tabBarData.tabCount-1); TQRect r2( r ); if ( ceData.tabBarData.shape == TQTabBar::RoundedAbove ) { p->setPen( cg.light() ); @@ -1138,7 +1126,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, tr.setWidth(tr.width()+4); // Compensate for text appearing too far to the left // TQRect tr_offset = TQRect(tr.x()+ETCH_X_OFFSET, tr.y()+ETCH_Y_OFFSET, tr.width(), tr.height()); TQRect tr_offset = TQRect(tr.x()+0, tr.y()+0, tr.width(), tr.height()); - if TABBAR_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { TQPen savePen = p->pen(); p->setPen( cg.light() ); TQColorGroup etchedcg = cg; @@ -1185,7 +1173,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, //TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height()); TQRect r_offset = TQRect(r.x()+0, r.y()+0, r.width(), r.height()); - if CHECKBOX_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { TQPen savePen = p->pen(); p->setPen( cg.light() ); TQColorGroup etchedcg = cg; @@ -1234,7 +1222,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, // TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height()); TQRect r_offset = TQRect(r.x()+0, r.y()+0, r.width(), r.height()); - if RADIOBUTTON_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { TQPen savePen = p->pen(); p->setPen( cg.light() ); TQColorGroup etchedcg = cg; @@ -1417,9 +1405,9 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } } - p->setPen( POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():cg.foreground() ); + p->setPen( ( etchtext && !enabled )?cg.dark():cg.foreground() ); TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height()); - if POPUPMENUITEM_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { TQPen savePen = p->pen(); p->setPen( cg.light() ); p->drawText(r_offset, text_flags, o.menuItem()->text()); @@ -1473,13 +1461,13 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } if (!pb->text().isNull()) { - p->setPen(POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():(enabled ? cg.buttonText() : pb->palette().disabled().buttonText())); + p->setPen(( etchtext && !enabled )?cg.dark():(enabled ? cg.buttonText() : pb->palette().disabled().buttonText())); if (pb->iconSet() && !pb->iconSet()->isNull()) { TQRect tpr(dx, r.y(), r.width()-dx, r.height()); TQRect tr(p->boundingRect(tpr, text_flags, pb->text())); TQRect tr_offset = TQRect(tr.x()+ETCH_X_OFFSET, tr.y()+ETCH_Y_OFFSET, tr.width(), tr.height()); - if PUSHBUTTON_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { TQPen savePen = p->pen(); p->setPen( cg.light() ); p->drawText(tr_offset, text_flags, pb->text()); @@ -1488,7 +1476,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, p->drawText(tr, text_flags, pb->text()); } else { TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height()); - if PUSHBUTTON_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { TQPen savePen = p->pen(); p->setPen( cg.light() ); p->drawText(r_offset, text_flags, pb->text()); @@ -1515,7 +1503,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, p->drawPixmap(pr.topLeft(), pm); pr = TQRect(pr.width(), r.top(), r.width() - pr.width(), r.height()); TQRect pr_offset = TQRect(pr.x()+ETCH_X_OFFSET, pr.y()+ETCH_Y_OFFSET, pr.width(), pr.height()); - if HEADER_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { p->setPen( cg.dark()) ; TQPen savePen = p->pen(); p->setPen( cg.light() ); @@ -1524,9 +1512,9 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } p->drawText(pr, text_flags, ceData.textLabel); } else { - p->setPen( POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():cg.buttonText() ); + p->setPen( ( etchtext && !enabled )?cg.dark():cg.buttonText() ); TQRect r_offset = TQRect(r.x()+ETCH_X_OFFSET, r.y()+ETCH_Y_OFFSET, r.width(), r.height()); - if HEADER_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { TQPen savePen = p->pen(); p->setPen( cg.light() ); p->drawText(r_offset, text_flags, ceData.textLabel); @@ -1611,8 +1599,8 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, if (mi->custom()) { int m = itemVMargin; - p->setPen( POPUPMENUITEM_TEXT_ETCH_CONDITIONS?cg.dark():cg.foreground() ); - if POPUPMENUITEM_TEXT_ETCH_CONDITIONS { + p->setPen( ( etchtext && !enabled )?cg.dark():cg.foreground() ); + if ( etchtext && !enabled ) { TQPen savePen = p->pen(); p->setPen( cg.light() ); TQColorGroup etchedcg = cg; @@ -1656,7 +1644,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, rr_offset = visualRect(rr_offset, r); } - if POPUPMENUITEM_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { p->setPen(cg.dark()); TQPen savePen = p->pen(); p->setPen( cg.light() ); @@ -1675,7 +1663,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, text_flags |= AlignRight; } - if POPUPMENUITEM_TEXT_ETCH_CONDITIONS { + if ( etchtext && !enabled ) { p->setPen(cg.dark()); TQPen savePen = p->pen(); p->setPen( cg.light() ); @@ -1686,11 +1674,11 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } else if (mi->pixmap()) { TQPixmap *pixmap = mi->pixmap(); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); } p->drawPixmap(xpos, y, *pixmap); if (pixmap->depth() == 1) { - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } } } @@ -1721,7 +1709,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, } } -void AsteroidStyle::drawControlMask(TQ_ControlElement ce, +void AsteroidStyle::drawControlMask(ControlElement ce, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1768,7 +1756,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce, } } -void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, +void AsteroidStyle::drawComplexControl(ComplexControl cc, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1886,15 +1874,15 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, if ( !verticalLine ) { // make 128*1 and 1*128 bitmaps that can be used for // drawing the right sort of lines. - verticalLine = new TQBitmap( 1, 129, TRUE ); - horizontalLine = new TQBitmap( 128, 1, TRUE ); + verticalLine = new TQBitmap( 1, 129, true ); + horizontalLine = new TQBitmap( 128, 1, true ); TQPointArray a( 64 ); TQPainter p; p.begin( verticalLine ); int i; for( i=0; i<64; i++ ) a.setPoint( i, 0, i*2+1 ); - p.setPen( Qt::color1 ); + p.setPen( TQt::color1 ); p.drawPoints( a ); p.end(); TQApplication::flushX(); @@ -1902,7 +1890,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, p.begin( horizontalLine ); for( i=0; i<64; i++ ) a.setPoint( i, i*2+1, 0 ); - p.setPen( Qt::color1 ); + p.setPen( TQt::color1 ); p.drawPoints( a ); p.end(); TQApplication::flushX(); @@ -1996,7 +1984,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, p->drawRect(hr); bool draw_skinny_frame = false; -// if (!ceData.widgetObjectTypes.contains(TQCOMBOBOX_OBJECT_NAME_STRING)) draw_skinny_frame = true; +// if (!ceData.widgetObjectTypes.contains("TQComboBox")) draw_skinny_frame = true; if (ceData.comboBoxListBoxFlags & CEF_IsVisible) draw_skinny_frame = true; if (draw_skinny_frame) { p->setPen(cg.mid()); @@ -2184,7 +2172,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, } } -void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc, +void AsteroidStyle::drawComplexControlMask(ComplexControl cc, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2300,7 +2288,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData & } case PM_DefaultFrameWidth: { - if (ceData.widgetObjectTypes.contains(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQPopupMenu")) { return 3; } else { return TDEStyle::pixelMetric(pm, ceData, elementFlags, w); @@ -2384,7 +2372,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceDat } } -TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc, +TQRect AsteroidStyle::querySubControlMetrics(ComplexControl cc, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, @@ -2629,7 +2617,7 @@ bool AsteroidStyle::objectEventHandler( const TQStyleControlElementData &ceData, /* Win2K has this interesting behaviour where it sets the current default button to whatever pushbutton the user presses the mouse on. I _think_ this emulates that properly. -clee */ - if (ceData.widgetObjectTypes.contains(TQPUSHBUTTON_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQPushButton")) { if (e->type() == TQEvent::MouseButtonPress) { widgetActionRequest(ceData, elementFlags, source, WAR_SetDefault); } diff --git a/tdestyles/asteroid/asteroid.h b/tdestyles/asteroid/asteroid.h index d6be130aa..8cea936c0 100644 --- a/tdestyles/asteroid/asteroid.h +++ b/tdestyles/asteroid/asteroid.h @@ -11,7 +11,7 @@ class AsteroidStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: AsteroidStyle(); @@ -44,12 +44,12 @@ public: const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; - void drawPrimitive(TQ_PrimitiveElement, + void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -58,7 +58,7 @@ public: SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default) const; - void drawControl(TQ_ControlElement, + void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -68,7 +68,7 @@ public: const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; - void drawControlMask(TQ_ControlElement, + void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -76,7 +76,7 @@ public: const TQStyleOption &, const TQWidget * = 0) const; - void drawComplexControl(TQ_ComplexControl, + void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -88,7 +88,7 @@ public: const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; - void drawComplexControlMask(TQ_ComplexControl, + void drawComplexControlMask(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -102,7 +102,7 @@ public: TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; - TQRect querySubControlMetrics(TQ_ComplexControl, + TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, diff --git a/tdestyles/highcolor/highcolor.cpp b/tdestyles/highcolor/highcolor.cpp index 82fb31b8b..daa88ee6c 100644 --- a/tdestyles/highcolor/highcolor.cpp +++ b/tdestyles/highcolor/highcolor.cpp @@ -79,7 +79,7 @@ class HighColorStylePlugin : public TQStylePlugin } }; -KDE_Q_EXPORT_PLUGIN( HighColorStylePlugin ) +TDE_EXPORT_PLUGIN( HighColorStylePlugin ) // --------------------------------------------------- @@ -190,19 +190,19 @@ HighColorStyle::~HighColorStyle() void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); // Put in order of highest occurrence to maximise hit rate - if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) { + if (widget->inherits("TQPushButton")) { installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING) || widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { + } else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) { widget->setBackgroundMode(TQWidget::NoBackground); - } else if (type == HighColor && widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { + } else if (type == HighColor && widget->inherits("TQToolBarExtensionWidget")) { installObjectEventHandler(ceData, elementFlags, ptr, this); } else if ( !qstrcmp( widget->name(), kdeToolbarWidget) ) { widget->setBackgroundMode( NoBackground ); // We paint the whole background. installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (widget->inherits(TQTOOLBOXBUTTON_OBJECT_NAME_STRING)) { + } else if (widget->inherits("TQToolBoxButton")) { TQFont font = widget->font(); font.setBold(true); widget->setFont(font); @@ -215,14 +215,14 @@ void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElem void HighColorStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if (widget->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) { + if (widget->inherits("TQPushButton")) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } - else if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING) || widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { + else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) { widget->setBackgroundMode(TQWidget::PaletteBackground); - } else if (type == HighColor && widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { + } else if (type == HighColor && widget->inherits("TQToolBarExtensionWidget")) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } else if ( !qstrcmp( widget->name(), kdeToolbarWidget) ) { removeObjectEventHandler(ceData, elementFlags, ptr, this); @@ -240,7 +240,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg { TQColor col = cg.button(); -#ifdef Q_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals +#ifdef TQ_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals if ( TQPaintDevice::x11AppDepth() >= 24 ) KPixmapEffect::gradient( pix, col.light(120), col.dark(115), KPixmapEffect::HorizontalGradient ); @@ -251,7 +251,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg // This function draws primitive elements as well as their masks. -void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, +void HighColorStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -430,7 +430,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, if (p && p->device()->devType() == TQInternal::Widget) { TQHeader* hdr = dynamic_cast<TQHeader*>(p->device()); if (hdr) - horizontal = hdr->orientation() == Qt::Horizontal; + horizontal = hdr->orientation() == TQt::Horizontal; } int x,y,w,h; @@ -730,7 +730,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, maskBmp.setMask(maskBmp); } - p->setPen(Qt::color1); + p->setPen(TQt::color1); p->drawPixmap(r.x(), r.y(), maskBmp); break; } @@ -1144,7 +1144,7 @@ void HighColorStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, } -void HighColorStyle::drawControl( TQ_ControlElement element, +void HighColorStyle::drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1480,20 +1480,20 @@ void HighColorStyle::drawControl( TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags); TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); @@ -1520,7 +1520,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element, } -void HighColorStyle::drawControlMask( TQ_ControlElement element, +void HighColorStyle::drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1548,7 +1548,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element, } -void HighColorStyle::drawComplexControl( TQ_ComplexControl control, +void HighColorStyle::drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1683,22 +1683,22 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control, } else if (!ceData.parentWidgetData.widgetObjectTypes.isEmpty()) { - if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) + if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) { TQToolBar* parent = (TQToolBar*)widget->parent(); TQRect pr = parent->rect(); renderGradient( p, r, cg.button(), - parent->orientation() == Qt::Vertical, + parent->orientation() == TQt::Vertical, r.x(), r.y(), pr.width()-2, pr.height()-2); } - else if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) + else if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBarExtensionWidget")) { TQWidget* parent = (TQWidget*)widget->parent(); TQToolBar* toolbar = (TQToolBar*)parent->parent(); TQRect tr = toolbar->rect(); - if ( toolbar->orientation() == Qt::Horizontal ) { + if ( toolbar->orientation() == TQt::Horizontal ) { renderGradient( p, r, cg.button(), false, r.x(), r.y(), r.width(), tr.height() ); } else { @@ -1735,7 +1735,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control, } -void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control, +void HighColorStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2016,7 +2016,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData TQToolBar* toolbar; - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); @@ -2032,14 +2032,14 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *widget = TQT_TQWIDGET(object); - TQWidget *parent = TQT_TQWIDGET(object->parent()); + TQWidget *widget = static_cast<TQWidget*>(object); + TQWidget *parent = static_cast<TQWidget*>(object->parent()); int x_offset = ceData.rect.x(), y_offset = ceData.rect.y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { x_offset += parent->x(); y_offset += parent->y(); - parent = TQT_TQWIDGET(parent->parent()); + parent = static_cast<TQWidget*>(parent->parent()); } TQRect r = ceData.rect; @@ -2048,7 +2048,7 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData // Check if the parent is a QToolbar, and use its orientation, else guess. TQToolBar* tb = dynamic_cast<TQToolBar*>(parent); - if (tb) horiz_grad = tb->orientation() == Qt::Vertical; + if (tb) horiz_grad = tb->orientation() == TQt::Vertical; TQPainter p( widget ); renderGradient(&p, r, parent->colorGroup().button(), horiz_grad, @@ -2067,15 +2067,15 @@ bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData if ( event->type() == TQEvent::Paint ) { - TQWidget *widget = TQT_TQWIDGET(object); + TQWidget *widget = static_cast<TQWidget*>(object); TQRect wr = ceData.rect, tr = ceData.parentWidgetData.rect; TQPainter p( widget ); renderGradient(&p, wr, toolbar->colorGroup().button(), - toolbar->orientation() == Qt::Vertical, + toolbar->orientation() == TQt::Vertical, wr.x(), wr.y(), tr.width() - 2, tr.height() - 2); p.setPen( toolbar->colorGroup().dark() ); - if ( toolbar->orientation() == Qt::Horizontal ) + if ( toolbar->orientation() == TQt::Horizontal ) p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); else p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 ); @@ -2167,7 +2167,3 @@ void HighColorStyle::renderGradient( TQPainter* p, const TQRect& r, } } } - - -// vim: set noet ts=4 sw=4: - diff --git a/tdestyles/highcolor/highcolor.h b/tdestyles/highcolor/highcolor.h index 7fa618a92..4019dc10b 100644 --- a/tdestyles/highcolor/highcolor.h +++ b/tdestyles/highcolor/highcolor.h @@ -57,7 +57,7 @@ class TQPopupMenu; class HighColorStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: enum StyleType { HighColor = 0, Default, B3 }; @@ -81,7 +81,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -90,7 +90,7 @@ class HighColorStyle : public TDEStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -100,7 +100,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawControlMask( TQ_ControlElement element, + void drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -108,7 +108,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -120,7 +120,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControlMask( TQ_ComplexControl control, + void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -158,7 +158,7 @@ class HighColorStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; @@ -184,7 +184,4 @@ class HighColorStyle : public TDEStyle HighColorStyle( const HighColorStyle & ); HighColorStyle& operator=( const HighColorStyle & ); }; - -// vim: set noet ts=4 sw=4: - #endif diff --git a/tdestyles/highcontrast/config/highcontrastconfig.cpp b/tdestyles/highcontrast/config/highcontrastconfig.cpp index 8d8df0e79..ce43f45bd 100644 --- a/tdestyles/highcontrast/config/highcontrastconfig.cpp +++ b/tdestyles/highcontrast/config/highcontrastconfig.cpp @@ -33,7 +33,7 @@ DEALINGS IN THE SOFTWARE. #include "highcontrastconfig.h" -extern "C" KDE_EXPORT TQWidget* +extern "C" TDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent) { return new HighContrastStyleConfig(parent); @@ -57,7 +57,7 @@ HighContrastStyleConfig::HighContrastStyleConfig( "/highcontraststyle/Settings/wideLines", false); wideLinesBox->setChecked(originalWideLinesState); - connect(wideLinesBox, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateChanged())); + connect(wideLinesBox, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateChanged())); } HighContrastStyleConfig::~HighContrastStyleConfig() diff --git a/tdestyles/highcontrast/config/highcontrastconfig.h b/tdestyles/highcontrast/config/highcontrastconfig.h index d52a22b47..0f0a5ca09 100644 --- a/tdestyles/highcontrast/config/highcontrastconfig.h +++ b/tdestyles/highcontrast/config/highcontrastconfig.h @@ -31,7 +31,7 @@ class TQCheckBox; class HighContrastStyleConfig: public TQWidget { - Q_OBJECT + TQ_OBJECT public: HighContrastStyleConfig(TQWidget* parent); ~HighContrastStyleConfig(); diff --git a/tdestyles/highcontrast/highcontrast.cpp b/tdestyles/highcontrast/highcontrast.cpp index ef20af360..7646d998d 100644 --- a/tdestyles/highcontrast/highcontrast.cpp +++ b/tdestyles/highcontrast/highcontrast.cpp @@ -73,7 +73,7 @@ class HighContrastStylePlugin : public TQStylePlugin } }; -KDE_Q_EXPORT_PLUGIN (HighContrastStylePlugin) +TDE_EXPORT_PLUGIN (HighContrastStylePlugin) // --------------------------------------------------- @@ -154,14 +154,14 @@ void HighContrastStyle::polish( TQPalette& pal ) void HighContrastStyle::polish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if (widget->inherits (TQBUTTON_OBJECT_NAME_STRING) - || widget->inherits (TQCOMBOBOX_OBJECT_NAME_STRING) - || widget->inherits (TQSPINWIDGET_OBJECT_NAME_STRING) - || widget->inherits (TQLINEEDIT_OBJECT_NAME_STRING) - || widget->inherits (TQTEXTEDIT_OBJECT_NAME_STRING)) + if (widget->inherits ("TQButton") + || widget->inherits ("TQComboBox") + || widget->inherits ("TQSpinWidget") + || widget->inherits ("TQLineEdit") + || widget->inherits ("TQTextEdit")) { installObjectEventHandler(ceData, elementFlags, ptr, this); @@ -181,9 +181,9 @@ void HighContrastStyle::polish (const TQStyleControlElementData &ceData, Control void HighContrastStyle::unPolish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); - if (widget->inherits (TQWIDGET_OBJECT_NAME_STRING) || widget->inherits (TQCOMBOBOX_OBJECT_NAME_STRING) || widget->inherits (TQSPINWIDGET_OBJECT_NAME_STRING) || widget->inherits (TQLINEEDIT_OBJECT_NAME_STRING) || widget->inherits (TQTEXTEDIT_OBJECT_NAME_STRING)) { + if (widget->inherits ("TQWidget") || widget->inherits ("TQComboBox") || widget->inherits ("TQSpinWidget") || widget->inherits ("TQLineEdit") || widget->inherits ("TQTextEdit")) { installObjectEventHandler(ceData, elementFlags, ptr, this); } } @@ -219,12 +219,12 @@ void HighContrastStyle::setColorsByState (TQPainter* p, const TQColorGroup& cg, if ((flags & Style_Enabled) && (flags & highlight)) { - p->setPen (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine)); + p->setPen (TQPen (cg.highlightedText(), basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine)); p->setBackgroundColor (cg.highlight()); } else { - p->setPen (TQPen (fg, basicLineWidth, flags & Style_Enabled ? Qt::SolidLine : Qt::DotLine)); + p->setPen (TQPen (fg, basicLineWidth, flags & Style_Enabled ? TQt::SolidLine : TQt::DotLine)); p->setBackgroundColor (bg); } @@ -253,7 +253,7 @@ void HighContrastStyle::drawRoundRect (TQPainter* p, TQRect r, int offset, bool addOffset (&r3, lineWidth); p->save(); - p->setPen (Qt::NoPen); + p->setPen (TQt::NoPen); if (filled) p->fillRect (r3, p->backgroundColor()); p->drawRect (r3); @@ -286,7 +286,7 @@ void HighContrastStyle::drawEllipse (TQPainter* p, TQRect r, int offset, bool fi p->drawRoundRect (r, 99, 99); } -void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset) const +void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset) const { p->save(); addOffset (&r, offset); @@ -337,7 +337,7 @@ void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement a } // This function draws primitive elements -void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, +void HighContrastStyle::drawPrimitive (PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -371,9 +371,9 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, case PE_FocusRect: { p->save(); p->setBrush (TQBrush ()); - p->setPen (TQPen (cg.highlight(), basicLineWidth, Qt::SolidLine)); + p->setPen (TQPen (cg.highlight(), basicLineWidth, TQt::SolidLine)); drawRoundRect (p, r, basicLineWidth, false); - p->setPen (TQPen (cg.highlightedText(), basicLineWidth, Qt::DashLine)); + p->setPen (TQPen (cg.highlightedText(), basicLineWidth, TQt::DashLine)); drawRoundRect (p, r, basicLineWidth, false); p->restore(); break; @@ -472,7 +472,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, case PE_ProgressBarChunk: { - p->fillRect (r, Qt::color1); + p->fillRect (r, TQt::color1); break; } @@ -506,7 +506,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, break; } case PE_IndicatorMask: { - p->fillRect (r, Qt::color1); + p->fillRect (r, TQt::color1); break; } case PE_CheckMark: { @@ -535,10 +535,10 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, break; } case PE_ExclusiveIndicatorMask: { - p->fillRect (r, Qt::color0); - p->setBackgroundColor (Qt::color1); - p->setPen (Qt::NoPen); - p->setBrush (Qt::color1); + p->fillRect (r, TQt::color0); + p->setBackgroundColor (TQt::color1); + p->setPen (TQt::NoPen); + p->setBrush (TQt::color1); p->drawEllipse (r); break; } @@ -551,7 +551,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, setColorsButton (p, cg, flags); p->fillRect (r, p->backgroundColor()); - p->setPen (TQPen (p->pen().color(), 1, Qt::DashLine)); + p->setPen (TQPen (p->pen().color(), 1, TQt::DashLine)); if (flags & Style_Horizontal) p->drawLine (r.center().x(), r.top(), r.center().x(), r.bottom()); else @@ -713,7 +713,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, { setColorsButton (p, cg); p->fillRect (r, p->backgroundColor()); - p->setBrush (TQBrush (p->pen().color(), Qt::BDiagPattern)); + p->setBrush (TQBrush (p->pen().color(), TQt::BDiagPattern)); drawRoundRect (p, r); break; } @@ -724,7 +724,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, case KPE_SliderGroove: { setColorsText (p, cg, flags); TQRect r2 (r); - if (ceData.widgetObjectTypes.contains(TQSLIDER_OBJECT_NAME_STRING)) + if (ceData.widgetObjectTypes.contains("TQSlider")) { if (ceData.orientation == TQt::Horizontal) { @@ -764,7 +764,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, // Probably it would be better to add a KPM_ListViewExpander metric // to the TDEStyle TDEStylePixelMetric enum, and have the TDEStyle // drawComplexControl handle it. - TQ_PrimitiveElement direction; + PrimitiveElement direction; if (flags & Style_On) { // Collapsed = On direction = PE_ArrowRight; @@ -784,7 +784,7 @@ void HighContrastStyle::drawTDEStylePrimitive (TDEStylePrimitive kpe, } -void HighContrastStyle::drawControl (TQ_ControlElement element, +void HighContrastStyle::drawControl (ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1133,20 +1133,20 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags); TQRect vr = visualRect( TQRect( x + w - arrowHMargin - 2*itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); @@ -1162,7 +1162,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, } } -void HighContrastStyle::drawControlMask (TQ_ControlElement element, +void HighContrastStyle::drawControlMask (ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1207,7 +1207,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item) return sibling; } -void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, +void HighContrastStyle::drawComplexControl (ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1262,12 +1262,12 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, setColorsButton (p, cg, flags); // Draw arrows if required if (controls & SC_SpinWidgetDown) { - TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags); + TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetDown, TQStyleOption::Default, widget), ceData, elementFlags); drawRoundRect (p, r2); drawArrow (p, r2, PE_SpinWidgetDown, 2*basicLineWidth); } if (controls & SC_SpinWidgetUp) { - TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags); + TQRect r2 = TQStyle::visualRect (querySubControlMetrics ((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetUp, TQStyleOption::Default, widget), ceData, elementFlags); drawRoundRect (p, r2); drawArrow (p, r2, PE_SpinWidgetUp, 2*basicLineWidth); } @@ -1490,7 +1490,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, } } -void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c, +void HighContrastStyle::drawComplexControlMask(ComplexControl c, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -1535,7 +1535,7 @@ void HighContrastStyle::drawItem( TQPainter *p, p->restore(); } -TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control, +TQRect HighContrastStyle::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -1622,7 +1622,7 @@ int HighContrastStyle::pixelMetric(PixelMetric m, const TQStyleControlElementDat } case PM_DefaultFrameWidth: { - if (widget && (ceData.widgetObjectTypes.contains (TQLINEEDIT_OBJECT_NAME_STRING) || ceData.widgetObjectTypes.contains (TQTEXTEDIT_OBJECT_NAME_STRING))) + if (widget && (ceData.widgetObjectTypes.contains ("TQLineEdit") || ceData.widgetObjectTypes.contains ("TQTextEdit"))) return 2*basicLineWidth; else return basicLineWidth; @@ -1862,6 +1862,3 @@ int HighContrastStyle::styleHint(StyleHint sh, const TQStyleControlElementData & return ret; } - -// vim: set noet ts=4 sw=4: -// kate: indent-width 4; replace-tabs off; smart-indent on; tab-width 4; diff --git a/tdestyles/highcontrast/highcontrast.h b/tdestyles/highcontrast/highcontrast.h index 552526254..688742fb6 100644 --- a/tdestyles/highcontrast/highcontrast.h +++ b/tdestyles/highcontrast/highcontrast.h @@ -48,7 +48,7 @@ class TQPopupMenu; class HighContrastStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: HighContrastStyle(); @@ -69,7 +69,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -78,7 +78,7 @@ class HighContrastStyle : public TDEStyle SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -88,7 +88,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawControlMask( TQ_ControlElement element, + void drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -96,7 +96,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -108,7 +108,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControlMask( TQ_ComplexControl control, + void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -116,7 +116,7 @@ class HighContrastStyle : public TDEStyle const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - TQRect querySubControlMetrics( TQ_ComplexControl control, + TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -149,7 +149,7 @@ class HighContrastStyle : public TDEStyle TQRect subRect (SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget * widget) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; @@ -166,15 +166,11 @@ class HighContrastStyle : public TDEStyle void drawRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const; void drawRoundRect (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const; void drawEllipse (TQPainter* p, TQRect r, int offset = 0, bool filled = true) const; - void drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement arrow, int offset = 0) const; + void drawArrow (TQPainter* p, TQRect r, PrimitiveElement arrow, int offset = 0) const; int basicLineWidth; // Disable copy constructor and = operator HighContrastStyle( const HighContrastStyle & ); HighContrastStyle& operator=( const HighContrastStyle & ); }; - -// vim: set noet ts=4 sw=4: -// kate: indent-width 4; replace-tabs off; smart-indent on; tab-width 4; - #endif diff --git a/tdestyles/keramik/colorutil.cpp b/tdestyles/keramik/colorutil.cpp index 81d5eeb7a..69097f971 100644 --- a/tdestyles/keramik/colorutil.cpp +++ b/tdestyles/keramik/colorutil.cpp @@ -61,5 +61,3 @@ namespace Keramik return in; } } - -// vim: ts=4 sw=4 noet diff --git a/tdestyles/keramik/genembed.cpp b/tdestyles/keramik/genembed.cpp index 18608205d..cbbecae65 100644 --- a/tdestyles/keramik/genembed.cpp +++ b/tdestyles/keramik/genembed.cpp @@ -227,7 +227,7 @@ int main(int argc, char** argv) for (int pos=0; pos<size; pos++) { - QRgb basePix = (QRgb)*read; + TQRgb basePix = (TQRgb)*read; if (tqAlpha(basePix) != 255) reallySolid = false; @@ -245,7 +245,7 @@ int main(int argc, char** argv) read = reinterpret_cast< TQ_UINT32* >(input.bits() ); for (int pos=0; pos<size; pos++) { - QRgb basePix = (QRgb)*read; + TQRgb basePix = (TQRgb)*read; //cout<<(r*destAlpha.alphas[pos])<<"\n"; //cout<<(int)destAlpha.alphas[pos]<<"\n"; TQColor clr(basePix); @@ -383,5 +383,3 @@ int main(int argc, char** argv) return 0; } - -// vim: ts=4 sw=4 noet diff --git a/tdestyles/keramik/gradients.cpp b/tdestyles/keramik/gradients.cpp index ab804d117..a113d7a3c 100644 --- a/tdestyles/keramik/gradients.cpp +++ b/tdestyles/keramik/gradients.cpp @@ -35,7 +35,7 @@ namespace struct GradientCacheEntry { TQPixmap* m_pixmap; - QRgb m_color; + TQRgb m_color; bool m_menu; int m_width; int m_height; @@ -175,5 +175,3 @@ void GradientPainter::renderGradient( TQPainter* p, const TQRect& r, TQColor c, entry.m_pixmap = 0;//Don't free too early.. } - -// vim: ts=4 sw=4 noet diff --git a/tdestyles/keramik/keramik.cpp b/tdestyles/keramik/keramik.cpp index 1f93a5344..c46fd67b6 100644 --- a/tdestyles/keramik/keramik.cpp +++ b/tdestyles/keramik/keramik.cpp @@ -93,7 +93,7 @@ public: } }; -KDE_Q_EXPORT_PLUGIN( KeramikStylePlugin ) +TDE_EXPORT_PLUGIN( KeramikStylePlugin ) // --------------------------------------------------- @@ -123,7 +123,7 @@ namespace namespace { - void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::TQ_PrimitiveElement pe, bool down, bool enabled) + void drawKeramikArrow(TQPainter* p, TQColorGroup cg, TQRect r, TQStyle::PrimitiveElement pe, bool down, bool enabled) { TQPointArray a; @@ -179,7 +179,7 @@ void KeramikStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg, { TQColor col = cg.button(); -#ifdef Q_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals +#ifdef TQ_WS_X11 // Only draw menu gradients on TrueColor, X11 visuals if ( TQPaintDevice::x11AppDepth() >= 24 ) KPixmapEffect::gradient( pix, col.light(120), col.dark(115), KPixmapEffect::HorizontalGradient ); @@ -251,20 +251,20 @@ TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap, switch (stylepixmap) { case SP_TitleBarMinButton: return Keramik::PixmapLoader::the().pixmap(keramik_title_iconify, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); //return qpixmap_from_bits( iconify_bits, "title-iconify.png" ); case SP_TitleBarMaxButton: return Keramik::PixmapLoader::the().pixmap(keramik_title_maximize, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); case SP_TitleBarCloseButton: if (widget && widget->inherits("KDockWidgetHeader")) return Keramik::PixmapLoader::the().pixmap(keramik_title_close_tiny, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); else return Keramik::PixmapLoader::the().pixmap(keramik_title_close, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); case SP_TitleBarNormalButton: return Keramik::PixmapLoader::the().pixmap(keramik_title_restore, - Qt::black, Qt::black, false, false); + TQt::black, TQt::black, false, false); default: break; } @@ -290,7 +290,7 @@ KeramikStyle::KeramikStyle() if (animateProgressBar) { animationTimer = new TQTimer( this ); - connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) ); + connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) ); } firstComboPopupRelease = false; @@ -329,7 +329,7 @@ KeramikStyle::~KeramikStyle() void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); if (!qstrcmp(app->argv()[0], "kicker")) { kickerMode = true; @@ -339,28 +339,28 @@ void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); // Put in order of highest occurrence to maximise hit rate - if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) || widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) ) + if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) || widget->inherits("TQToolButton") ) { installObjectEventHandler(ceData, elementFlags, ptr, this); - if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQComboBox" ) ) widget->setBackgroundMode( NoBackground ); } - else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) + else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) ) widget->setBackgroundMode( NoBackground ); else if ( widget->parentWidget() && - ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || + ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) || widget->inherits( "TDECompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 4 ); listbox->setBackgroundMode( NoBackground ); installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { + } else if (widget->inherits("TQToolBarExtensionWidget")) { installObjectEventHandler(ceData, elementFlags, ptr, this); //widget->setBackgroundMode( NoBackground ); } @@ -369,11 +369,11 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen installObjectEventHandler(ceData, elementFlags, ptr, this); } - if (animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget)) + if (animateProgressBar && ::tqt_cast<TQProgressBar*>(widget)) { installObjectEventHandler(ceData, elementFlags, ptr, this); progAnimWidgets[static_cast<TQProgressBar*>(widget)] = 0; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*))); if (!animationTimer->isActive()) animationTimer->start( 50, false ); } @@ -384,35 +384,35 @@ void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); //### TODO: This needs major cleanup (and so does polish() ) - if ( widget->inherits( TQPUSHBUTTON_OBJECT_NAME_STRING ) || widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) ) { - if ( widget->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) + if ( widget->inherits( "TQComboBox" ) ) widget->setBackgroundMode( PaletteButton ); removeObjectEventHandler(ceData, elementFlags, ptr, this); } - else if ( widget->inherits( TQMENUBAR_OBJECT_NAME_STRING ) || widget->inherits( TQPOPUPMENU_OBJECT_NAME_STRING ) ) + else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) ) widget->setBackgroundMode( PaletteBackground ); else if ( widget->parentWidget() && - ( ( widget->inherits( TQLISTBOX_OBJECT_NAME_STRING ) && widget->parentWidget()->inherits( TQCOMBOBOX_OBJECT_NAME_STRING ) ) || + ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) || widget->inherits( "TDECompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 1 ); listbox->setBackgroundMode( PaletteBackground ); removeObjectEventHandler(ceData, elementFlags, ptr, this); widget->clearMask(); - } else if (widget->inherits(TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING)) { + } else if (widget->inherits("TQToolBarExtensionWidget")) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } else if ( !qstrcmp( widget->name(), kdeToolbarWidget ) ) { widget->setBackgroundMode( PaletteBackground ); removeObjectEventHandler(ceData, elementFlags, ptr, this); } - else if ( ::tqqt_cast<TQProgressBar*>(widget) ) + else if ( ::tqt_cast<TQProgressBar*>(widget) ) { progAnimWidgets.remove(static_cast<TQProgressBar*>(widget)); } @@ -423,7 +423,7 @@ void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem void KeramikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(static_cast<TQProgressBar*>(TQT_TQWIDGET(obj))); + progAnimWidgets.remove(static_cast<TQProgressBar*>(obj)); } @@ -487,13 +487,13 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr // Find the top-level toolbar of this widget, since it may be nested in other // widgets that are on the toolbar. - TQWidget *parent = (widget)?TQT_TQWIDGET(widget->parentWidget()):(TQWidget*)NULL; + TQWidget *parent = (widget)?widget->parentWidget():NULL; int x_offset = ceData.rect.x(), y_offset = ceData.rect.y(); while (parent && parent->parent() && !qstrcmp( parent->name(), kdeToolbarWidget ) ) { x_offset += parent->x(); y_offset += parent->y(); - parent = TQT_TQWIDGET(parent->parent()); + parent = static_cast<TQWidget*>(parent->parent()); } TQRect pr = ceData.parentWidgetData.rect; @@ -543,7 +543,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr } // This function draws primitive elements as well as their masks. -void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, +void KeramikStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -969,7 +969,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, if (kickerMode) { if (p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame" ) + TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame" ) { int x2 = x + r.width() - 1; int y2 = y + r.height() - 1; @@ -1107,7 +1107,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, TQWidget* paintWidget = dynamic_cast<TQWidget*>(p->device()); TQToolBar* parent = 0; if (paintWidget) - parent = ::tqqt_cast<TQToolBar*>(paintWidget->parentWidget()); + parent = ::tqt_cast<TQToolBar*>(paintWidget->parentWidget()); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal) ); if ( !(flags & Style_Horizontal) ) @@ -1267,10 +1267,10 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, if (horizontal) Keramik::ScaledPainter( keramik_slider ).draw( p, r, disabled ? cg.button() : hl, - Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); + TQt::black, disabled, Keramik::TilePainter::PaintFullBlend ); else Keramik::ScaledPainter( keramik_vslider ).draw( p, r, disabled ? cg.button() : hl, - Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); + TQt::black, disabled, Keramik::TilePainter::PaintFullBlend ); break; } @@ -1283,8 +1283,8 @@ void KeramikStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQToolBar* parent = 0; - if (widget && widget->parent() && widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) - parent = static_cast<TQToolBar*>(TQT_TQWIDGET(widget->parent())); + if (widget && widget->parent() && widget->parent()->inherits("TQToolBar")) + parent = static_cast<TQToolBar*>(widget->parent()); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal)); if (flags & Style_Horizontal) { @@ -1380,7 +1380,7 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const C return false; } -void KeramikStyle::drawControl( TQ_ControlElement element, +void KeramikStyle::drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1414,7 +1414,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, } else { - if (ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) + if (ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar")) toolbarBlendWidget = widget; drawPrimitive( PE_ButtonCommand, p, ceData, elementFlags, r, cg, flags ); @@ -1520,7 +1520,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, case CE_ToolButtonLabel: { - bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAR_OBJECT_NAME_STRING ); + bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBar" ); TQRect nr = r; if (!onToolbar) @@ -1588,7 +1588,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, case CE_DockWindowEmptyArea: { TQRect pr = r; - if (ceData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING)) + if (ceData.widgetObjectTypes.contains("TQToolBar")) { const TQToolBar* tb = static_cast<const TQToolBar*>(widget); if (tb->place() == TQDockWindow::OutsideDock) @@ -1600,10 +1600,10 @@ void KeramikStyle::drawControl( TQ_ControlElement element, //toolbar we normally paint over. } Keramik::GradientPainter::renderGradient( p, pr, cg.button(), - tb->orientation() == Qt::Horizontal); + tb->orientation() == TQt::Horizontal); } else - TDEStyle::drawControl( (TQ_ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, + TDEStyle::drawControl( (ControlElement)CE_DockWindowEmptyArea, p, ceData, elementFlags, r, cg, flags, opt, widget ); break; } @@ -1818,20 +1818,20 @@ void KeramikStyle::drawControl( TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x+diffw, y+itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - itemFrame; TQRect vr = visualRect( TQRect( x + w - arrowHMargin - itemFrame - dim, y + h / 2 - dim / 2, dim, dim), r ); @@ -1963,7 +1963,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, } } -void KeramikStyle::drawControlMask( TQ_ControlElement element, +void KeramikStyle::drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1995,7 +1995,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData &ceDat } } -void KeramikStyle::drawComplexControl( TQ_ComplexControl control, +void KeramikStyle::drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2029,7 +2029,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, if (controls == SC_All) { //Double-buffer only when we are in the slower full-blend mode - if ( ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING) || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) ) + if ( ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar") || !qstrcmp(ceData.parentWidgetData.name.ascii(), kdeToolbarWidget) ) { buf = new TQPixmap( r.width(), r.height() ); br.setX(0); @@ -2100,7 +2100,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, p2->setPen( cg.buttonText() ); p2->drawLineSegments( a ); - Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), Qt::black, disabled, Keramik::TilePainter::PaintFullBlend ); + Keramik::ScaledPainter( keramik_ripple ).draw( p2, rr, cg.button(), TQt::black, disabled, Keramik::TilePainter::PaintFullBlend ); } else //Size-constrained combo -- loose the ripple. { @@ -2125,7 +2125,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, p2->fillRect( er, cg.base() ); drawPrimitive( PE_PanelLineEdit, p2, ceData, elementFlags, er, cg ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( p2, er, cg.button(), - Qt::black, false, pmodeFullBlend() ); + TQt::black, false, pmodeFullBlend() ); } else if ( elementFlags & CEF_HasFocus ) { @@ -2164,7 +2164,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, case CC_SpinWidget: { const TQSpinWidget* sw = static_cast< const TQSpinWidget* >( widget ); - TQRect br = visualRect( querySubControlMetrics( (TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags ); + TQRect br = visualRect( querySubControlMetrics( (ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetButtonField, TQStyleOption::Default, widget ), ceData, elementFlags ); if ( controls & SC_SpinWidgetButtonField ) { Keramik::SpinBoxPainter().draw( p, br, cg.button(), cg.background(), !sw->isEnabled() ); @@ -2257,10 +2257,10 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, // TOOLBUTTON // ------------------------------------------------------------------- case CC_ToolButton: { - bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains(TQTOOLBAR_OBJECT_NAME_STRING); + bool onToolbar = ceData.parentWidgetData.widgetObjectTypes.contains("TQToolBar"); bool onExtender = !onToolbar && - ceData.parentWidgetData.widgetObjectTypes.contains( TQTOOLBAREXTENSIONWIDGET_OBJECT_NAME_STRING) && - widget && widget->parentWidget()->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); + ceData.parentWidgetData.widgetObjectTypes.contains( "TQToolBarExtensionWidget") && + widget && widget->parentWidget()->parentWidget()->inherits( "TQToolBar" ); bool onControlButtons = false; if (!onToolbar && !onExtender && !ceData.parentWidgetData.widgetObjectTypes.isEmpty() && @@ -2312,8 +2312,8 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, { // This assumes floating toolbars can't have extenders, //(so if we're on an extender, we're not floating) - TQWidget* parent = static_cast<TQWidget*> (TQT_TQWIDGET(widget->parent())); - TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(parent->parent())); + TQWidget* parent = static_cast<TQWidget*> (static_cast<TQWidget*>(widget->parent())); + TQToolBar* toolbar = static_cast<TQToolBar*>(parent->parent()); TQRect tr = ceData.parentWidgetData.rect; bool horiz = ceData.toolBarData.orientation == TQt::Horizontal; @@ -2361,7 +2361,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, } } -void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control, +void KeramikStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2437,7 +2437,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce case PM_TabBarTabShiftVertical: { - if (ceData.widgetObjectTypes.contains(TQTABBAR_OBJECT_NAME_STRING)) + if (ceData.widgetObjectTypes.contains("TQTabBar")) { if (ceData.tabBarData.shape == TQTabBar::RoundedBelow || ceData.tabBarData.shape == TQTabBar::TriangularBelow) @@ -2492,7 +2492,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, case CT_ToolButton: { - bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( TQTOOLBAR_OBJECT_NAME_STRING ); + bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "TQToolBar" ); if (!onToolbar) //Behaves like a button, so scale appropriately to the border { int w = contentSize.width(); @@ -2574,7 +2574,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, } -TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, +TQStyle::SubControl KeramikStyle::querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint& point, @@ -2585,7 +2585,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, if ( control == CC_ScrollBar && result == SC_ScrollBarAddLine ) { TQRect addline = querySubControlMetrics( control, ceData, elementFlags, result, opt, widget ); - if ( static_cast< const TQScrollBar* >( widget )->orientation() == Qt::Horizontal ) + if ( static_cast< const TQScrollBar* >( widget )->orientation() == TQt::Horizontal ) { if ( point.x() < addline.center().x() ) result = SC_ScrollBarSubLine; } @@ -2594,7 +2594,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, return result; } -TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, +TQRect KeramikStyle::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -2778,7 +2778,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, #include <config.h> -#if !defined Q_WS_X11 || defined K_WS_QTONLY +#if !defined TQ_WS_X11 || defined K_WS_QTONLY #undef HAVE_X11_EXTENSIONS_SHAPE_H #endif @@ -2795,29 +2795,29 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event )) return true; - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); if ( !object->isWidgetType() ) return false; //Combo line edits get special frames - if ( event->type() == TQEvent::Paint && ::tqqt_cast<TQLineEdit*>(object) ) + if ( event->type() == TQEvent::Paint && ::tqt_cast<TQLineEdit*>(object) ) { static bool recursion = false; if (recursion ) return false; recursion = true; - object->event( TQT_TQPAINTEVENT( event ) ); - TQWidget* widget = TQT_TQWIDGET( object ); + object->event( static_cast<TQPaintEvent*>( event ) ); + TQWidget* widget = static_cast<TQWidget*>( object ); TQPainter p( widget ); Keramik::RectTilePainter( keramik_frame_shadow, false, false, 2, 2 ).draw( &p, ceData.rect, - widget->palette().color( TQPalette::Normal, TQColorGroup::Button ), - Qt::black, false, Keramik::TilePainter::PaintFullBlend); + widget->palette().color( TQPalette::Active, TQColorGroup::Button ), + TQt::black, false, Keramik::TilePainter::PaintFullBlend); recursion = false; return true; } - else if ( ::tqqt_cast<TQListBox*>(object) ) + else if ( ::tqt_cast<TQListBox*>(object) ) { //Handle combobox drop downs switch (event->type()) @@ -2826,8 +2826,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, //Combo dropdowns are shaped case TQEvent::Resize: { - TQListBox* listbox = static_cast<TQListBox*>(TQT_TQWIDGET(object)); - TQResizeEvent* resize = TQT_TQRESIZEEVENT(event); + TQListBox* listbox = static_cast<TQListBox*>(object); + TQResizeEvent* resize = static_cast<TQResizeEvent*>(event); if (resize->size().height() < 6) return false; @@ -2859,8 +2859,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { TQPainter p( listbox ); Keramik::RectTilePainter( keramik_combobox_list, false, false ).draw( &p, 0, 0, listbox->width(), listbox->height(), - listbox->palette().color( TQPalette::Normal, TQColorGroup::Button ), - listbox->palette().color( TQPalette::Normal, TQColorGroup::Background ) ); + listbox->palette().color( TQPalette::Active, TQColorGroup::Button ), + listbox->palette().color( TQPalette::Active, TQColorGroup::Background ) ); TQPaintEvent newpaint( paint->region().intersect( listbox->contentsRect() ), paint->erased() ); recursion = true; @@ -2891,8 +2891,8 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { firstComboPopupRelease = false; - TQMouseEvent* mev = TQT_TQMOUSEEVENT(event); - TQListBox* box = static_cast<TQListBox*>(TQT_TQWIDGET(object)); + TQMouseEvent* mev = static_cast<TQMouseEvent*>(event); + TQListBox* box = static_cast<TQListBox*>(object); TQWidget* parent = box->parentWidget(); if (!parent) @@ -2919,24 +2919,24 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, { // Draw a gradient background for custom widgets in the toolbar // that have specified a "tde toolbar widget" name. - renderToolbarWidgetBackground(0, ceData, elementFlags, TQT_TQWIDGET(object)); + renderToolbarWidgetBackground(0, ceData, elementFlags, static_cast<TQWidget*>(object)); return false; // Now draw the contents } #if 0 // FIXME // This does not work on modern systems - // Rather than resorting to hacks like this, which can stop working at any time, the required functionality should simply be added to TQt3! - else if (event->type() == TQEvent::Paint && object->parent() && ::tqqt_cast<TQToolBar*>(object->parent()) - && !::tqqt_cast<TQPopupMenu*>(object) ) + // Rather than resorting to hacks like this, which can stop working at any time, the required functionality should simply be added to TQt! + else if (event->type() == TQEvent::Paint && object->parent() && ::tqt_cast<TQToolBar*>(object->parent()) + && !::tqt_cast<TQPopupMenu*>(object) ) { // We need to override the paint event to draw a // gradient on a QToolBarExtensionWidget. - TQToolBar* toolbar = static_cast<TQToolBar*>(TQT_TQWIDGET(object->parent())); - TQWidget* widget = TQT_TQWIDGET(object); + TQToolBar* toolbar = static_cast<TQToolBar*>(object->parent()); + TQWidget* widget = static_cast<TQWidget*>(object); TQRect wr = widget->rect (), tr = toolbar->rect(); TQPainter p( widget ); - if ( toolbar->orientation() == Qt::Horizontal ) + if ( toolbar->orientation() == TQt::Horizontal ) { Keramik::GradientPainter::renderGradient( &p, wr, widget->colorGroup().button(), true /*horizontal*/, false /*not a menu*/, @@ -2952,7 +2952,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, //Draw terminator line, too p.setPen( toolbar->colorGroup().mid() ); - if ( toolbar->orientation() == Qt::Horizontal ) + if ( toolbar->orientation() == TQt::Horizontal ) p.drawLine( wr.width()-1, 0, wr.width()-1, wr.height()-1 ); else p.drawLine( 0, wr.height()-1, wr.width()-1, wr.height()-1 ); @@ -2961,7 +2961,7 @@ bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, } #endif // Track show events for progress bars - if ( animateProgressBar && ::tqqt_cast<TQProgressBar*>(object) ) + if ( animateProgressBar && ::tqt_cast<TQProgressBar*>(object) ) { if ((event->type() == TQEvent::Show) && !animationTimer->isActive()) { @@ -3000,6 +3000,3 @@ int KeramikStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceDat return ret; } - -// vim: ts=4 sw=4 noet -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/tdestyles/keramik/keramik.h b/tdestyles/keramik/keramik.h index 7bf8cd3d4..23cc0d044 100644 --- a/tdestyles/keramik/keramik.h +++ b/tdestyles/keramik/keramik.h @@ -41,7 +41,7 @@ class TQProgressBar; class KeramikStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: KeramikStyle(); @@ -65,7 +65,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -74,7 +74,7 @@ public: SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -84,7 +84,7 @@ public: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawControlMask( TQ_ControlElement element, + void drawControlMask( ControlElement element, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -92,7 +92,7 @@ public: const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -104,7 +104,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawComplexControlMask( TQ_ComplexControl control, + void drawComplexControlMask( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -121,21 +121,21 @@ public: const TQStyleOption& opt, const TQWidget* widget = 0 ) const; - SubControl querySubControl( TQ_ComplexControl control, + SubControl querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint& point, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - TQRect querySubControlMetrics( TQ_ComplexControl control, + TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; @@ -221,6 +221,3 @@ private: }; #endif - -// vim: ts=4 sw=4 noet -// kate: indent-width 4; replace-tabs off; tab-width 4; diff --git a/tdestyles/keramik/pixmaploader.cpp b/tdestyles/keramik/pixmaploader.cpp index 00b4626fd..b506f9300 100644 --- a/tdestyles/keramik/pixmaploader.cpp +++ b/tdestyles/keramik/pixmaploader.cpp @@ -316,7 +316,7 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const { if (mode == PaintTrivialMask) { - p->fillRect(x, y, width, height, Qt::color1); + p->fillRect(x, y, width, height, TQt::color1); return; } @@ -425,12 +425,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const const TQBitmap* mask = scale( col, row, w, h, color, bg, disabled, false ).mask(); if (mask) { - p->setBackgroundColor(Qt::color0); - p->setPen(Qt::color1); + p->setBackgroundColor(TQt::color0); + p->setPen(TQt::color1); p->drawTiledPixmap( xpos, ypos, realW, realH, *mask); } else - p->fillRect ( xpos, ypos, realW, realH, Qt::color1); + p->fillRect ( xpos, ypos, realW, realH, TQt::color1); } } else @@ -445,12 +445,12 @@ void TilePainter::draw( TQPainter *p, int x, int y, int width, int height, const const TQBitmap* mask = tile( col, row, color, bg, disabled, false ).mask(); if (mask) { - p->setBackgroundColor(Qt::color0); - p->setPen(Qt::color1); + p->setBackgroundColor(TQt::color0); + p->setPen(TQt::color1); p->drawTiledPixmap( xpos, ypos, realW, realH, *mask); } else - p->fillRect ( xpos, ypos, realW, realH, Qt::color1); + p->fillRect ( xpos, ypos, realW, realH, TQt::color1); } } @@ -624,6 +624,3 @@ int SpinBoxPainter::tileName( unsigned int column, unsigned int ) const { return column + 1; } - -// vim: ts=4 sw=4 noet -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent off; diff --git a/tdestyles/keramik/pixmaploader.h b/tdestyles/keramik/pixmaploader.h index ab0bb4223..3bfcd2d1b 100644 --- a/tdestyles/keramik/pixmaploader.h +++ b/tdestyles/keramik/pixmaploader.h @@ -67,8 +67,8 @@ namespace Keramik int m_id; int m_width; int m_height; - QRgb m_colorCode; - QRgb m_bgCode; + TQRgb m_colorCode; + TQRgb m_bgCode; bool m_disabled; bool m_blended; @@ -362,6 +362,3 @@ namespace Keramik } #endif - -// vim: ts=4 sw=4 noet -// kate: indent-width 4; replace-tabs off; tab-width 4; diff --git a/tdestyles/klegacy/klegacystyle.cpp b/tdestyles/klegacy/klegacystyle.cpp index 8daf82c06..1dcfadf56 100644 --- a/tdestyles/klegacy/klegacystyle.cpp +++ b/tdestyles/klegacy/klegacystyle.cpp @@ -81,7 +81,6 @@ #include <tqregexp.h> #include <tqscrollbar.h> #include <tqscrollview.h> -#include <tqsemimodal.h> #include <tqsizegrip.h> #include <tqslider.h> #include <tqspinbox.h> @@ -387,7 +386,7 @@ static TQPixmap *drawImage(TQImage *image, int width, int height, // draw the image bool mask = image->hasAlphaBuffer(); TQBitmap bm(width, height); - bm.fill(Qt::color1); + bm.fill(TQt::color1); TQImage nimage[3][3]; int xx = -1, yy = -1; @@ -404,12 +403,12 @@ static TQPixmap *drawImage(TQImage *image, int width, int height, if (nimage[yy][xx].isNull()) continue; bitBlt(pixmap, x2[xx], y2[yy], &nimage[yy][xx], - 0, 0, w2[xx], h2[yy], Qt::CopyROP); + 0, 0, w2[xx], h2[yy], TQt::CopyROP); if (mask) { TQImage am = nimage[yy][xx].createAlphaMask(); bitBlt(&bm, x2[xx], y2[yy], &am, - 0, 0, w2[xx], h2[yy], Qt::CopyROP); + 0, 0, w2[xx], h2[yy], TQt::CopyROP); } } } @@ -419,14 +418,14 @@ static TQPixmap *drawImage(TQImage *image, int width, int height, } else { for (int y = 0; y < height; y += image->height()) for (int x = 0; x < width; x += image->width()) - bitBlt(pixmap, x, y, image, 0, 0, -1, -1, Qt::CopyROP); + bitBlt(pixmap, x, y, image, 0, 0, -1, -1, TQt::CopyROP); if (image->hasAlphaBuffer()) { TQImage mask = image->createAlphaMask(); if (! mask.isNull() && mask.depth() == 1) { TQBitmap bm(width, height); - bm.fill(Qt::color1); + bm.fill(TQt::color1); bm = mask; pixmap->setMask(bm); } @@ -707,7 +706,6 @@ static GtkObject *initialize(TQPtrDict<GtkObject> &dict) { dict.insert(TQRadioButton::staticMetaObject(), myGtkRadioButton); dict.insert(TQScrollBar::staticMetaObject(), myGtkScrollbar); dict.insert(TQScrollView::staticMetaObject(), myGtkViewport); - dict.insert(TQSemiModal::staticMetaObject(), myGtkDialog); dict.insert(TQSizeGrip::staticMetaObject(), myGtkWidget); dict.insert(TQSlider::staticMetaObject(), myGtkScale); dict.insert(TQSpinBox::staticMetaObject(), myGtkSpinButton); @@ -1210,13 +1208,13 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) { if (equals.isNull() || parameter.isNull() || equals != "=") continue; if (parameter == "UP") - imagedata->key.data.arrowDirection = Qt::UpArrow + 1; + imagedata->key.data.arrowDirection = TQt::UpArrow + 1; else if (parameter == "DOWN") - imagedata->key.data.arrowDirection = Qt::DownArrow + 1; + imagedata->key.data.arrowDirection = TQt::DownArrow + 1; else if (parameter == "LEFT") - imagedata->key.data.arrowDirection = Qt::LeftArrow + 1; + imagedata->key.data.arrowDirection = TQt::LeftArrow + 1; else if (parameter == "RIGHT") - imagedata->key.data.arrowDirection = Qt::RightArrow + 1; + imagedata->key.data.arrowDirection = TQt::RightArrow + 1; } else if (next == "border") { filestream >> equals; filestream >> parameter; @@ -1323,9 +1321,9 @@ bool KLegacyStylePrivate::parseImage(KLegacyStyleData *styledata) { if (equals.isNull() || parameter.isNull() || equals != "=") continue; if (parameter == "VERTICAL") - imagedata->key.data.orientation = Qt::Vertical + 1; + imagedata->key.data.orientation = TQt::Vertical + 1; else if (parameter == "HORIZONTAL") - imagedata->key.data.orientation = Qt::Horizontal + 1; + imagedata->key.data.orientation = TQt::Horizontal + 1; } else if (next == "overlay_border") { filestream >> equals; filestream >> parameter; @@ -1821,9 +1819,9 @@ void KLegacyStyle::polish(TQApplication *app) { brush.setColor(gobj->backColor(KLegacy::Active)); pal.setBrush(TQPalette::Active, TQColorGroup::Button, brush); - brush = pal.brush(TQPalette::Normal, TQColorGroup::Button); + brush = pal.brush(TQPalette::Active, TQColorGroup::Button); brush.setColor(gobj->backColor(KLegacy::Normal)); - pal.setBrush(TQPalette::Normal, TQColorGroup::Button, brush); + pal.setBrush(TQPalette::Active, TQColorGroup::Button, brush); brush = pal.brush(TQPalette::Disabled, TQColorGroup::Button); brush.setColor(gobj->backColor(KLegacy::Insensitive)); @@ -1898,23 +1896,23 @@ void KLegacyStyle::polish(TQWidget *widget) { bool immediateRender = false; bool bgPixmap = false; - if (widget->inherits(TQBUTTON_OBJECT_NAME_STRING)) { + if (widget->inherits("TQButton")) { metaobject = TQButton::staticMetaObject(); eventFilter = true; } - if (widget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) { + if (widget->inherits("TQComboBox")) { metaobject = TQComboBox::staticMetaObject(); eventFilter = true; } - if (widget->inherits(TQSCROLLBAR_OBJECT_NAME_STRING)) { + if (widget->inherits("TQScrollBar")) { metaobject = TQScrollBar::staticMetaObject(); eventFilter = true; mouseTrack = true; } - if (widget->inherits(TQMENUBAR_OBJECT_NAME_STRING)) { + if (widget->inherits("TQMenuBar")) { eventFilter = true; immediateRender = true; @@ -1930,7 +1928,7 @@ void KLegacyStyle::polish(TQWidget *widget) { widget->setBackgroundMode(TQWidget::PaletteBackground); } - if (widget->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { + if (widget->inherits("TQToolBar")) { metaobject = TQToolBar::staticMetaObject(); eventFilter = true; @@ -1944,7 +1942,7 @@ void KLegacyStyle::polish(TQWidget *widget) { widget->setBackgroundMode(TQWidget::PaletteBackground); } - if (widget->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { + if (widget->inherits("TQLineEdit")) { metaobject = TQLineEdit::staticMetaObject(); eventFilter = true; @@ -1968,7 +1966,7 @@ void KLegacyStyle::polish(TQWidget *widget) { detail = "base"; } - if (widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) { + if (widget->inherits("TQPopupMenu")) { tqDebug("polishing popup '%s'", widget->className()); metaobject = TQPopupMenu::staticMetaObject(); widget->setBackgroundMode(TQWidget::PaletteBackground); @@ -2216,7 +2214,7 @@ void KLegacyStyle::drawPushButton(TQPushButton *btn, TQPainter *p) { key.data.shadow = KLegacy::In; } else { key.data.state = ((btn->isEnabled()) ? - ((static_cast<TQWidget *>( btn ) == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) : + ((btn == priv->lastWidget) ? KLegacy::Prelight : KLegacy::Normal) : KLegacy::Insensitive); key.data.shadow = ((btn->isOn() || btn->isDown()) ? KLegacy::In : KLegacy::Out); @@ -2544,7 +2542,7 @@ void KLegacyStyle::drawComboButton(TQPainter *p, int x, int y, int w, int h, key.data.state = KLegacy::Normal; key.data.shadow = KLegacy::Out; - if (priv->lastWidget && priv->lastWidget->inherits(TQCOMBOBOX_OBJECT_NAME_STRING)) + if (priv->lastWidget && priv->lastWidget->inherits("TQComboBox")) key.data.state = KLegacy::Prelight; TQPixmap *pix = gobj->draw(key, w, h, "optionmenu"); @@ -3081,7 +3079,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { { TQWidget *w = (TQWidget *) obj; - if (w->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && w->width() < 700) { + if (w->inherits("TQPopupMenu") && w->width() < 700) { GtkObject *gobj = priv->gtkDict.find(TQPopupMenu::staticMetaObject()); if (gobj) { @@ -3151,7 +3149,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (p && (! p->isNull())) w->setBackgroundPixmap(*p); } - } else if (w->inherits(TQLINEEDIT_OBJECT_NAME_STRING)) { + } else if (w->inherits("TQLineEdit")) { GtkObject *gobj = priv->gtkDict.find(TQLineEdit::staticMetaObject()); if (gobj) { @@ -3191,8 +3189,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { w->setPalette(pal); } } - } else if (w->inherits(TQMENUBAR_OBJECT_NAME_STRING) || - w->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { + } else if (w->inherits("TQMenuBar") || + w->inherits("TQToolBar")) { GtkObject *gobj = priv->gtkDict.find(TQMenuBar::staticMetaObject()); if (gobj) { @@ -3256,13 +3254,13 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { case TQEvent::Enter: { - if (obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING) || - obj->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || - obj->inherits(TQSLIDER_OBJECT_NAME_STRING) || - obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING)) { + if (obj->inherits("TQPushButton") || + obj->inherits("TQComboBox") || + obj->inherits("TQSlider") || + obj->inherits("TQScrollBar")) { priv->lastWidget = (TQWidget *) obj; priv->lastWidget->repaint(false); - } else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) { + } else if (obj->inherits("TQRadioButton")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel() && w->isEnabled()) { @@ -3277,11 +3275,11 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (pix && (! pix->isNull())) { TQPalette pal = w->palette(); - TQBrush brush = pal.brush(TQPalette::Normal, + TQBrush brush = pal.brush(TQPalette::Active, TQColorGroup::Background); brush.setPixmap(*pix); - pal.setBrush(TQPalette::Normal, + pal.setBrush(TQPalette::Active, TQColorGroup::Background, brush); w->setPalette(pal); @@ -3290,7 +3288,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { } } } - } else if (obj->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) { + } else if (obj->inherits("TQCheckBox")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel() && w->isEnabled()) { @@ -3305,11 +3303,11 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (pix && (! pix->isNull())) { TQPalette pal = w->palette(); - TQBrush brush = pal.brush(TQPalette::Normal, + TQBrush brush = pal.brush(TQPalette::Active, TQColorGroup::Background); brush.setPixmap(*pix); - pal.setBrush(TQPalette::Normal, + pal.setBrush(TQPalette::Active, TQColorGroup::Background, brush); w->setPalette(pal); @@ -3328,8 +3326,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (obj == priv->lastWidget) { priv->lastWidget = 0; ((TQWidget *) obj)->repaint(false); - } else if (obj->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING) || - obj->inherits(TQCHECKBOX_OBJECT_NAME_STRING)) { + } else if (obj->inherits("TQRadioButton") || + obj->inherits("TQCheckBox")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel()) { @@ -3346,7 +3344,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { { TQMouseEvent *me = (TQMouseEvent *) e; priv->mousePos = me->pos(); - if (obj->inherits(TQSCROLLBAR_OBJECT_NAME_STRING) && + if (obj->inherits("TQScrollBar") && (! (me->state() & (LeftButton | MidButton | RightButton)))) { priv->hovering = true; ((TQWidget *) obj)->repaint(false); diff --git a/tdestyles/klegacy/klegacystyle.h b/tdestyles/klegacy/klegacystyle.h index f82fd5d0a..dccf6cae1 100644 --- a/tdestyles/klegacy/klegacystyle.h +++ b/tdestyles/klegacy/klegacystyle.h @@ -31,8 +31,8 @@ class KLegacyStylePrivate; -class Q_EXPORT KLegacyStyle : public TDEStyle { - Q_OBJECT +class TQ_EXPORT KLegacyStyle : public TDEStyle { + TQ_OBJECT public: KLegacyStyle(void); virtual ~KLegacyStyle(void); diff --git a/tdestyles/kthemestyle/CMakeLists.txt b/tdestyles/kthemestyle/CMakeLists.txt index 8a1bd2a8c..e6673004f 100644 --- a/tdestyles/kthemestyle/CMakeLists.txt +++ b/tdestyles/kthemestyle/CMakeLists.txt @@ -36,6 +36,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdefx-shared tdecore-shared ${DL_LIBRARIES} + LINK tdefx-shared tdecore-shared ${CMAKE_DL_LIBS} DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/tdestyles/kthemestyle/kthemebase.cpp b/tdestyles/kthemestyle/kthemebase.cpp index 8e1f5605f..c666e2c86 100644 --- a/tdestyles/kthemestyle/kthemebase.cpp +++ b/tdestyles/kthemestyle/kthemebase.cpp @@ -231,7 +231,7 @@ union kthemeKey{ unsigned int cacheKey; }; -#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) TQT_TQPAINTDEVICE_CONST(static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x))) +#define KDE_TQBITMAP_TO_TQPAINTDEVICE(x) static_cast<const TQPixmap*>(static_cast<const TQBitmap*>(x)) void KThemeBase::generateBorderPix( int i ) { @@ -243,42 +243,42 @@ void KThemeBase::generateBorderPix( int i ) TQBitmap destMask( pbWidth[ i ], pbWidth[ i ] ); TQPixmap tmp( pbWidth[ i ], pbWidth[ i ] ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, 0, pbWidth[ i ], pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, pbWidth[ i ], pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::TopLeft, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], 0, + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], 0, pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::TopRight, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::BottomLeft, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); @@ -287,23 +287,23 @@ void KThemeBase::generateBorderPix( int i ) tmp.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] ); destMask.resize( pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ] ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ], 0, + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ], 0, pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], 0, + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], 0, pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::Top, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ] * 2, pbWidth[ i ], TQt::CopyROP, false ); tmp.setMask( destMask ); @@ -312,23 +312,23 @@ void KThemeBase::generateBorderPix( int i ) tmp.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 ); destMask.resize( pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2 ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), 0, pbWidth[ i ], pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], 0, pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbWidth[ i ], pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); tmp.setMask( destMask ); } pbPixmaps[ i ] ->setBorder( KThemePixmap::Left, tmp ); - bitBlt( TQT_TQPAINTDEVICE(&tmp), 0, 0, TQT_TQPAINTDEVICE(pbPixmaps[ i ]), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); if ( srcMask ) { - bitBlt( TQT_TQPAINTDEVICE(&destMask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], + bitBlt( &destMask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), pbPixmaps[ i ] ->width() - pbWidth[ i ], pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2, TQt::CopyROP, false ); tmp.setMask( destMask ); @@ -439,7 +439,7 @@ void KThemeBase::readConfig( TQt::GUIStyle /*style*/ ) { if ( config.entryList( configFileName + widgetEntries[ i ] ).size() ) applyResourceGroup( &config, i ); -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME else { @@ -617,7 +617,7 @@ void KThemeBase::applyConfigFile( TQSettings& config ) d->overrideWindowForeground = false; -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME for ( int input = 0; input < WIDGETS; ++input ) { @@ -813,10 +813,10 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const const TQBitmap *srcMask = tmp->mask(); int bdWidth = tmp->width(); - bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, bdWidth, + bitBlt( pixmap, 0, 0, tmp, 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, + bitBlt( &mask, 0, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( 0, 0, bdWidth, bdWidth, color1 ); @@ -824,30 +824,30 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const tmp = borderPixmap( widget ) ->border( KThemePixmap::TopRight ); srcMask = tmp->mask(); - bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, 0, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, + bitBlt( pixmap, w - bdWidth, 0, tmp, 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, + bitBlt( &mask, w - bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( w - bdWidth, 0, bdWidth, bdWidth, color1 ); tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomLeft ); srcMask = tmp->mask(); - bitBlt( TQT_TQPAINTDEVICE(pixmap), 0, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, bdWidth, + bitBlt( pixmap, 0, h - bdWidth, tmp, 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), 0, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, + bitBlt( &mask, 0, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( 0, h - bdWidth, bdWidth, bdWidth, color1 ); tmp = borderPixmap( widget ) ->border( KThemePixmap::BottomRight ); srcMask = tmp->mask(); - bitBlt( TQT_TQPAINTDEVICE(pixmap), w - bdWidth, h - bdWidth, TQT_TQPAINTDEVICE(tmp), 0, 0, + bitBlt( pixmap, w - bdWidth, h - bdWidth, tmp, 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, w - bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( w - bdWidth, h - bdWidth, bdWidth, bdWidth, color1 ); @@ -860,7 +860,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const srcMask = tmp->mask(); p.drawTiledPixmap( bdWidth, 0, w - bdWidth * 2, bdWidth, *tmp ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, bdWidth, 0, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, w - bdWidth * 2, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( bdWidth, 0, w - bdWidth * 2, bdWidth, color1 ); @@ -870,7 +870,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const p.drawTiledPixmap( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth, *tmp ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, bdWidth, h - bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, w - bdWidth * 2, bdWidth, TQt::CopyROP, false ); else mPainter.fillRect( bdWidth, h - bdWidth, w - bdWidth * 2, bdWidth, @@ -882,7 +882,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const srcMask = tmp->mask(); p.drawTiledPixmap( 0, bdWidth, bdWidth, h - bdWidth * 2, *tmp ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, 0, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, h - bdWidth * 2, TQt::CopyROP, false ); else mPainter.fillRect( 0, bdWidth, bdWidth, h - bdWidth * 2, color1 ); @@ -892,7 +892,7 @@ KThemePixmap* KThemeBase::scaleBorder( int w, int h, WidgetType widget ) const p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, *tmp ); if ( srcMask ) - bitBlt( TQT_TQPAINTDEVICE(&mask), w - bdWidth, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, + bitBlt( &mask, w - bdWidth, bdWidth, KDE_TQBITMAP_TO_TQPAINTDEVICE(srcMask), 0, 0, bdWidth, h - bdWidth * 2, TQt::CopyROP, false ); else mPainter.fillRect( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, color1 ); @@ -1111,7 +1111,7 @@ TQColorGroup* KThemeBase::makeColorGroup( const TQColor &fg, const TQColor &bg, void KThemeBase::applyMiscResourceGroup( TQSettings *config ) { -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME d->props.erase( "Misc" ); // clear the old property TQString base = configFileName + "Misc/"; @@ -1181,7 +1181,7 @@ static TQColor readColorEntry( Prop& prop, TQString setting, const TQColor& def void KThemeBase::readMiscResourceGroup() { -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME Prop & prop = d->props[ "Misc" ]; sbPlacement = ( SButton ) readNumEntry( prop, "SButtonPosition", @@ -1198,7 +1198,7 @@ void KThemeBase::readMiscResourceGroup() void KThemeBase::applyResourceGroup( TQSettings *config, int i ) { -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME TQString tmpStr; int tmpVal; @@ -1357,7 +1357,7 @@ void KThemeBase::applyResourceGroup( TQSettings *config, int i ) void KThemeBase::readResourceGroup( int i, TQString *pixnames, TQString *brdnames, bool *loadArray ) { -#ifndef Q_WS_QWS //FIXME +#ifndef TQ_WS_QWS //FIXME if ( loadArray[ i ] == true ) { return ; // already been preloaded. @@ -1636,7 +1636,7 @@ TQPalette KThemeBase::overridePalette( const TQPalette& pal ) disfg = disfg.light( highlightVal ); else // black fg - use darkgray disabled fg - disfg = Qt::darkGray; + disfg = TQt::darkGray; TQColorGroup disabledgrp( disfg, background, //TODO:Convert this to the new ctor. @@ -1738,7 +1738,7 @@ KThemeCache::KThemeCache( int maxSize, TQObject *parent, const char *name ) cache.setMaxCost( maxSize * 1024 ); cache.setAutoDelete( true ); flushTimer.start( 300000 ); // 5 minutes - connect( &flushTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( flushTimeout() ) ); + connect( &flushTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( flushTimeout() ) ); } void KThemeCache::flushTimeout() diff --git a/tdestyles/kthemestyle/kthemebase.h b/tdestyles/kthemestyle/kthemebase.h index 01ecab138..0549af55f 100644 --- a/tdestyles/kthemestyle/kthemebase.h +++ b/tdestyles/kthemestyle/kthemebase.h @@ -122,7 +122,7 @@ inline bool KThemePixmap::isOld() */ class KThemeCache : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** * The scale hints supported by the cache. Note that Tiled is not here @@ -213,7 +213,7 @@ class KThemeBasePrivate; */ class KThemeBase: public TDEStyle { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a new KThemeBase object. @@ -480,7 +480,7 @@ protected: TQString *brdnames ); /** * Makes a full color group based on the given foreground and background - * colors. This is the same code used by KDE (kapp.cpp) in previous + * colors. This is the same code used by KDE (tdeApp.cpp) in previous * versions. */ TQColorGroup* makeColorGroup( const TQColor &fg, const TQColor &bg, @@ -517,12 +517,12 @@ protected: SFlags flags = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const { - TDEStyle::tqdrawPrimitive ( pe, p, ceData, elementFlags, r, cg, + TDEStyle::drawPrimitive ( pe, p, ceData, elementFlags, r, cg, flags, option ); } - virtual void drawControl( TQ_ControlElement element, + virtual void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -536,7 +536,7 @@ protected: r, cg, how, opt, widget ); } - virtual void drawControlMask( TQ_ControlElement element, + virtual void drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -548,7 +548,7 @@ protected: } - virtual void drawComplexControl( TQ_ComplexControl control, + virtual void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, diff --git a/tdestyles/kthemestyle/kthemestyle.cpp b/tdestyles/kthemestyle/kthemestyle.cpp index 5ddbb3899..386f813bf 100644 --- a/tdestyles/kthemestyle/kthemestyle.cpp +++ b/tdestyles/kthemestyle/kthemestyle.cpp @@ -158,7 +158,7 @@ public: } }; -KDE_Q_EXPORT_PLUGIN( KThemeStylePlugin ) +TDE_EXPORT_PLUGIN( KThemeStylePlugin ) void kDrawWindowsArrow ( TQPainter *p, const TQStyleControlElementData &ceData, const TQStyle::ControlElementFlags elementFlags, const TQStyle* style, TQStyle::PrimitiveElement pe, bool down, @@ -422,7 +422,7 @@ KThemeStyle::~KThemeStyle() void KThemeStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); if (!qstrcmp(app->argv()[0], "kicker")) { kickerMode = true; @@ -450,7 +450,7 @@ void KThemeStyle::polish( TQPalette &p ) if ( isPixmap( Background ) ) { - TQBrush bgBrush( p.color( TQPalette::Normal, + TQBrush bgBrush( p.color( TQPalette::Active, TQColorGroup::Background ), *uncached( Background ) ); brushHandle = uncached( Background )->handle(); @@ -470,7 +470,7 @@ void KThemeStyle::paletteChanged() void KThemeStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); app->setPalette( oldPalette, true ); } @@ -478,7 +478,7 @@ void KThemeStyle::applicationUnPolish( const TQStyleControlElementData &ceData, bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* object = reinterpret_cast<TQObject*>(source); if( object->inherits("KActiveLabel")) @@ -486,7 +486,7 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C if(event->type() == TQEvent::Move || event->type() == TQEvent::Resize || event->type() == TQEvent::Show) { - TQWidget *w = TQT_TQWIDGET(object); + TQWidget *w = static_cast<TQWidget*>(object); TQPoint pos(0, 0); pos = w->mapTo(w->topLevelWidget(), pos); TQPixmap pix(uncached( Background )->size()); @@ -499,16 +499,16 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C pos.x(), pos.y()); p.end(); TQPalette pal(w->palette()); - TQBrush brush( pal.color( TQPalette::Normal, + TQBrush brush( pal.color( TQPalette::Active, TQColorGroup::Background), pix ); pal.setBrush(TQColorGroup::Base, brush); w->setPalette(pal); } } - if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits(TQLABEL_OBJECT_NAME_STRING)) + if (!qstrcmp(object->name(), "tde toolbar widget") && object->inherits("TQLabel")) { - TQWidget* lb = TQT_TQWIDGET(object); + TQWidget* lb = static_cast<TQWidget*>(object); if (lb->backgroundMode() == TQt::PaletteButton) lb->setBackgroundMode(TQt::PaletteBackground); removeObjectEventHandler(ceData, elementFlags, source, this); @@ -520,13 +520,13 @@ bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, C void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *w = reinterpret_cast<TQWidget*>(ptr); - if (::tqqt_cast<TQStatusBar*>(w)) - w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Normal, TQColorGroup::Background)); + if (::tqt_cast<TQStatusBar*>(w)) + w->setPaletteBackgroundColor(TQApplication::palette().color(TQPalette::Active, TQColorGroup::Background)); - if (::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget")) + if (::tqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget")) installObjectEventHandler(ceData, elementFlags, ptr, this); if (w->backgroundPixmap() && !w->isTopLevel() && @@ -550,9 +550,9 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen { polishLock = true; - TQColorGroup clrGroup( Qt::black, TQColor( 255, 255, 220 ), - TQColor( 96, 96, 96 ), Qt::black, Qt::black, - Qt::black, TQColor( 255, 255, 220 ) ); + TQColorGroup clrGroup( TQt::black, TQColor( 255, 255, 220 ), + TQColor( 96, 96, 96 ), TQt::black, TQt::black, + TQt::black, TQColor( 255, 255, 220 ) ); TQPalette toolTip ( clrGroup, clrGroup, clrGroup ); TQToolTip::setPalette( toolTip ); @@ -565,7 +565,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen return ; } - if ( ::tqqt_cast<TQMenuBar*>(w) ) + if ( ::tqt_cast<TQMenuBar*>(w) ) { w->setBackgroundMode( TQWidget::NoBackground ); } @@ -573,7 +573,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen { w->setBackgroundMode( TQWidget::PaletteBackground ); } - else if ( ::tqqt_cast<TQPopupMenu*>(w) ) + else if ( ::tqt_cast<TQPopupMenu*>(w) ) { popupPalette = w->palette(); if ( isColor( MenuItem ) || isColor( MenuItemDown ) ) @@ -593,7 +593,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen w->setBackgroundMode( TQWidget::NoBackground ); } - else if ( ::tqqt_cast<TQCheckBox*>(w) ) + else if ( ::tqt_cast<TQCheckBox*>(w) ) { if ( isColor( IndicatorOff ) || isColor( IndicatorOn ) ) { @@ -608,7 +608,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen w->setPalette( newPal ); } } - else if ( ::tqqt_cast<TQRadioButton*>(w) ) + else if ( ::tqt_cast<TQRadioButton*>(w) ) { if ( isColor( ExIndicatorOff ) || isColor( ExIndicatorOn ) ) { @@ -631,7 +631,7 @@ void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElemen void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *w = reinterpret_cast<TQWidget*>(ptr); if (w->backgroundPixmap() && !w->isTopLevel()) @@ -644,21 +644,21 @@ void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElem } //Toolbar labels should nornally be PaletteButton - if ( ::tqqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget")) + if ( ::tqt_cast<TQLabel*>(w) && !qstrcmp(w->name(), "tde toolbar widget")) w->setBackgroundMode( TQWidget::PaletteButton ); //The same for menu bars, popup menus - else if ( ::tqqt_cast<TQMenuBar*>(w) || ::tqqt_cast<TQPopupMenu*>(w) ) + else if ( ::tqt_cast<TQMenuBar*>(w) || ::tqt_cast<TQPopupMenu*>(w) ) 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) + //For toolbar internal separators, return to button, too (can't use tqt_cast here since don't have access to the class) 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 //Drop some custom palettes. ### this really should check the serial number to be 100% correct. - if ( ::tqqt_cast<TQPopupMenu*>(w) || ::tqqt_cast<TQCheckBox*>(w) || ::tqqt_cast<TQRadioButton*>(w) || ::tqqt_cast<TQStatusBar*>(w) ) + if ( ::tqt_cast<TQPopupMenu*>(w) || ::tqt_cast<TQCheckBox*>(w) || ::tqt_cast<TQRadioButton*>(w) || ::tqt_cast<TQStatusBar*>(w) ) w->unsetPalette(); } @@ -677,7 +677,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h, if ( gradientHint( type ) == GrReverseBevel ) { int i; - bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scalePixmap( w, h, type )), 0, 0, w, h, + bitBlt( p->device(), x, y, scalePixmap( w, h, type ), 0, 0, w, h, TQt::CopyROP, true ); p->setPen( g.text() ); for ( i = 0; i < borderWidth( type ); ++i, ++x, ++y, w -= 2, h -= 2 ) @@ -717,7 +717,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h, } if ( borderPixmap( type ) ) { - bitBlt( p->device(), x, y, TQT_TQPAINTDEVICE(scaleBorder( w, h, type )), 0, 0, w, h, + bitBlt( p->device(), x, y, scaleBorder( w, h, type ), 0, 0, w, h, TQt::CopyROP, false ); } else @@ -927,7 +927,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt const TQBitmap * mask = uncached( ( flags & Style_On || flags & Style_Down ) ? ExIndicatorOn : ExIndicatorOff ) ->mask(); if ( mask ) { - p->setPen( Qt::color1 ); + p->setPen( TQt::color1 ); p->drawPixmap( x, y, *mask ); } else @@ -945,7 +945,7 @@ void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQSt IndicatorOff ) ->mask(); if ( mask ) { - p->setPen( Qt::color1 ); + p->setPen( TQt::color1 ); p->drawPixmap( x, y, *mask ); } else @@ -1686,14 +1686,14 @@ void KThemeStyle::drawControl( ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( w - pixmap->width() ) / 2 ) + ( ( w - pixmap->width() ) % 2 ); p->drawPixmap( x + diffw, y + itemFrame, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } @@ -1851,7 +1851,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, if ( !roundSlider() ) { const TQSlider * slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; if ( horizontal ) { drawBaseButton( p, x, y, w, h, *colorGroup( cg, SliderGroove ), true, @@ -1867,7 +1867,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, { //This code is from HighColorDefault.. const TQSlider* slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; int gcenter = ( horizontal ? r.height() : r.width() ) / 2; TQRect gr; @@ -1903,7 +1903,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, if ( isPixmap( Slider ) ) { const TQSlider * slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; if ( horizontal ) { bitBlt( p->device(), x, y + ( h - uncached( Slider ) ->height() ) / 2, @@ -1928,7 +1928,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, //This code again from HighColor.. //...except sans the gradient.. const TQSlider* slider = ( const TQSlider* ) widget; - bool horizontal = slider->orientation() == Qt::Horizontal; + bool horizontal = slider->orientation() == TQt::Horizontal; int x, y, w, h; r.rect( &x, &y, &w, &h ); int x2 = x + w - 1; @@ -2013,7 +2013,7 @@ void KThemeStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, -void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, +void KThemeStyle::drawComplexControl ( ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & g, SFlags how , SCFlags controls, SCFlags active, const TQStyleOption & opt, const TQWidget * widget ) const @@ -2115,7 +2115,7 @@ void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, { const TQScrollBar *sb = ( const TQScrollBar* ) widget; bool maxedOut = ( sb->minValue() == sb->maxValue() ); - bool horizontal = ( sb->orientation() == Qt::Horizontal ); + bool horizontal = ( sb->orientation() == TQt::Horizontal ); SFlags sflags = ( ( horizontal ? Style_Horizontal : Style_Default ) | ( maxedOut ? Style_Default : Style_Enabled ) ); @@ -2374,7 +2374,7 @@ void KThemeStyle::drawShade( TQPainter *p, int x, int y, int w, int h, ++x, ++y; --x2, --y2; } - p->setPen( Qt::black ); + p->setPen( TQt::black ); p->drawPoints( bPntArray ); p->drawLineSegments( bLineArray ); p->setPen( highPen ); @@ -2456,4 +2456,3 @@ int KThemeStyle::popupMenuItemHeight( bool /*checkable*/, TQMenuItem *mi, } #include "kthemestyle.moc" -// kate: indent-width 4; replace-tabs off; tab-width 4; space-indent on; diff --git a/tdestyles/kthemestyle/kthemestyle.h b/tdestyles/kthemestyle/kthemestyle.h index ca112ed14..029301aae 100644 --- a/tdestyles/kthemestyle/kthemestyle.h +++ b/tdestyles/kthemestyle/kthemestyle.h @@ -67,7 +67,7 @@ Copyright (C) 2000 Daniel M. Duley <mosfet@kde.org> class KThemeStyle: public KThemeBase { - Q_OBJECT + TQ_OBJECT public: /** * Constructs a new KThemeStyle object. @@ -104,7 +104,7 @@ public: const TQWidget *widget = 0 ) const; - virtual void drawComplexControl( TQ_ComplexControl control, + virtual void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -227,7 +227,7 @@ protected: mutable TQPixmap* menuCache; mutable TQPixmap* vsliderCache; - Qt::HANDLE brushHandle; + TQt::HANDLE brushHandle; bool brushHandleSet; bool kickerMode; diff --git a/tdestyles/kthemestyle/tdestyledirs.cpp b/tdestyles/kthemestyle/tdestyledirs.cpp index 9f795e1e2..bcb208601 100644 --- a/tdestyles/kthemestyle/tdestyledirs.cpp +++ b/tdestyles/kthemestyle/tdestyledirs.cpp @@ -22,7 +22,7 @@ */ #include <tqfile.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "tdestyledirs.h" TDEStyleDirs* TDEStyleDirs::instance = 0; diff --git a/tdestyles/kthemestyle/tdestyledirs.h b/tdestyles/kthemestyle/tdestyledirs.h index 2a42fd2ba..b70315c84 100644 --- a/tdestyles/kthemestyle/tdestyledirs.h +++ b/tdestyles/kthemestyle/tdestyledirs.h @@ -25,7 +25,7 @@ #include <tqsettings.h> #include <tqstringlist.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> /** * @short Access to the standard KDE directories for the pixmap style diff --git a/tdestyles/light/light.cpp b/tdestyles/light/light.cpp index 17ecde9fc..ebf931ff7 100644 --- a/tdestyles/light/light.cpp +++ b/tdestyles/light/light.cpp @@ -58,4 +58,4 @@ TQStyle *LightStylePlugin::create(const TQString &s) return 0; } -KDE_Q_EXPORT_PLUGIN( LightStylePlugin ) +TDE_EXPORT_PLUGIN( LightStylePlugin ) diff --git a/tdestyles/light/lightstyle-v2.cpp b/tdestyles/light/lightstyle-v2.cpp index 35b7cc813..fbf197b88 100644 --- a/tdestyles/light/lightstyle-v2.cpp +++ b/tdestyles/light/lightstyle-v2.cpp @@ -129,7 +129,7 @@ static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg if (fill) p->fillRect(br, *fill); } -void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, +void LightStyleV2::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -298,7 +298,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, if ( p && p->device()->devType() == TQInternal::Widget ) { TQWidget *w = (TQWidget *) p->device(); TQWidget *p = w->parentWidget(); - if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { + if (p->inherits("TQDockWindow") && ! p->inherits("TQToolBar")) { drawTitle = true; title = p->caption(); } @@ -447,7 +447,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarSubLine: { TQRect fr = r, ar = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen(cg.dark()); if (flags & Style_Horizontal) { @@ -472,7 +472,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarAddLine: { TQRect fr = r, ar = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen(cg.dark()); if (flags & Style_Horizontal) { @@ -642,7 +642,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, } } -void LightStyleV2::drawControl( TQ_ControlElement control, +void LightStyleV2::drawControl( ControlElement control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -948,10 +948,10 @@ void LightStyleV2::drawControl( TQ_ControlElement control, } else if (mi->pixmap()) { TQPixmap pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } if (mi->popup()) @@ -999,7 +999,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control, } } -void LightStyleV2::drawControlMask( TQ_ControlElement control, +void LightStyleV2::drawControlMask( ControlElement control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1045,7 +1045,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQStyleControlElementData &c return rect; } -void LightStyleV2::drawComplexControl( TQ_ComplexControl control, +void LightStyleV2::drawComplexControl( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1119,7 +1119,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; TQRect frame, up, down; - frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, + frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetFrame, data, widget); up = ceData.spinWidgetData.upRect; down = ceData.spinWidgetData.downRect; @@ -1129,7 +1129,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, &cg.brush(TQColorGroup::Base)); if ((controls & SC_SpinWidgetUp) && up.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetUp; + PrimitiveElement pe = PE_SpinWidgetUp; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetPlus; @@ -1162,7 +1162,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, } if ((controls & SC_SpinWidgetDown) && down.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetDown; + PrimitiveElement pe = PE_SpinWidgetDown; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetMinus; @@ -1329,7 +1329,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, } } -TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control, +TQRect LightStyleV2::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, @@ -1424,7 +1424,7 @@ TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control, return ret; } -TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control, +TQStyle::SubControl LightStyleV2::querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, @@ -1625,7 +1625,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents, return ret; } -int LightStyleV2::styleHint( TQ_StyleHint stylehint, +int LightStyleV2::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, diff --git a/tdestyles/light/lightstyle-v2.h b/tdestyles/light/lightstyle-v2.h index 90b3e89c9..68ab02c25 100644 --- a/tdestyles/light/lightstyle-v2.h +++ b/tdestyles/light/lightstyle-v2.h @@ -28,15 +28,15 @@ #ifdef QT_PLUGIN -# define Q_EXPORT_STYLE_LIGHT_V2 +# define TQ_EXPORT_STYLE_LIGHT_V2 #else -# define Q_EXPORT_STYLE_LIGHT_V2 Q_EXPORT +# define TQ_EXPORT_STYLE_LIGHT_V2 TQ_EXPORT #endif // QT_PLUGIN -class Q_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle +class TQ_EXPORT_STYLE_LIGHT_V2 LightStyleV2 : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: LightStyleV2(); @@ -44,27 +44,27 @@ public: void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, + void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; - void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, + TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, + SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const; int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; @@ -72,7 +72,7 @@ public: TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/light/lightstyle-v3.cpp b/tdestyles/light/lightstyle-v3.cpp index 92b0d04da..790c03d79 100644 --- a/tdestyles/light/lightstyle-v3.cpp +++ b/tdestyles/light/lightstyle-v3.cpp @@ -212,7 +212,7 @@ static void drawLightBevel( TQPainter *p, p->fillRect( br, *fill ); } -void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, +void LightStyleV3::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -430,7 +430,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, if ( p && p->device()->devType() == TQInternal::Widget ) { TQWidget *w = (TQWidget *) p->device(); TQWidget *p = w->parentWidget(); - if (p->inherits(TQDOCKWINDOW_OBJECT_NAME_STRING) && ! p->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) { + if (p->inherits("TQDockWindow") && ! p->inherits("TQToolBar")) { drawTitle = true; title = p->caption(); } @@ -590,7 +590,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarSubLine: { TQRect br = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen( cg.background() ); if (flags & Style_Horizontal) { @@ -624,7 +624,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, case PE_ScrollBarAddLine: { TQRect br = r; - TQ_PrimitiveElement pe; + PrimitiveElement pe; p->setPen( cg.background() ); if (flags & Style_Horizontal) { @@ -830,7 +830,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, } } -void LightStyleV3::drawControl( TQ_ControlElement control, +void LightStyleV3::drawControl( ControlElement control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1068,10 +1068,10 @@ void LightStyleV3::drawControl( TQ_ControlElement control, } else if (mi->pixmap()) { TQPixmap pixmap = *mi->pixmap(); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::OpaqueMode); + p->setBackgroundMode(TQt::OpaqueMode); p->drawPixmap(ir.x(), ir.y() + (ir.height() - pixmap.height()) / 2, pixmap); if (pixmap.depth() == 1) - p->setBackgroundMode(Qt::TransparentMode); + p->setBackgroundMode(TQt::TransparentMode); } if (mi->popup()) @@ -1114,7 +1114,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, } } -void LightStyleV3::drawControlMask( TQ_ControlElement control, +void LightStyleV3::drawControlMask( ControlElement control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1178,7 +1178,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQStyleControlElementData &c return rect; } -void LightStyleV3::drawComplexControl( TQ_ComplexControl control, +void LightStyleV3::drawComplexControl( ComplexControl control, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -1248,7 +1248,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, const TQSpinWidget *spinwidget = (const TQSpinWidget *) widget; TQRect frame, up, down; - frame = querySubControlMetrics((TQ_ComplexControl)CC_SpinWidget, ceData, elementFlags, + frame = querySubControlMetrics((ComplexControl)CC_SpinWidget, ceData, elementFlags, SC_SpinWidgetFrame, data, widget); up = ceData.spinWidgetData.upRect; down = ceData.spinWidgetData.downRect; @@ -1257,7 +1257,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, drawPrimitive( PE_Panel, p, ceData, elementFlags, frame, cg, flags | Style_Sunken ); if ((controls & SC_SpinWidgetUp) && up.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetUp; + PrimitiveElement pe = PE_SpinWidgetUp; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetPlus; @@ -1275,7 +1275,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, } if ((controls & SC_SpinWidgetDown) && down.isValid()) { - TQ_PrimitiveElement pe = PE_SpinWidgetDown; + PrimitiveElement pe = PE_SpinWidgetDown; if ( ceData.spinWidgetData.buttonSymbols == TQSpinWidget::PlusMinus ) pe = PE_SpinWidgetMinus; @@ -1455,7 +1455,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, } } -TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control, +TQRect LightStyleV3::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, @@ -1606,7 +1606,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control, return ret; } -TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control, +TQStyle::SubControl LightStyleV3::querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, @@ -1854,7 +1854,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents, return ret; } -int LightStyleV3::styleHint( TQ_StyleHint stylehint, +int LightStyleV3::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, diff --git a/tdestyles/light/lightstyle-v3.h b/tdestyles/light/lightstyle-v3.h index 0330c8f87..ff6c537f9 100644 --- a/tdestyles/light/lightstyle-v3.h +++ b/tdestyles/light/lightstyle-v3.h @@ -31,15 +31,15 @@ #include "tdestyle.h" #ifdef QT_PLUGIN -# define Q_EXPORT_STYLE_LIGHT_V3 +# define TQ_EXPORT_STYLE_LIGHT_V3 #else -# define Q_EXPORT_STYLE_LIGHT_V3 Q_EXPORT +# define TQ_EXPORT_STYLE_LIGHT_V3 TQ_EXPORT #endif // QT_PLUGIN -class Q_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle +class TQ_EXPORT_STYLE_LIGHT_V3 LightStyleV3 : public TDEStyle { - Q_OBJECT + TQ_OBJECT TQStyle *basestyle; public: @@ -48,27 +48,27 @@ public: void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, + void drawPrimitive(PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControl(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControlMask(ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; - void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, + void drawComplexControl(ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, + TQRect querySubControlMetrics(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, + SubControl querySubControl(ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const; int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; @@ -76,7 +76,7 @@ public: TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; diff --git a/tdestyles/plastik/config/plastikconf.cpp b/tdestyles/plastik/config/plastikconf.cpp index 4900f708e..6fbeb74a1 100644 --- a/tdestyles/plastik/config/plastikconf.cpp +++ b/tdestyles/plastik/config/plastikconf.cpp @@ -33,13 +33,13 @@ DEALINGS IN THE SOFTWARE. #include <tdeglobal.h> #include <tdelocale.h> #include <kcolorbutton.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "plastikconf.h" extern "C" { - KDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent) + TDE_EXPORT TQWidget* allocate_tdestyle_config(TQWidget* parent) { TDEGlobal::locale()->insertCatalogue("tdestyle_plastik_config"); return new PlastikStyleConfig(parent); @@ -118,19 +118,19 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent) origCheckMarkColor = s.readEntry("/plastikstyle/Settings/checkMarkColor", "black"); checkMarkColor->setColor(origCheckMarkColor); -// connect(scrollBarLines, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(animateProgressBar, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(drawToolBarSeparator, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(drawToolBarItemSeparator, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); -// connect(drawFocusRect, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(drawTriangularExpander, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(inputFocusHighlight, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(customOverHighlightColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(overHighlightColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) ); - connect(customFocusHighlightColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(focusHighlightColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) ); - connect(customCheckMarkColor, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( updateChanged() ) ); - connect(checkMarkColor, TQT_SIGNAL( changed(const TQColor&) ), TQT_SLOT( updateChanged() ) ); +// connect(scrollBarLines, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(animateProgressBar, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(drawToolBarSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(drawToolBarItemSeparator, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); +// connect(drawFocusRect, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(drawTriangularExpander, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(inputFocusHighlight, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(customOverHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(overHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) ); + connect(customFocusHighlightColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(focusHighlightColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) ); + connect(customCheckMarkColor, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( updateChanged() ) ); + connect(checkMarkColor, TQ_SIGNAL( changed(const TQColor&) ), TQ_SLOT( updateChanged() ) ); if ( customOverHighlightColor->isChecked() ) overHighlightColor->setEnabled(true); else diff --git a/tdestyles/plastik/config/plastikconf.h b/tdestyles/plastik/config/plastikconf.h index 512ad6f2e..6973a0d0b 100644 --- a/tdestyles/plastik/config/plastikconf.h +++ b/tdestyles/plastik/config/plastikconf.h @@ -31,7 +31,7 @@ class TQCheckBox; class PlastikStyleConfig: public TQWidget { - Q_OBJECT + TQ_OBJECT public: PlastikStyleConfig(TQWidget* parent); ~PlastikStyleConfig(); diff --git a/tdestyles/plastik/misc.cpp b/tdestyles/plastik/misc.cpp index d1a52d61e..48918306e 100644 --- a/tdestyles/plastik/misc.cpp +++ b/tdestyles/plastik/misc.cpp @@ -23,8 +23,8 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i { // normal button... - QRgb rgb = bgColor.rgb(); - QRgb rgb_b = fgColor.rgb(); + TQRgb rgb = bgColor.rgb(); + TQRgb rgb_b = fgColor.rgb(); int alpha = a; if(alpha>255) alpha = 255; if(alpha<0) alpha = 0; diff --git a/tdestyles/plastik/plastik.cpp b/tdestyles/plastik/plastik.cpp index 0db70b8a9..ab3382b93 100644 --- a/tdestyles/plastik/plastik.cpp +++ b/tdestyles/plastik/plastik.cpp @@ -148,7 +148,7 @@ class PlastikStylePlugin : public TQStylePlugin } }; -KDE_Q_EXPORT_PLUGIN( PlastikStylePlugin ) +TDE_EXPORT_PLUGIN( PlastikStylePlugin ) // -- end -- PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrollBar), @@ -184,7 +184,7 @@ PlastikStyle::PlastikStyle() : TDEStyle( AllowMenuTransparency, ThreeButtonScrol if ( _animateProgressBar ) { animationTimer = new TQTimer( this ); - connect( animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateProgressPos()) ); + connect( animationTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateProgressPos()) ); } } @@ -197,7 +197,7 @@ void PlastikStyle::updateProgressPos() bool visible = false; for (iter = progAnimWidgets.begin(); iter != progAnimWidgets.end(); ++iter) { - if ( !::tqqt_cast<TQProgressBar*>(iter.key()) ) + if ( !::tqt_cast<TQProgressBar*>(iter.key()) ) continue; pb = dynamic_cast<TQProgressBar*>(iter.key()); @@ -225,7 +225,7 @@ PlastikStyle::~PlastikStyle() void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQApplication")) { TQApplication *app = reinterpret_cast<TQApplication*>(ptr); if (!qstrcmp(app->argv()[0], "kicker")) @@ -237,39 +237,39 @@ void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, Co void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); if( !strcmp(widget->name(), "__tdehtml") ) { // is it a tdehtml widget...? tdehtmlWidgets[widget] = true; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(tdehtmlWidgetDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(tdehtmlWidgetDestroyed(TQObject*))); } - // use tqqt_cast where possible to check if the widget inheits one of the classes. might improve + // use tqt_cast where possible to check if the widget inheits one of the classes. might improve // performance compared to TQObject::inherits() - if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) || - ::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) || - ::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) || - ::tqqt_cast<TQToolButton*>(widget) || widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) + if ( ::tqt_cast<TQPushButton*>(widget) || ::tqt_cast<TQComboBox*>(widget) || + ::tqt_cast<TQSpinWidget*>(widget) || ::tqt_cast<TQSlider*>(widget) || + ::tqt_cast<TQCheckBox*>(widget) || ::tqt_cast<TQRadioButton*>(widget) || + ::tqt_cast<TQToolButton*>(widget) || widget->inherits("TQSplitterHandle") ) { // widget->setBackgroundMode(PaletteBackground); installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQLineEdit*>(widget)) { + } else if (::tqt_cast<TQLineEdit*>(widget)) { installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQTabBar*>(widget)) { + } else if (::tqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(true); installObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQPopupMenu*>(widget)) { + } else if (::tqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode( NoBackground ); } else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) { installObjectEventHandler(ceData, elementFlags, ptr, this); } - if( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(widget) ) + if( _animateProgressBar && ::tqt_cast<TQProgressBar*>(widget) ) { installObjectEventHandler(ceData, elementFlags, ptr, this); progAnimWidgets[widget] = 0; - connect(widget, TQT_SIGNAL(destroyed(TQObject*)), this, TQT_SLOT(progressBarDestroyed(TQObject*))); + connect(widget, TQ_SIGNAL(destroyed(TQObject*)), this, TQ_SLOT(progressBarDestroyed(TQObject*))); if (!animationTimer->isActive()) animationTimer->start( 50, false ); } @@ -280,32 +280,32 @@ void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElemen void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { - if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQWidget")) { TQWidget *widget = reinterpret_cast<TQWidget*>(ptr); 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. - if ( ::tqqt_cast<TQPushButton*>(widget) || ::tqqt_cast<TQComboBox*>(widget) || - ::tqqt_cast<TQSpinWidget*>(widget) || ::tqqt_cast<TQSlider*>(widget) || - ::tqqt_cast<TQCheckBox*>(widget) || ::tqqt_cast<TQRadioButton*>(widget) || - ::tqqt_cast<TQToolButton*>(widget) || ::tqqt_cast<TQLineEdit*>(widget) || - widget->inherits(TQSPLITTERHANDLE_OBJECT_NAME_STRING) ) + // use tqt_cast to check if the widget inheits one of the classes. + if ( ::tqt_cast<TQPushButton*>(widget) || ::tqt_cast<TQComboBox*>(widget) || + ::tqt_cast<TQSpinWidget*>(widget) || ::tqt_cast<TQSlider*>(widget) || + ::tqt_cast<TQCheckBox*>(widget) || ::tqt_cast<TQRadioButton*>(widget) || + ::tqt_cast<TQToolButton*>(widget) || ::tqt_cast<TQLineEdit*>(widget) || + widget->inherits("TQSplitterHandle") ) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } - else if (::tqqt_cast<TQTabBar*>(widget)) { + else if (::tqt_cast<TQTabBar*>(widget)) { widget->setMouseTracking(false); removeObjectEventHandler(ceData, elementFlags, ptr, this); - } else if (::tqqt_cast<TQPopupMenu*>(widget)) { + } else if (::tqt_cast<TQPopupMenu*>(widget)) { widget->setBackgroundMode( PaletteBackground ); } else if ( !qstrcmp(widget->name(), "tde toolbar widget") ) { removeObjectEventHandler(ceData, elementFlags, ptr, this); } - if ( ::tqqt_cast<TQProgressBar*>(widget) ) + if ( ::tqt_cast<TQProgressBar*>(widget) ) { progAnimWidgets.remove(widget); } @@ -316,12 +316,12 @@ void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElem void PlastikStyle::tdehtmlWidgetDestroyed(TQObject* obj) { - tdehtmlWidgets.remove(TQT_TQWIDGET(obj)); + tdehtmlWidgets.remove(static_cast<TQWidget*>(obj)); } void PlastikStyle::progressBarDestroyed(TQObject* obj) { - progAnimWidgets.remove(TQT_TQWIDGET(obj)); + progAnimWidgets.remove(static_cast<TQWidget*>(obj)); } void PlastikStyle::renderContour(TQPainter *p, @@ -664,7 +664,7 @@ void PlastikStyle::renderPixel(TQPainter *p, if(fullAlphaBlend) // full alpha blend: paint into an image with alpha buffer and convert to a pixmap ... { - QRgb rgb = color.rgb(); + TQRgb rgb = color.rgb(); // generate a quite unique key -- use the unused width field to store the alpha value. CacheEntry search(cAlphaDot, alpha, 0, rgb); int key = search.key(); @@ -697,8 +697,8 @@ void PlastikStyle::renderPixel(TQPainter *p, } else // don't use an alpha buffer: calculate the resulting color from the alpha value, the fg- and the bg-color. { - QRgb rgb_a = color.rgb(); - QRgb rgb_b = background.rgb(); + TQRgb rgb_a = color.rgb(); + TQRgb rgb_b = background.rgb(); int a = alpha; if(a>255) a = 255; if(a<0) a = 0; @@ -827,7 +827,7 @@ void PlastikStyle::renderGradient(TQPainter *painter, int r_w = result->rect().width(); int r_h = result->rect().height(); int r_x, r_y, r_x2, r_y2; - TQT_TQRECT_OBJECT(result->rect()).coords(&r_x, &r_y, &r_x2, &r_y2); + result->rect().coords(&r_x, &r_y, &r_x2, &r_y2); int rDiff, gDiff, bDiff; int rc, gc, bc; @@ -894,7 +894,7 @@ void PlastikStyle::renderPanel(TQPainter *p, if (kickerMode && p->device() && p->device()->devType() == TQInternal::Widget && - TQCString(TQT_TQWIDGET(static_cast<TQPaintDevice*>(p->device()))->className()) == "FittsLawFrame") { + TQCString(static_cast<TQWidget*>(p->device())->className()) == "FittsLawFrame") { // Stolen wholesale from Keramik. I don't like it, but oh well. if (sunken) { const TQCOORD corners[] = { x2, y, x2, y2, x, y2, x, y }; @@ -1451,7 +1451,7 @@ void PlastikStyle::drawTDEStylePrimitive(TDEStylePrimitive kpe, } -void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, +void PlastikStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2159,7 +2159,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, a.translate(0, 0); } - if (p->pen() == Qt::NoPen) { + if (p->pen() == TQt::NoPen) { if (flags & Style_Enabled) { p->setPen(cg.buttonText()); } else { @@ -2181,7 +2181,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, } -void PlastikStyle::drawControl(TQ_ControlElement element, +void PlastikStyle::drawControl(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2682,20 +2682,20 @@ void PlastikStyle::drawControl(TQ_ControlElement element, // Draw the pixmap if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::OpaqueMode ); + p->setBackgroundMode( TQt::OpaqueMode ); int diffw = ( ( r.width() - pixmap->width() ) / 2 ) + ( ( r.width() - pixmap->width() ) % 2 ); p->drawPixmap( r.x()+diffw, r.y()+1, *pixmap ); if ( pixmap->depth() == 1 ) - p->setBackgroundMode( Qt::TransparentMode ); + p->setBackgroundMode( TQt::TransparentMode ); } } // Does the menu item have a submenu? if ( mi->popup() ) { - TQ_PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; + PrimitiveElement arrow = reverse ? PE_ArrowLeft : PE_ArrowRight; int dim = pixelMetric(PM_MenuButtonIndicator, ceData, elementFlags) - 1; TQRect vr = visualRect( TQRect( r.x() + r.width() - 5 - 1 - dim, r.y() + r.height() / 2 - dim / 2, dim, dim), r ); @@ -2737,7 +2737,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element, } } -void PlastikStyle::drawControlMask(TQ_ControlElement element, +void PlastikStyle::drawControlMask(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -2759,7 +2759,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element, } } -void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, +void PlastikStyle::drawComplexControlMask(ComplexControl c, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -2782,7 +2782,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, } } -void PlastikStyle::drawComplexControl(TQ_ComplexControl control, +void PlastikStyle::drawComplexControl(ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -3013,7 +3013,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control, const TQSpinWidget *sw = dynamic_cast<const TQSpinWidget *>(widget); SFlags sflags = flags; - TQ_PrimitiveElement pe; + PrimitiveElement pe; bool hasFocus = false; if (sw) @@ -3199,7 +3199,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, } } -TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control, +TQRect PlastikStyle::querySubControlMetrics(ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, @@ -3346,7 +3346,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ce return 1; case PM_DefaultFrameWidth: { - if(widget && ::tqqt_cast<TQPopupMenu*>(widget)) + if(widget && ::tqt_cast<TQPopupMenu*>(widget)) return 1; else return 2; @@ -3452,7 +3452,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, case CT_ToolButton: { - if(widget->parent() && ::tqqt_cast<TQToolBar*>(widget->parent()) ) + if(widget->parent() && ::tqt_cast<TQToolBar*>(widget->parent()) ) return TQSize( s.width()+2*4, s.height()+2*4 ); else return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); @@ -3465,7 +3465,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, return TDEStyle::sizeFromContents (t, ceData, elementFlags, s, opt, widget); } -int PlastikStyle::styleHint( TQ_StyleHint stylehint, +int PlastikStyle::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, @@ -3497,13 +3497,13 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, if (TDEStyle::objectEventHandler(ceData, elementFlags, source, ev) ) return true; - if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { + if (ceData.widgetObjectTypes.contains("TQObject")) { TQObject* obj = reinterpret_cast<TQObject*>(source); if (!obj->isWidgetType() ) return false; // Track show events for progress bars - if ( _animateProgressBar && ::tqqt_cast<TQProgressBar*>(obj) ) + if ( _animateProgressBar && ::tqt_cast<TQProgressBar*>(obj) ) { if ((ev->type() == TQEvent::Show) && !animationTimer->isActive()) { @@ -3512,7 +3512,7 @@ bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, } if ( !qstrcmp(obj->name(), "tde toolbar widget") ) { - TQWidget* lb = TQT_TQWIDGET(obj); + TQWidget* lb = static_cast<TQWidget*>(obj); if (lb->backgroundMode() == TQt::PaletteButton) lb->setBackgroundMode(TQt::PaletteBackground); removeObjectEventHandler(ceData, elementFlags, source, this); diff --git a/tdestyles/plastik/plastik.h b/tdestyles/plastik/plastik.h index 68f707d79..89946fd48 100644 --- a/tdestyles/plastik/plastik.h +++ b/tdestyles/plastik/plastik.h @@ -56,7 +56,7 @@ class TQTimer; class PlastikStyle : public TDEStyle { - Q_OBJECT + TQ_OBJECT public: PlastikStyle(); @@ -76,7 +76,7 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawPrimitive(TQ_PrimitiveElement pe, + void drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -85,7 +85,7 @@ public: SFlags flags = Style_Default, const TQStyleOption &opt = TQStyleOption::Default ) const; - void drawControl(TQ_ControlElement element, + void drawControl(ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -95,9 +95,9 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawControlMask( TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; + void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; - void drawComplexControl(TQ_ComplexControl control, + void drawComplexControl(ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -115,14 +115,14 @@ public: TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const; - TQRect querySubControlMetrics(TQ_ComplexControl control, + TQRect querySubControlMetrics(ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption &opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawComplexControlMask(TQStyle::TQ_ComplexControl c, + void drawComplexControlMask(TQStyle::ComplexControl c, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, @@ -137,7 +137,7 @@ public: const TQStyleOption &o, const TQWidget *w = 0) const; - int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, + int styleHint(StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; @@ -317,13 +317,13 @@ private: CacheEntryType type; int width; int height; - QRgb c1Rgb; - QRgb c2Rgb; + TQRgb c1Rgb; + TQRgb c2Rgb; bool horizontal; TQPixmap* pixmap; - CacheEntry(CacheEntryType t, int w, int h, QRgb c1, QRgb c2 = 0, + CacheEntry(CacheEntryType t, int w, int h, TQRgb c1, TQRgb c2 = 0, bool hor = false, TQPixmap* p = 0 ): type(t), width(w), height(h), c1Rgb(c1), c2Rgb(c2), horizontal(hor), pixmap(p) {} diff --git a/tdestyles/utils/installtheme/main.cpp b/tdestyles/utils/installtheme/main.cpp index d73a8c7d6..a58a55daf 100644 --- a/tdestyles/utils/installtheme/main.cpp +++ b/tdestyles/utils/installtheme/main.cpp @@ -29,8 +29,8 @@ #include <tdecmdlineargs.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> static const char desc[] = I18N_NOOP("TDE Tool to build a cache list of all pixmap themes installed"); static const char ver[] = "0.9.1"; @@ -48,7 +48,7 @@ int main(int argc, char **argv) for (TQStringList::iterator i = themercs.begin(); i!=themercs.end(); ++i) { TQString file=*i; - KSimpleConfig config(file, true); + TDESimpleConfig config(file, true); TQString name = TQFileInfo(file).baseName(); //This is nice and static... //So we don't have to worry about our key changing when the language does. @@ -62,7 +62,7 @@ int main(int argc, char **argv) } } - KSimpleConfig cache( TDEGlobal::dirs()->saveLocation("config")+"kthemestylerc"); + TDESimpleConfig cache( TDEGlobal::dirs()->saveLocation("config")+"kthemestylerc"); #if 0 //Doesn't seem to work with present Qt.. diff --git a/tdestyles/web/webstyle.cpp b/tdestyles/web/webstyle.cpp index 073a46368..cce42ed15 100644 --- a/tdestyles/web/webstyle.cpp +++ b/tdestyles/web/webstyle.cpp @@ -60,7 +60,7 @@ static TQColor contrastingForeground(const TQColor & fg, const TQColor & bg) if ((diff > -72) && (diff < 72)) { - return (vbg < 128) ? Qt::white : Qt::black; + return (vbg < 128) ? TQt::white : TQt::black; } else { @@ -250,10 +250,10 @@ WebStyle::unPolish(TQApplication *) void WebStyle::polish(TQWidget * w) { - if (w->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (w->inherits("TQPushButton")) w->installEventFilter(this); - else if (w->inherits(TQGROUPBOX_OBJECT_NAME_STRING) || w->inherits(TQFRAME_OBJECT_NAME_STRING)) + else if (w->inherits("TQGroupBox") || w->inherits("TQFrame")) { TQFrame * f(static_cast<TQFrame *>(w)); @@ -282,7 +282,7 @@ WebStyle::polish(TQWidget * w) void WebStyle::unPolish(TQWidget * w) { - if (w->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING)) + if (w->inherits("TQPushButton")) w->removeEventFilter(this); else if (w == _currentFrame) @@ -471,8 +471,8 @@ WebStyle::drawScrollBarControls p->setBrush(g.button()); p->drawRect(rAdd); - Qt::ArrowType t = - sb->orientation() == Horizontal ? Qt::RightArrow : Qt::DownArrow; + TQt::ArrowType t = + sb->orientation() == Horizontal ? TQt::RightArrow : TQt::DownArrow; // Is it me or is TDEStyle::drawArrow broken ? @@ -500,8 +500,8 @@ WebStyle::drawScrollBarControls p->setBrush(g.button()); p->drawRect(rSub); - Qt::ArrowType t = - sb->orientation() == Horizontal ? Qt::LeftArrow : Qt::UpArrow; + TQt::ArrowType t = + sb->orientation() == Horizontal ? TQt::LeftArrow : TQt::UpArrow; drawArrow ( @@ -785,7 +785,7 @@ WebStyle::drawIndicatorMask int /* state */ ) { - p->fillRect(x, y, w, h, Qt::color1); + p->fillRect(x, y, w, h, TQt::color1); } void @@ -805,8 +805,8 @@ WebStyle::drawExclusiveIndicatorMask if (0 == h % 2) --h; - p->setPen(Qt::color1); - p->setBrush(Qt::color1); + p->setPen(TQt::color1); + p->setBrush(TQt::color1); p->drawEllipse(x, y, w, h); } @@ -866,7 +866,7 @@ WebStyle::drawComboButton p->drawPoint(w - 6, h - 10); if (editable) - p->fillRect(comboButtonFocusRect(x, y, w, h), Qt::red); + p->fillRect(comboButtonFocusRect(x, y, w, h), TQt::red); p->restore(); } @@ -904,12 +904,12 @@ WebStyle::drawSliderGroove { p->save(); - p->setPen(TQPen(g.dark(), 0, Qt::DotLine)); + p->setPen(TQPen(g.dark(), 0, TQt::DotLine)); - if( o == Qt::Horizontal ) + if( o == TQt::Horizontal ) p->drawLine(x, y + h / 2, w, y + h / 2); else - if( o == Qt::Vertical ) + if( o == TQt::Vertical ) p->drawLine(x + w / 2, y, x + w / 2, h); p->restore(); @@ -919,7 +919,7 @@ WebStyle::drawSliderGroove WebStyle::drawArrow ( TQPainter * p, - Qt::ArrowType type, + TQt::ArrowType type, bool down, int x, int y, @@ -955,10 +955,10 @@ WebStyle::drawSlider int sl = sliderLength(); - if( o == Qt::Horizontal ) + if( o == TQt::Horizontal ) p->drawEllipse(x, y + h / 2 - sl / 2, sl, sl); else - if( o == Qt::Vertical ) + if( o == TQt::Vertical ) p->drawEllipse(x + w / 2 - sl / 2, y, sl, sl); p->restore(); @@ -1046,7 +1046,7 @@ WebStyle::drawTDEToolBarButton { bool toggleAndOn = false; - if (button->inherits(TQBUTTON_OBJECT_NAME_STRING)) + if (button->inherits("TQButton")) { TQButton * b = static_cast<TQButton *>(button); toggleAndOn = b->isToggleButton() && b->isOn(); @@ -1495,7 +1495,7 @@ WebStyle::drawTabMask bool ) { - p->fillRect(tab->rect(), Qt::color1); + p->fillRect(tab->rect(), TQt::color1); } void @@ -1641,7 +1641,7 @@ WebStyle::drawKickerTaskButton p->setPen(contrastingForeground(g.text(), bg)); } - p->setPen(Qt::white); + p->setPen(TQt::white); p->drawText ( @@ -1655,7 +1655,7 @@ WebStyle::drawKickerTaskButton } p->restore(); - p->setPen(Qt::white); + p->setPen(TQt::white); } int diff --git a/tdestyles/web/webstyle.h b/tdestyles/web/webstyle.h index 0e4c59dbd..ab8742691 100644 --- a/tdestyles/web/webstyle.h +++ b/tdestyles/web/webstyle.h @@ -186,7 +186,7 @@ class WebStyle : public TDEStyle void drawArrow ( TQPainter *, - Qt::ArrowType, + TQt::ArrowType, bool down, int x, int y, @@ -406,7 +406,7 @@ class WebStyle : public TDEStyle int popupMenuItemHeight(bool, TQMenuItem *, const TQFontMetrics &); - GUIStyle guiStyle() const { return Qt::MotifStyle; } + GUIStyle guiStyle() const { return TQt::MotifStyle; } bool eventFilter(TQObject *, TQEvent *); }; |