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 53c180e71c2d6bc90bb777b4bd304d5f235040e3)

2 files changed, 12 insertions, 12 deletions

diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
index 721257c..70af32f 100644
--- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
+++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.cpp
@@ -45,7 +45,7 @@ void KWidgetStreamer::fromStream( TQDataStream& stream, TQObject* to )
 void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stream )
 {
   // Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc.
-  if ( ! from->inherits(TQWIDGET_OBJECT_NAME_STRING) )
+  if ( ! from->inherits("TQWidget") )
     return;
 
   // Serializing all the children (if any).
@@ -80,7 +80,7 @@ void KWidgetStreamer::propertyToStream( const TQObject* from, TQDataStream& stre
 void KWidgetStreamer::propertyFromStream( TQDataStream& stream, TQObject* to )
 {
   // Only handle widgets. Alternatives to widgets are layouts, validators, timers, etc.
-  if ( ! to->inherits(TQWIDGET_OBJECT_NAME_STRING) )
+  if ( ! to->inherits("TQWidget") )
     return;
 
   // Stream in all the children (if any)
@@ -119,7 +119,7 @@ KWidgetStreamer::KWidgetStreamer ()
   l.clear();
   l << TQString::fromLatin1("enabled")
     << TQString::fromLatin1("checked") << TQString::fromLatin1("tristate");
-  _map.insert(TQString::fromLatin1(TQCHECKBOX_OBJECT_NAME_STRING), l);
+  _map.insert(TQString::fromLatin1("TQCheckBox"), l);
 
   // TQComboBox
   l.clear();
@@ -127,51 +127,51 @@ KWidgetStreamer::KWidgetStreamer ()
     << TQString::fromLatin1("editable") << TQString::fromLatin1("currentItem")
     << TQString::fromLatin1("maxCount") << TQString::fromLatin1("insertionPolicy")
     << TQString::fromLatin1("autoCompletion");
-  _map.insert(TQString::fromLatin1(TQCOMBOBOX_OBJECT_NAME_STRING), l);
+  _map.insert(TQString::fromLatin1("TQComboBox"), l);
 
   // TQDial
   l.clear();
   l << TQString::fromLatin1("enabled")
     << TQString::fromLatin1("tracking") << TQString::fromLatin1("wrapping")
     << TQString::fromLatin1("value");
-  _map.insert(TQString::fromLatin1(TQDIAL_OBJECT_NAME_STRING), l);
+  _map.insert(TQString::fromLatin1("TQDial"), l);
 
   // TQLCDNumber
   l.clear();
   l << TQString::fromLatin1("enabled")
     << TQString::fromLatin1("numDigits") << TQString::fromLatin1("mode")
     << TQString::fromLatin1("segmentStyle") << TQString::fromLatin1("value");
-  _map.insert(TQString::fromLatin1(TQLCDNUMBER_OBJECT_NAME_STRING), l);
+  _map.insert(TQString::fromLatin1("TQLCDNumber"), l);
 
   // TQLineEdit
   l.clear();
   l << TQString::fromLatin1("enabled")
     << TQString::fromLatin1("text") << TQString::fromLatin1("maxLength")
     << TQString::fromLatin1("echoMode") << TQString::fromLatin1("alignment");
-  _map.insert(TQString::fromLatin1(TQLINEEDIT_OBJECT_NAME_STRING), l);
+  _map.insert(TQString::fromLatin1("TQLineEdit"), l);
 
   // TQMultiLineEdit
   l.clear();
   l << TQString::fromLatin1("enabled")
     << TQString::fromLatin1("text")
     << TQString::fromLatin1("alignment");
-  _map.insert(TQString::fromLatin1(TQTEXTEDIT_OBJECT_NAME_STRING), l);
+  _map.insert(TQString::fromLatin1("TQTextEdit"), l);
 
   // TQRadioButton
   l.clear();
   l << TQString::fromLatin1("enabled")
     << TQString::fromLatin1("checked");
-  _map.insert(TQString::fromLatin1(TQRADIOBUTTON_OBJECT_NAME_STRING), l);
+  _map.insert(TQString::fromLatin1("TQRadioButton"), l);
 
   // TQSlider
   l.clear();
   l << TQString::fromLatin1("enabled")
     << TQString::fromLatin1("value");
-  _map.insert(TQString::fromLatin1(TQSLIDER_OBJECT_NAME_STRING), l);
+  _map.insert(TQString::fromLatin1("TQSlider"), l);
 
   // TQSpinBox
   l.clear();
   l << TQString::fromLatin1("enabled")
     << TQString::fromLatin1("value");
-  _map.insert(TQString::fromLatin1(TQSPINBOX_OBJECT_NAME_STRING), l);
+  _map.insert(TQString::fromLatin1("TQSpinBox"), l);
 }
diff --git a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h
index 6d9bfd7..6ac3349 100644
--- a/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h
+++ b/kregexpeditor/KWidgetStreamer/kwidgetstreamer.h
@@ -37,7 +37,7 @@
    <pre>
    KWidgetStreamer streamer;
    KWidgetStreamer::PropertyMap& map = streamer.propertyMap();
-   KWidgetStreamer::PropertyList& list = *map.find(TQLCDNUMBER_OBJECT_NAME_STRING);
+   KWidgetStreamer::PropertyList& list = *map.find("TQLCDNumber");
    list.remove("numDigits");
    </pre>
 **/