From f1fdec42303ca53d085302ea2af9110cd1d79570 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Thu, 24 Feb 2011 07:08:32 +0000
Subject: 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/kdebase@1222475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kcontrol/kcontrol/global.cpp     |  2 +-
 kcontrol/locale/toplevel.cpp     | 12 ++++++------
 kcontrol/style/stylepreview.ui.h |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kcontrol')

diff --git a/kcontrol/kcontrol/global.cpp b/kcontrol/kcontrol/global.cpp
index ed892ac70..d5f103cd5 100644
--- a/kcontrol/kcontrol/global.cpp
+++ b/kcontrol/kcontrol/global.cpp
@@ -105,7 +105,7 @@ TQString KCGlobal::baseGroup()
 
 void KCGlobal::repairAccels( TQWidget * tw )
 {
-    TQObjectList * l = tw->queryList( "TQAccel" );
+    TQObjectList * l = tw->queryList( TQACCEL_OBJECT_NAME_STRING );
     TQObjectListIt it( *l );             // iterate over the buttons
     TQObject * obj;
     while ( (obj=it.current()) != 0 ) { // for each found object...
diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp
index 523fa50ea..e53b52ed5 100644
--- a/kcontrol/locale/toplevel.cpp
+++ b/kcontrol/locale/toplevel.cpp
@@ -227,7 +227,7 @@ void KLocaleApplication::slotTranslate()
   // The untranslated string for TQLabel are stored in
   // the name() so we use that when retranslating
   TQObject *wc;
-  TQObjectList *list = queryList("TQWidget");
+  TQObjectList *list = queryList(TQWIDGET_OBJECT_NAME_STRING);
   TQObjectListIt it(*list);
   while ( (wc = it.current()) != 0 )
   {
@@ -243,15 +243,15 @@ void KLocaleApplication::slotTranslate()
     if (::qstrcmp(wc->name(), "unnamed") == 0)
       continue;
 
-    if (::qstrcmp(wc->className(), "TQLabel") == 0)
+    if (::qstrcmp(wc->className(), TQLABEL_OBJECT_NAME_STRING) == 0)
       ((TQLabel *)wc)->setText( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), "TQGroupBox") == 0 ||
-             ::qstrcmp(wc->className(), "TQVGroupBox") == 0)
+    else if (::qstrcmp(wc->className(), TQGROUPBOX_OBJECT_NAME_STRING) == 0 ||
+             ::qstrcmp(wc->className(), TQVGROUPBOX_OBJECT_NAME_STRING) == 0)
       ((TQGroupBox *)wc)->setTitle( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), "TQPushButton") == 0 ||
+    else if (::qstrcmp(wc->className(), TQPUSHBUTTON_OBJECT_NAME_STRING) == 0 ||
              ::qstrcmp(wc->className(), "KMenuButton") == 0)
       ((TQPushButton *)wc)->setText( m_locale->translate( wc->name() ) );
-    else if (::qstrcmp(wc->className(), "TQCheckBox") == 0)
+    else if (::qstrcmp(wc->className(), TQCHECKBOX_OBJECT_NAME_STRING) == 0)
       ((TQCheckBox *)wc)->setText( m_locale->translate( wc->name() ) );
   }
   delete list;
diff --git a/kcontrol/style/stylepreview.ui.h b/kcontrol/style/stylepreview.ui.h
index 9f5188afe..edf38650e 100644
--- a/kcontrol/style/stylepreview.ui.h
+++ b/kcontrol/style/stylepreview.ui.h
@@ -33,7 +33,7 @@ void StylePreview::init()
 {
     // Ensure that the user can't toy with the child widgets.
     // Method borrowed from Qt's qtconfig.
-    TQObjectList* l = queryList("TQWidget");
+    TQObjectList* l = queryList(TQWIDGET_OBJECT_NAME_STRING);
     TQObjectListIt it(*l);
     TQObject* obj;
     while ((obj = it.current()) != 0)
-- 
cgit v1.2.1