Fix a number of runtime object identification problems which led to an even larger array of minor glitches

NOTE: kdevelop and kdewebdev still need to be fully repaired


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 3 insertions, 3 deletions

diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp
index d2b14e46..49fc4e6e 100644
--- a/styles/phase/phasestyle.cpp
+++ b/styles/phase/phasestyle.cpp
@@ -630,7 +630,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element,
               horiz = true;
           }
 
-          if ((widget) && ((widget->inherits("TQPopupMenu")) ||
+          if ((widget) && ((widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING)) ||
                            (widget->inherits("KPopupTitle")))) {
               // kicker/kdesktop menu titles
               drawPhaseBevel(painter, x,y,w,h,
@@ -887,7 +887,7 @@ void PhaseStyle::drawPrimitive(PrimitiveElement element,
           bool flat = true;
 
           if (widget && widget->parent() &&
-              widget->parent()->inherits("TQToolBar")) {
+              widget->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
               TQToolBar *toolbar = ::qt_cast<TQToolBar*>(widget->parent());
               if (toolbar) {
                   // toolbar not floating or in a QMainWindow
@@ -1852,7 +1852,7 @@ void PhaseStyle::drawComplexControl(ComplexControl control,
           y2 = rect.bottom();
 
           // check for TQToolBar parent
-          if (btn->parent() && btn->parent()->inherits("TQToolBar")) {
+          if (btn->parent() && btn->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING)) {
               toolbar = ::qt_cast<TQToolBar*>(btn->parent());
               if (toolbar) {
                   horiz = (toolbar->orientation() == Qt::Horizontal);