Replace _OBJECT_NAME_STRING defines with actual strings. This relates to the merging of tqtinterface with tqt3.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 36c049e135b0cec7cf97b41888860186813df5f0)

1 files changed, 23 insertions, 23 deletions

diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index 9578c05c1..9646c897e 100644
--- a/tdecore/tdeconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -69,29 +69,29 @@ void TDEConfigDialogManager::init(bool trackChanges)
   if(trackChanges)
   {
     // QT
-    changedMap.insert(TQBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQCHECKBOX_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQPUSHBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert(TQRADIOBUTTON_OBJECT_NAME_STRING, TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQButton", TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQCheckBox", TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQPushButton", TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQRadioButton", TQT_SIGNAL(stateChanged(int)));
     // We can only store one thing, so you can't have
     // a ButtonGroup that is checkable.
-    changedMap.insert(TQBUTTONGROUP_OBJECT_NAME_STRING, TQT_SIGNAL(clicked(int)));
-    changedMap.insert(TQGROUPBOX_OBJECT_NAME_STRING, TQT_SIGNAL(toggled(bool)));
-    changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(activated (int)));
+    changedMap.insert("TQButtonGroup", TQT_SIGNAL(clicked(int)));
+    changedMap.insert("TQGroupBox", TQT_SIGNAL(toggled(bool)));
+    changedMap.insert("TQComboBox", TQT_SIGNAL(activated (int)));
     //qsqlproperty map doesn't store the text, but the value!
-    //changedMap.insert(TQCOMBOBOX_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert(TQDATEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDate &)));
-    changedMap.insert(TQDATETIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQDateTime &)));
-    changedMap.insert(TQDIAL_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged (int)));
-    changedMap.insert(TQLINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert(TQSLIDER_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int)));
-    changedMap.insert(TQSPINBOX_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(int)));
-    changedMap.insert(TQTIMEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(valueChanged(const TQTime &)));
-    changedMap.insert(TQTEXTEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged()));
-    changedMap.insert(TQTEXTBROWSER_OBJECT_NAME_STRING, TQT_SIGNAL(sourceChanged(const TQString &)));
-    changedMap.insert(TQMULTILINEEDIT_OBJECT_NAME_STRING, TQT_SIGNAL(textChanged()));
-    changedMap.insert(TQLISTBOX_OBJECT_NAME_STRING, TQT_SIGNAL(selectionChanged()));
-    changedMap.insert(TQTABWIDGET_OBJECT_NAME_STRING, TQT_SIGNAL(currentChanged(TQWidget *)));
+    //changedMap.insert("TQComboBox", TQT_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert("TQDateEdit", TQT_SIGNAL(valueChanged(const TQDate &)));
+    changedMap.insert("TQDateTimeEdit", TQT_SIGNAL(valueChanged(const TQDateTime &)));
+    changedMap.insert("TQDial", TQT_SIGNAL(valueChanged (int)));
+    changedMap.insert("TQLineEdit", TQT_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert("TQSlider", TQT_SIGNAL(valueChanged(int)));
+    changedMap.insert("TQSpinBox", TQT_SIGNAL(valueChanged(int)));
+    changedMap.insert("TQTimeEdit", TQT_SIGNAL(valueChanged(const TQTime &)));
+    changedMap.insert("TQTextEdit", TQT_SIGNAL(textChanged()));
+    changedMap.insert("TQTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &)));
+    changedMap.insert("TQMultiLineEdit", TQT_SIGNAL(textChanged()));
+    changedMap.insert("TQListBox", TQT_SIGNAL(selectionChanged()));
+    changedMap.insert("TQTabWidget", TQT_SIGNAL(currentChanged(TQWidget *)));
 
     // KDE
     changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int)));
@@ -218,7 +218,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
         kdWarning(178) << "A widget named '" << widgetName << "' was found but there is no setting named '" << configId << "'" << endl;
       }
     }
-    else if (childWidget->inherits(TQLABEL_OBJECT_NAME_STRING))
+    else if (childWidget->inherits("TQLabel"))
     {
       TQLabel *label = static_cast<TQLabel *>(childWidget);
       TQWidget *buddy = label->buddy();
@@ -238,8 +238,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
       TQMap<TQString, TQCString>::const_iterator changedIt = changedMap.find(childWidget->className());
       if (changedIt != changedMap.end())
       {
-        if ((!d->insideGroupBox || !childWidget->inherits(TQRADIOBUTTON_OBJECT_NAME_STRING)) && 
-            !childWidget->inherits(TQGROUPBOX_OBJECT_NAME_STRING))
+        if ((!d->insideGroupBox || !childWidget->inherits("TQRadioButton")) && 
+            !childWidget->inherits("TQGroupBox"))
           kdDebug(178) << "Widget '" << widgetName << "' (" << childWidget->className() << ") remains unmanaged." << endl;
       }        
     }