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>

17 files changed, 51 insertions, 51 deletions

diff --git a/parts/filecreate/file-templates/ui b/parts/filecreate/file-templates/ui
index 670a758b..5f42faf0 100644
--- a/parts/filecreate/file-templates/ui
+++ b/parts/filecreate/file-templates/ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class=TQWIDGET_OBJECT_NAME_STRING>
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
diff --git a/parts/filecreate/file-templates/ui-confdialog b/parts/filecreate/file-templates/ui-confdialog
index ff2dd7f4..5429e04f 100644
--- a/parts/filecreate/file-templates/ui-confdialog
+++ b/parts/filecreate/file-templates/ui-confdialog
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog1</class>
-<widget class=TQDIALOG_OBJECT_NAME_STRING>
+<widget class="TQDialog">
     <property name="name">
         <cstring>MyDialog1</cstring>
     </property>
@@ -28,7 +28,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class=TQLISTBOX_OBJECT_NAME_STRING row="0" column="0">
+        <widget class="TQListBox" row="0" column="0">
             <item>
                 <property name="text">
                     <string>New Item</string>
@@ -46,11 +46,11 @@
                 </sizepolicy>
             </property>
         </widget>
-        <widget class=TQTABWIDGET_OBJECT_NAME_STRING row="0" column="1">
+        <widget class="TQTabWidget" row="0" column="1">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class=TQWIDGET_OBJECT_NAME_STRING>
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget2</cstring>
                 </property>
@@ -58,7 +58,7 @@
                     <string>Tab</string>
                 </attribute>
             </widget>
-            <widget class=TQWIDGET_OBJECT_NAME_STRING>
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget3</cstring>
                 </property>
@@ -67,7 +67,7 @@
                 </attribute>
             </widget>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -81,7 +81,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -112,7 +112,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -126,7 +126,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/parts/filecreate/file-templates/ui-dialog b/parts/filecreate/file-templates/ui-dialog
index 92e9bfff..16eb3a67 100644
--- a/parts/filecreate/file-templates/ui-dialog
+++ b/parts/filecreate/file-templates/ui-dialog
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class=TQDIALOG_OBJECT_NAME_STRING>
+<widget class="TQDialog">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
diff --git a/parts/filecreate/file-templates/ui-dialog-qt4 b/parts/filecreate/file-templates/ui-dialog-qt4
index b2096e86..876a7527 100644
--- a/parts/filecreate/file-templates/ui-dialog-qt4
+++ b/parts/filecreate/file-templates/ui-dialog-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>Dialog</class>
- <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" >
+ <widget class="TQDialog" name="Dialog" >
   <property name="geometry" >
    <rect>
     <x>0</x>
diff --git a/parts/filecreate/file-templates/ui-dialogb b/parts/filecreate/file-templates/ui-dialogb
index c29cbd15..f771fe9a 100644
--- a/parts/filecreate/file-templates/ui-dialogb
+++ b/parts/filecreate/file-templates/ui-dialogb
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog1</class>
-<widget class=TQDIALOG_OBJECT_NAME_STRING>
+<widget class="TQDialog">
     <property name="name">
         <cstring>MyDialog1</cstring>
     </property>
@@ -18,7 +18,7 @@
     <property name="sizeGripEnabled">
         <bool>true</bool>
     </property>
-    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
+    <widget class="TQLayoutWidget">
         <property name="name">
             <cstring>Layout1</cstring>
         </property>
@@ -40,7 +40,7 @@
             <property name="spacing">
                 <number>6</number>
             </property>
-            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonHelp</cstring>
                 </property>
@@ -71,7 +71,7 @@
                     </size>
                 </property>
             </spacer>
-            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonOk</cstring>
                 </property>
@@ -85,7 +85,7 @@
                     <bool>true</bool>
                 </property>
             </widget>
-            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonCancel</cstring>
                 </property>
diff --git a/parts/filecreate/file-templates/ui-dialogb-qt4 b/parts/filecreate/file-templates/ui-dialogb-qt4
index 33167acc..a0717aa7 100644
--- a/parts/filecreate/file-templates/ui-dialogb-qt4
+++ b/parts/filecreate/file-templates/ui-dialogb-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>Dialog</class>
- <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" >
+ <widget class="TQDialog" name="Dialog" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -15,7 +15,7 @@
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
-  <widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" >
+  <widget class="TQWidget" name="layoutWidget" >
    <property name="geometry" >
     <rect>
      <x>20</x>
@@ -24,7 +24,7 @@
      <height>33</height>
     </rect>
    </property>
-   <layout class=TQHBOXLAYOUT_OBJECT_NAME_STRING >
+   <layout class="TQHBoxLayout" >
     <property name="margin" >
      <number>0</number>
     </property>
