From cbecd3a8a71c92976314479c9ce892ee8138da5d Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 2 Apr 2011 21:48:09 +0000
Subject: Update kdebase inherits() to use new object name defines instead of
 string literals

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1226899 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 drkonqi/backtrace.cpp            | 2 +-
 kdeprint/kdeprintfax/faxctrl.cpp | 2 +-
 klipper/toplevel.cpp             | 6 +++---
 konqueror/konq_actions.cc        | 2 +-
 konqueror/konq_mainwindow.cc     | 2 +-
 konqueror/konq_view.cc           | 4 ++--
 konsole/konsole/konsole.cpp      | 2 +-
 kwin/workspace.cpp               | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drkonqi/backtrace.cpp b/drkonqi/backtrace.cpp
index 98d466fb4..acc09e2cc 100644
--- a/drkonqi/backtrace.cpp
+++ b/drkonqi/backtrace.cpp
@@ -73,7 +73,7 @@ void BackTrace::start()
   {
     TQObject * o = tqparent();
 
-    if (o && !o->inherits("QWidget"))
+    if (o && !o->inherits(TQWIDGET_OBJECT_NAME_STRING))
     {
       o = NULL;
     }
diff --git a/kdeprint/kdeprintfax/faxctrl.cpp b/kdeprint/kdeprintfax/faxctrl.cpp
index f88d7ace5..d721fac0b 100644
--- a/kdeprint/kdeprintfax/faxctrl.cpp
+++ b/kdeprint/kdeprintfax/faxctrl.cpp
@@ -604,7 +604,7 @@ void FaxCtrl::slotCloseLog()
 	{
 		TQTextEdit	*view = m_logview;
 		m_logview = 0;
-		if (obj && obj->inherits("QPushButton"))
+		if (obj && obj->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
 			delete view->tqparentWidget();
 kdDebug() << "slotClose()" << endl;
 	}
diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index ce539f825..cbbce7de5 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -1016,10 +1016,10 @@ bool KlipperWidget::ignoreClipboardChanges() const
     TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
     if ( tqfocusWidget )
     {
-        if ( tqfocusWidget->inherits( "QSpinBox" ) ||
+        if ( tqfocusWidget->inherits( TQSPINBOX_OBJECT_NAME_STRING ) ||
              (tqfocusWidget->tqparentWidget() &&
-              tqfocusWidget->inherits("QLineEdit") &&
-              tqfocusWidget->tqparentWidget()->inherits("QSpinWidget")) )
+              tqfocusWidget->inherits(TQLINEEDIT_OBJECT_NAME_STRING) &&
+              tqfocusWidget->tqparentWidget()->inherits(TQSPINWIDGET_OBJECT_NAME_STRING)) )
         {
             return true;
         }
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cc
index 047066040..c67d27c8f 100644
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cc
@@ -94,7 +94,7 @@ int KonqBidiHistoryAction::plug( TQWidget *widget, int index )
     return -1;
 
   // Go menu
-  if ( widget->inherits("QPopupMenu") )
+  if ( widget->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) )
   {
     m_goMenu = (TQPopupMenu*)widget;
     // Forward signal (to main view)
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cc
index f162c0b60..79b88daa3 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cc
@@ -1044,7 +1044,7 @@ TQObject *KonqMainWindow::lastFrame( KonqView *view )
   TQObject *nextFrame, *viewFrame;
   nextFrame = TQT_TQOBJECT(view->frame());
   viewFrame = 0;
-  while ( nextFrame != 0 && ! nextFrame->inherits( "QWidgetStack" ) ) {
+  while ( nextFrame != 0 && ! nextFrame->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
     viewFrame = nextFrame;
     nextFrame = nextFrame->tqparent();
   }
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cc
index 873ba8242..a064e3116 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cc
@@ -472,7 +472,7 @@ void KonqView::connectPart(  )
 
   m_pPart->widget()->installEventFilter( this );
 
-  if (m_bBackRightClick && m_pPart->widget()->inherits("QScrollView") )
+  if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) )
   {
     (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
   }
@@ -1220,7 +1220,7 @@ void KonqView::reparseConfiguration()
     bool b = KonqSettings::backRightClick();
     if ( m_bBackRightClick != b )
     {
-        if (m_bBackRightClick && m_pPart->widget()->inherits("QScrollView") )
+        if (m_bBackRightClick && m_pPart->widget()->inherits(TQSCROLLVIEW_OBJECT_NAME_STRING) )
         {
             (static_cast<TQScrollView *>(m_pPart->widget()))->viewport()->installEventFilter( this );
         }
diff --git a/konsole/konsole/konsole.cpp b/konsole/konsole/konsole.cpp
index d55042671..c071fb2e9 100644
--- a/konsole/konsole/konsole.cpp
+++ b/konsole/konsole/konsole.cpp
@@ -480,7 +480,7 @@ void Konsole::makeGUI()
    // Remove the empty separator Qt inserts if the menu is empty on popup,
    // not sure if this will be "fixed" in Qt, for now use this hack (malte)
    if(!(isRestored)) {
-     if (sender() && sender()->inherits("QPopupMenu") &&
+     if (sender() && sender()->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) &&
        static_cast<const TQPopupMenu *>(sender())->count() == 1)
        const_cast<TQPopupMenu *>(static_cast<const TQPopupMenu *>(sender()))->removeItemAt(0);
        }
diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
index 7cb63acd2..ac4fcdc3f 100644
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
@@ -1907,7 +1907,7 @@ unsigned int Workspace::sendFakedMouseEvent( TQPoint pos, WId w, MouseEmulation
     if ( !w )
         return state;
     TQWidget* widget = TQWidget::tqfind( w );
-    if ( (!widget ||  widget->inherits("QToolButton") ) && !findClient( WindowMatchPredicate( w )) ) 
+    if ( (!widget ||  widget->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) ) && !findClient( WindowMatchPredicate( w )) ) 
         {
         int x, y;
         Window xw;
-- 
cgit v1.2.3