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

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 47d29ee63f76127afe48c487d3e8794b0d05508b)

2 files changed, 6 insertions, 6 deletions

diff --git a/src/kmplayertvsource.cpp b/src/kmplayertvsource.cpp
index 9089d51..7e5b8e5 100644
--- a/src/kmplayertvsource.cpp
+++ b/src/kmplayertvsource.cpp
@@ -298,14 +298,14 @@ KDE_NO_EXPORT void TVDevice::updateDevicePage () {
         bool ok;
         if (input->getAttribute ("tuner").toInt (&ok) && ok) {
             TQWidget * widget = device_page->inputsTab->page (i);
-            TQTable * table = static_cast <TQTable *> (TQT_TQWIDGET(widget->child ("PageTVChannels", TQTABLE_OBJECT_NAME_STRING)));
+            TQTable * table = static_cast <TQTable *> (TQT_TQWIDGET(widget->child ("PageTVChannels", "TQTable")));
             if (table) {
                 input->clearChildren ();
                 for (int j = 0; j<table->numRows() && table->item (j, 1); ++j) {
                     input->appendChild (new TVChannel (m_doc, table->item (j, 0)->text (), table->item (j, 1)->text ().toDouble ()));
                 }
             }
-            TQComboBox * norms = static_cast <TQComboBox *> (TQT_TQWIDGET(widget->child ("PageTVNorm", TQCOMBOBOX_OBJECT_NAME_STRING)));
+            TQComboBox * norms = static_cast <TQComboBox *> (TQT_TQWIDGET(widget->child ("PageTVNorm", "TQComboBox")));
             if (norms) {
                 input->setAttribute ("norm", norms->currentText ());
             }
diff --git a/src/pref.cpp b/src/pref.cpp
index b18fb4c..d0388f8 100644
--- a/src/pref.cpp
+++ b/src/pref.cpp
@@ -136,16 +136,16 @@ KDE_NO_CDTOR_EXPORT Preferences::Preferences(PartBase * player, Settings * setti
 }
 
 KDE_NO_EXPORT void Preferences::setPage (const char * name) {
-    TQObject * o = child (name, TQFRAME_OBJECT_NAME_STRING);
+    TQObject * o = child (name, "TQFrame");
     if (!o) return;
     TQFrame * page = static_cast <TQFrame *> (TQT_TQWIDGET(o));
     TQWidget * w = page->parentWidget ();
-    while (w && !w->inherits (TQTABWIDGET_OBJECT_NAME_STRING))
+    while (w && !w->inherits ("TQTabWidget"))
         w = w->parentWidget ();
     if (!w) return;
     TQTabWidget * t = static_cast <TQTabWidget*> (w);
     t->setCurrentPage (t->indexOf(page));
-    if (!t->parentWidget() || !t->parentWidget()->inherits (TQFRAME_OBJECT_NAME_STRING))
+    if (!t->parentWidget() || !t->parentWidget()->inherits ("TQFrame"))
         return;
     showPage (pageIndex (t->parentWidget ()));
 }
@@ -189,7 +189,7 @@ KDE_NO_EXPORT void Preferences::removePrefPage(PreferencesPage * page) {
         }
     if (!tab->count ()) {
         TQWidget * w = tab->parentWidget ();
-        while (w && !w->inherits (TQFRAME_OBJECT_NAME_STRING))
+        while (w && !w->inherits ("TQFrame"))
             w = w->parentWidget ();
         delete w;
         entries.erase (en_it);