From bfb063893534c33acd9abd340c80979205dc82f9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 2 Oct 2010 02:23:08 +0000 Subject: [CRITICAL] Repair borken rendering due to incorrect inherited object logic git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1181768 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kstyles/highcolor/highcolor.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kstyles/highcolor/highcolor.cpp') diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp index 3f559d0fa..a3a520f84 100644 --- a/kstyles/highcolor/highcolor.cpp +++ b/kstyles/highcolor/highcolor.cpp @@ -3,7 +3,7 @@ * * KDE3 HighColor Style (version 1.0) * 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 @@ -189,9 +189,9 @@ HighColorStyle::~HighColorStyle() void HighColorStyle::polish(TQWidget* widget) { // Put in order of highest occurrence to maximise hit rate - if (widget->inherits("TQPushButton")) { + if (widget->inherits("QPushButton")) { widget->installEventFilter(this); - } else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) { + } else if (widget->inherits("QMenuBar") || widget->inherits("QPopupMenu")) { widget->setBackgroundMode(TQWidget::NoBackground); } else if (type == HighColor && widget->inherits("QToolBarExtensionWidget")) { widget->installEventFilter(this); @@ -210,10 +210,10 @@ void HighColorStyle::polish(TQWidget* widget) void HighColorStyle::unPolish(TQWidget* widget) { - if (widget->inherits("TQPushButton")) { + if (widget->inherits("QPushButton")) { widget->removeEventFilter(this); } - else if (widget->inherits("TQMenuBar") || widget->inherits("TQPopupMenu")) { + else if (widget->inherits("QMenuBar") || widget->inherits("QPopupMenu")) { widget->setBackgroundMode(TQWidget::PaletteBackground); } else if (type == HighColor && widget->inherits("QToolBarExtensionWidget")) { widget->removeEventFilter(this); @@ -1648,7 +1648,7 @@ void HighColorStyle::drawComplexControl( ComplexControl control, } else if (widget->parent()) { - if (widget->parent()->inherits("TQToolBar")) + if (widget->parent()->inherits("QToolBar")) { TQToolBar* parent = (TQToolBar*)widget->parent(); TQRect pr = parent->rect(); -- cgit v1.2.1