@@ -45,14 +45,14 @@
      </spacer>
     </item>
     <item>
-     <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="okButton" >
+     <widget class="TQPushButton" name="okButton" >
       <property name="text" >
        <string>OK</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="cancelButton" >
+     <widget class="TQPushButton" name="cancelButton" >
       <property name="text" >
        <string>Cancel</string>
       </property>
diff --git a/parts/filecreate/file-templates/ui-dialogr b/parts/filecreate/file-templates/ui-dialogr
index 884f8c22..bc0e217b 100644
--- a/parts/filecreate/file-templates/ui-dialogr
+++ b/parts/filecreate/file-templates/ui-dialogr
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog1</class>
-<widget class=TQDIALOG_OBJECT_NAME_STRING>
+<widget class="TQDialog">
     <property name="name">
         <cstring>MyDialog1</cstring>
     </property>
@@ -18,7 +18,7 @@
     <property name="sizeGripEnabled">
         <bool>true</bool>
     </property>
-    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
+    <widget class="TQLayoutWidget">
         <property name="name">
             <cstring>Layout5</cstring>
         </property>
@@ -40,7 +40,7 @@
             <property name="spacing">
                 <number>6</number>
             </property>
-            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonOk</cstring>
                 </property>
@@ -54,7 +54,7 @@
                     <bool>true</bool>
                 </property>
             </widget>
-            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonCancel</cstring>
                 </property>
@@ -65,7 +65,7 @@
                     <bool>true</bool>
                 </property>
             </widget>
-            <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+            <widget class="TQPushButton">
                 <property name="name">
                     <cstring>buttonHelp</cstring>
                 </property>
diff --git a/parts/filecreate/file-templates/ui-dialogr-qt4 b/parts/filecreate/file-templates/ui-dialogr-qt4
index d047e11c..b3547907 100644
--- a/parts/filecreate/file-templates/ui-dialogr-qt4
+++ b/parts/filecreate/file-templates/ui-dialogr-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>Dialog</class>
- <widget class=TQDIALOG_OBJECT_NAME_STRING name="Dialog" >
+ <widget class="TQDialog" name="Dialog" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -15,7 +15,7 @@
   <property name="windowTitle" >
    <string>Dialog</string>
   </property>
-  <widget class=TQWIDGET_OBJECT_NAME_STRING name="layoutWidget" >
+  <widget class="TQWidget" name="layoutWidget" >
    <property name="geometry" >
     <rect>
      <x>300</x>
@@ -24,7 +24,7 @@
      <height>106</height>
     </rect>
    </property>
-   <layout class=TQVBOXLAYOUT_OBJECT_NAME_STRING >
+   <layout class="TQVBoxLayout" >
     <property name="margin" >
      <number>0</number>
     </property>
@@ -32,14 +32,14 @@
      <number>6</number>
     </property>
     <item>
-     <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="okButton" >
+     <widget class="TQPushButton" name="okButton" >
       <property name="text" >
        <string>OK</string>
       </property>
      </widget>
     </item>
     <item>
-     <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING name="cancelButton" >
+     <widget class="TQPushButton" name="cancelButton" >
       <property name="text" >
        <string>Cancel</string>
       </property>
diff --git a/parts/filecreate/file-templates/ui-mainwin b/parts/filecreate/file-templates/ui-mainwin
index d8eff427..5ce4dec8 100644
--- a/parts/filecreate/file-templates/ui-mainwin
+++ b/parts/filecreate/file-templates/ui-mainwin
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class=TQMAINWINDOW_OBJECT_NAME_STRING>
+<widget class="TQMainWindow">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
diff --git a/parts/filecreate/file-templates/ui-mainwin-qt4 b/parts/filecreate/file-templates/ui-mainwin-qt4
index a444cfa3..9d4dbd5d 100644
--- a/parts/filecreate/file-templates/ui-mainwin-qt4
+++ b/parts/filecreate/file-templates/ui-mainwin-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>MainWindow</class>
- <widget class=TQMAINWINDOW_OBJECT_NAME_STRING name="MainWindow" >
+ <widget class="TQMainWindow" name="MainWindow" >
   <property name="geometry" >
    <rect>
     <x>0</x>
@@ -15,8 +15,8 @@
   <property name="windowTitle" >
    <string>MainWindow</string>
   </property>
-  <widget class=TQWIDGET_OBJECT_NAME_STRING name="centralwidget" />
-  <widget class=TQMENUBAR_OBJECT_NAME_STRING name="menubar" >
+  <widget class="TQWidget" name="centralwidget" />
+  <widget class="TQMenuBar" name="menubar" >
    <property name="geometry" >
     <rect>
      <x>0</x>
