summaryrefslogtreecommitdiffstats
path: root/kstyles/highcolor
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-02 02:23:08 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-10-02 02:23:08 +0000
commitbfb063893534c33acd9abd340c80979205dc82f9 (patch)
tree75f450e2d7a85066bbff654b0a8f014e240197aa /kstyles/highcolor
parentccb3b5e486e55a0b014cbc3357c209c3d822ed47 (diff)
downloadtdelibs-bfb063893534c33acd9abd340c80979205dc82f9.tar.gz
tdelibs-bfb063893534c33acd9abd340c80979205dc82f9.zip
[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
Diffstat (limited to 'kstyles/highcolor')
-rw-r--r--kstyles/highcolor/highcolor.cpp12
1 files changed, 6 insertions, 6 deletions
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 <gallium@kde.org>
- * (C) 2001-2002 Fredrik Höglund <fredrik@kde.org>
+ * (C) 2001-2002 Fredrik H�glund <fredrik@kde.org>
*
* Drawing routines adapted from the KDE2 HCStyle,
* Copyright (C) 2000 Daniel M. Duley <mosfet@kde.org>
@@ -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();