diff --git a/kdefx/kstyle.cpp b/kdefx/kstyle.cpp index dc5216125..6ebabf681 100644 --- a/kdefx/kstyle.cpp +++ b/kdefx/kstyle.cpp @@ -576,8 +576,8 @@ void KStyle::drawPrimitive( PrimitiveElement pe, // Check if we are a normal toolbar or a hidden dockwidget. if ( parent && - (parent->inherits("TQToolBar") || // Normal toolbar - (parent->inherits("TQMainWindow")) )) // Collapsed dock + (parent->inherits("QToolBar") || // Normal toolbar + (parent->inherits("QMainWindow")) )) // Collapsed dock // Draw a toolbar handle drawKStylePrimitive( KPE_ToolBarHandle, p, widget, r, cg, flags, opt ); @@ -988,8 +988,8 @@ int KStyle::pixelMetric(PixelMetric m, const TQWidget* widget) const // Check that we are not a normal toolbar or a hidden dockwidget, // in which case we need to adjust the height for font size if (widget && (parent = widget->parentWidget() ) - && !parent->inherits("TQToolBar") - && !parent->inherits("TQMainWindow") + && !parent->inherits("QToolBar") + && !parent->inherits("QMainWindow") && widget->inherits("QDockWindowHandle") ) return widget->fontMetrics().lineSpacing(); else diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index 6eb6c57ad..6921efa2f 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -5,7 +5,7 @@ based on the KDE3 HighColor Style Copyright (C) 2001-2002 Karol Szwed - (C) 2001-2002 Fredrik Höglund + (C) 2001-2002 Fredrik H�glund Drawing routines adapted from the KDE2 HCStyle, Copyright (C) 2000 Daniel M. Duley @@ -337,17 +337,17 @@ void KeramikStyle::polish(TQApplication* app) void KeramikStyle::polish(TQWidget* widget) { // Put in order of highest occurrence to maximise hit rate - if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) || widget->inherits("TQToolButton") ) + if ( widget->inherits( "QPushButton" ) || widget->inherits( "QComboBox" ) || widget->inherits("QToolButton") ) { widget->installEventFilter(this); - if ( widget->inherits( "TQComboBox" ) ) + if ( widget->inherits( "QComboBox" ) ) widget->setBackgroundMode( NoBackground ); } - else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) ) + else if ( widget->inherits( "QMenuBar" ) || widget->inherits( "QPopupMenu" ) ) widget->setBackgroundMode( NoBackground ); else if ( widget->parentWidget() && - ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) || + ( ( widget->inherits( "QListBox" ) && widget->parentWidget()->inherits( "QComboBox" ) ) || widget->inherits( "KCompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 4 ); @@ -378,17 +378,17 @@ void KeramikStyle::polish(TQWidget* widget) void KeramikStyle::unPolish(TQWidget* widget) { //### TODO: This needs major cleanup (and so does polish() ) - if ( widget->inherits( "TQPushButton" ) || widget->inherits( "TQComboBox" ) ) + if ( widget->inherits( "QPushButton" ) || widget->inherits( "QComboBox" ) ) { - if ( widget->inherits( "TQComboBox" ) ) + if ( widget->inherits( "QComboBox" ) ) widget->setBackgroundMode( PaletteButton ); widget->removeEventFilter(this); } - else if ( widget->inherits( "TQMenuBar" ) || widget->inherits( "TQPopupMenu" ) ) + else if ( widget->inherits( "QMenuBar" ) || widget->inherits( "QPopupMenu" ) ) widget->setBackgroundMode( PaletteBackground ); else if ( widget->parentWidget() && - ( ( widget->inherits( "TQListBox" ) && widget->parentWidget()->inherits( "TQComboBox" ) ) || + ( ( widget->inherits( "QListBox" ) && widget->parentWidget()->inherits( "QComboBox" ) ) || widget->inherits( "KCompletionBox" ) ) ) { TQListBox* listbox = (TQListBox*) widget; listbox->setLineWidth( 1 ); @@ -1230,7 +1230,7 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe, TQToolBar* parent = 0; - if (widget && widget->parent() && widget->parent()->inherits("TQToolBar")) + if (widget && widget->parent() && widget->parent()->inherits("QToolBar")) parent = static_cast(widget->parent()); renderToolbarEntryBackground(p, parent, r, cg, (flags & Style_Horizontal)); @@ -1358,7 +1358,7 @@ void KeramikStyle::drawControl( ControlElement element, } else { - if (widget->parent() && widget->parent()->inherits("TQToolBar")) + if (widget->parent() && widget->parent()->inherits("QToolBar")) toolbarBlendWidget = widget; drawPrimitive( PE_ButtonCommand, p, r, cg, flags ); @@ -1465,7 +1465,7 @@ void KeramikStyle::drawControl( ControlElement element, case CE_ToolButtonLabel: { //const TQToolButton *toolbutton = static_cast(widget); - bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "TQToolBar" ); + bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "QToolBar" ); TQRect nr = r; if (!onToolbar) @@ -1536,7 +1536,7 @@ void KeramikStyle::drawControl( ControlElement element, case CE_DockWindowEmptyArea: { TQRect pr = r; - if (widget && widget->inherits("TQToolBar")) + if (widget && widget->inherits("QToolBar")) { const TQToolBar* tb = static_cast(widget); if (tb->place() == TQDockWindow::OutsideDock) @@ -1975,7 +1975,7 @@ void KeramikStyle::drawComplexControl( ComplexControl control, { //Double-buffer only when we are in the slower full-blend mode if (widget->parent() && - ( widget->parent()->inherits("TQToolBar")|| !qstrcmp(widget->parent()->name(), kdeToolbarWidget) ) ) + ( widget->parent()->inherits("QToolBar")|| !qstrcmp(widget->parent()->name(), kdeToolbarWidget) ) ) { buf = new TQPixmap( r.width(), r.height() ); br.setX(0); @@ -2208,10 +2208,10 @@ void KeramikStyle::drawComplexControl( ComplexControl control, // ------------------------------------------------------------------- case CC_ToolButton: { const TQToolButton *toolbutton = (const TQToolButton *) widget; - bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "TQToolBar" ); + bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "QToolBar" ); bool onExtender = !onToolbar && widget->parentWidget() && widget->parentWidget()->inherits( "QToolBarExtensionWidget") && - widget->parentWidget()->parentWidget()->inherits( "TQToolBar" ); + widget->parentWidget()->parentWidget()->inherits( "QToolBar" ); bool onControlButtons = false; if (!onToolbar && !onExtender && widget->parentWidget() && @@ -2440,7 +2440,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, case CT_ToolButton: { - bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "TQToolBar" ); + bool onToolbar = widget->parentWidget() && widget->parentWidget()->inherits( "QToolBar" ); if (!onToolbar) //Behaves like a button, so scale appropriately to the border { int w = contentSize.width(); diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp index 944296223..0f998b2db 100644 --- a/kstyles/klegacy/klegacystyle.cpp +++ b/kstyles/klegacy/klegacystyle.cpp @@ -1898,23 +1898,23 @@ void KLegacyStyle::polish(TQWidget *widget) { bool immediateRender = false; bool bgPixmap = false; - if (widget->inherits("TQButton")) { + if (widget->inherits("QButton")) { metaobject = TQButton::staticMetaObject(); eventFilter = true; } - if (widget->inherits("TQComboBox")) { + if (widget->inherits("QComboBox")) { metaobject = TQComboBox::staticMetaObject(); eventFilter = true; } - if (widget->inherits("TQScrollBar")) { + if (widget->inherits("QScrollBar")) { metaobject = TQScrollBar::staticMetaObject(); eventFilter = true; mouseTrack = true; } - if (widget->inherits("TQMenuBar")) { + if (widget->inherits("QMenuBar")) { eventFilter = true; immediateRender = true; @@ -1930,7 +1930,7 @@ void KLegacyStyle::polish(TQWidget *widget) { widget->setBackgroundMode(TQWidget::PaletteBackground); } - if (widget->inherits("TQToolBar")) { + if (widget->inherits("QToolBar")) { metaobject = TQToolBar::staticMetaObject(); eventFilter = true; @@ -1944,7 +1944,7 @@ void KLegacyStyle::polish(TQWidget *widget) { widget->setBackgroundMode(TQWidget::PaletteBackground); } - if (widget->inherits("TQLineEdit")) { + if (widget->inherits("QLineEdit")) { metaobject = TQLineEdit::staticMetaObject(); eventFilter = true; @@ -1968,7 +1968,7 @@ void KLegacyStyle::polish(TQWidget *widget) { detail = "base"; } - if (widget->inherits("TQPopupMenu")) { + if (widget->inherits("QPopupMenu")) { qDebug("polishing popup '%s'", widget->className()); metaobject = TQPopupMenu::staticMetaObject(); widget->setBackgroundMode(TQWidget::PaletteBackground); @@ -2544,7 +2544,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")) + if (priv->lastWidget && priv->lastWidget->inherits("QComboBox")) key.data.state = KLegacy::Prelight; TQPixmap *pix = gobj->draw(key, w, h, "optionmenu"); @@ -3081,7 +3081,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { { TQWidget *w = (TQWidget *) obj; - if (w->inherits("TQPopupMenu") && w->width() < 700) { + if (w->inherits("QPopupMenu") && w->width() < 700) { GtkObject *gobj = priv->gtkDict.find(TQPopupMenu::staticMetaObject()); if (gobj) { @@ -3151,7 +3151,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (p && (! p->isNull())) w->setBackgroundPixmap(*p); } - } else if (w->inherits("TQLineEdit")) { + } else if (w->inherits("QLineEdit")) { GtkObject *gobj = priv->gtkDict.find(TQLineEdit::staticMetaObject()); if (gobj) { @@ -3191,8 +3191,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { w->setPalette(pal); } } - } else if (w->inherits("TQMenuBar") || - w->inherits("TQToolBar")) { + } else if (w->inherits("QMenuBar") || + w->inherits("QToolBar")) { GtkObject *gobj = priv->gtkDict.find(TQMenuBar::staticMetaObject()); if (gobj) { @@ -3256,13 +3256,13 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { case TQEvent::Enter: { - if (obj->inherits("TQPushButton") || - obj->inherits("TQComboBox") || - obj->inherits("TQSlider") || + if (obj->inherits("QPushButton") || + obj->inherits("QComboBox") || + obj->inherits("QSlider") || obj->inherits("QScrollbar")) { priv->lastWidget = (TQWidget *) obj; priv->lastWidget->repaint(false); - } else if (obj->inherits("TQRadioButton")) { + } else if (obj->inherits("QRadioButton")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel() && w->isEnabled()) { @@ -3290,7 +3290,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { } } } - } else if (obj->inherits("TQCheckBox")) { + } else if (obj->inherits("QCheckBox")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel() && w->isEnabled()) { @@ -3328,8 +3328,8 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { if (obj == priv->lastWidget) { priv->lastWidget = 0; ((TQWidget *) obj)->repaint(false); - } else if (obj->inherits("TQRadioButton") || - obj->inherits("TQCheckBox")) { + } else if (obj->inherits("QRadioButton") || + obj->inherits("QCheckBox")) { TQWidget *w = (TQWidget *) obj; if (! w->isTopLevel()) { @@ -3346,7 +3346,7 @@ bool KLegacyStyle::eventFilter(TQObject *obj, TQEvent *e) { { TQMouseEvent *me = (TQMouseEvent *) e; priv->mousePos = me->pos(); - if (obj->inherits("TQScrollBar") && + if (obj->inherits("QScrollBar") && (! (me->state() & (LeftButton | MidButton | RightButton)))) { priv->hovering = true; ((TQWidget *) obj)->repaint(false); diff --git a/pics/crystalsvg/cr16-action-kde.png b/pics/crystalsvg/cr16-action-kde.png index eb3b071fb..7316cd74b 100644 Binary files a/pics/crystalsvg/cr16-action-kde.png and b/pics/crystalsvg/cr16-action-kde.png differ diff --git a/pics/crystalsvg/cr22-action-kde.png b/pics/crystalsvg/cr22-action-kde.png index 2cb9c4b54..fb0e932f2 100644 Binary files a/pics/crystalsvg/cr22-action-kde.png and b/pics/crystalsvg/cr22-action-kde.png differ diff --git a/pics/crystalsvg/cr32-action-kde.png b/pics/crystalsvg/cr32-action-kde.png index ecf8aaef9..3b462b4fd 100644 Binary files a/pics/crystalsvg/cr32-action-kde.png and b/pics/crystalsvg/cr32-action-kde.png differ diff --git a/pics/crystalsvg/cr48-action-kde.png b/pics/crystalsvg/cr48-action-kde.png index 9df936014..da4c83224 100644 Binary files a/pics/crystalsvg/cr48-action-kde.png and b/pics/crystalsvg/cr48-action-kde.png differ