diff --git a/parts/filecreate/file-templates/ui-tabdialog b/parts/filecreate/file-templates/ui-tabdialog
index 4be4f92e..c87b78fb 100644
--- a/parts/filecreate/file-templates/ui-tabdialog
+++ b/parts/filecreate/file-templates/ui-tabdialog
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>MyDialog1</class>
-<widget class=TQDIALOG_OBJECT_NAME_STRING>
+<widget class="TQDialog">
     <property name="name">
         <cstring>MyDialog1</cstring>
     </property>
@@ -28,11 +28,11 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class=TQTABWIDGET_OBJECT_NAME_STRING>
+        <widget class="TQTabWidget">
             <property name="name">
                 <cstring>tabWidget</cstring>
             </property>
-            <widget class=TQWIDGET_OBJECT_NAME_STRING>
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget8</cstring>
                 </property>
@@ -40,7 +40,7 @@
                     <string>Tab</string>
                 </attribute>
             </widget>
-            <widget class=TQWIDGET_OBJECT_NAME_STRING>
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>Widget9</cstring>
                 </property>
@@ -49,7 +49,7 @@
                 </attribute>
             </widget>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
+        <widget class="TQLayoutWidget">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -63,7 +63,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonHelp</cstring>
                     </property>
@@ -94,7 +94,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -108,7 +108,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class=TQPUSHBUTTON_OBJECT_NAME_STRING>
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/parts/filecreate/file-templates/ui-widget b/parts/filecreate/file-templates/ui-widget
index 670a758b..5f42faf0 100644
--- a/parts/filecreate/file-templates/ui-widget
+++ b/parts/filecreate/file-templates/ui-widget
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class=TQWIDGET_OBJECT_NAME_STRING>
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
diff --git a/parts/filecreate/file-templates/ui-widget-qt4 b/parts/filecreate/file-templates/ui-widget-qt4
index d8b6e63c..6e11cf33 100644
--- a/parts/filecreate/file-templates/ui-widget-qt4
+++ b/parts/filecreate/file-templates/ui-widget-qt4
@@ -3,7 +3,7 @@
  <comment></comment>
  <exportmacro></exportmacro>
  <class>Form</class>
- <widget class=TQWIDGET_OBJECT_NAME_STRING name="Form" >
+ <widget class="TQWidget" name="Form" >
   <property name="geometry" >
    <rect>
     <x>0</x>
diff --git a/parts/filecreate/file-templates/ui-wizard b/parts/filecreate/file-templates/ui-wizard
index b942afb2..5fbb675a 100644
--- a/parts/filecreate/file-templates/ui-wizard
+++ b/parts/filecreate/file-templates/ui-wizard
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.1" stdsetdef="1">
 <class>Form1</class>
-<widget class=TQWIZARD_OBJECT_NAME_STRING>
+<widget class="TQWizard">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -15,7 +15,7 @@
     <property name="caption">
         <string>Form1</string>
     </property>
-    <widget class=TQWIDGET_OBJECT_NAME_STRING>
+    <widget class="TQWidget">
         <property name="name">
             <cstring>page</cstring>
         </property>
diff --git a/parts/fileselector/tdeactionselector.cpp b/parts/fileselector/tdeactionselector.cpp
index 1c639477..283731c2 100644
--- a/parts/fileselector/tdeactionselector.cpp
+++ b/parts/fileselector/tdeactionselector.cpp
@@ -391,7 +391,7 @@ bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e )
       }
       return true;
     }
-    else if ( o->inherits( TQLISTBOX_OBJECT_NAME_STRING ) )
+    else if ( o->inherits( "TQListBox" ) )
     {
       switch ( ((TQKeyEvent*)e)->key() )
       {
diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp
index 7c21cab2..5bb04afe 100644
--- a/parts/konsole/konsoleviewwidget.cpp
+++ b/parts/konsole/konsoleviewwidget.cpp
@@ -62,7 +62,7 @@ void KonsoleViewWidget::activate()
     setFocusProxy(part->widget());
     part->widget()->setFocus();
 
-    if (part->widget()->inherits(TQFRAME_OBJECT_NAME_STRING))
+    if (part->widget()->inherits("TQFrame"))
         ((TQFrame*)part->widget())->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
 
     vbox->addWidget(part->widget());
diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp
index 76e4fc50..baf05bb2 100644
--- a/parts/partexplorer/partexplorerform.cpp
+++ b/parts/partexplorer/partexplorerform.cpp
@@ -212,7 +212,7 @@ void PartExplorerForm::fillServiceList( const TDETrader::OfferList &services )
             TQVariant property = service->property( propertyName );
             TQString propertyType = property.typeName();
             TQString propertyValue;
-            if (propertyType == TQSTRINGLIST_OBJECT_NAME_STRING) {
+            if (propertyType == "TQStringList") {
                 propertyValue = property.toStringList().join(", ");
             }
             else {