Rename *OBJECT_NAME_STRING

Signed-off-by: ormorph <roma251078@mail.ru>
(cherry picked from commit ae3ed3d32920f5780af51aad9683b82179e9655d)

15 files changed, 35 insertions, 35 deletions

diff --git a/kommander/examples/tutorial/append.kmdr b/kommander/examples/tutorial/append.kmdr
index d9c07451..b30c318c 100644
--- a/kommander/examples/tutorial/append.kmdr
+++ b/kommander/examples/tutorial/append.kmdr
@@ -40,7 +40,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
diff --git a/kommander/examples/tutorial/arrays.kmdr b/kommander/examples/tutorial/arrays.kmdr
index d0ae1d5e..b4a0ec5d 100644
--- a/kommander/examples/tutorial/arrays.kmdr
+++ b/kommander/examples/tutorial/arrays.kmdr
@@ -36,7 +36,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>TextLabel2</cstring>
             </property>
@@ -93,7 +93,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0">
+        <widget class="TQLayoutWidget" row="3" column="0">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
diff --git a/kommander/examples/tutorial/calc.kmdr b/kommander/examples/tutorial/calc.kmdr
index cfe7233f..3308b2e3 100644
--- a/kommander/examples/tutorial/calc.kmdr
+++ b/kommander/examples/tutorial/calc.kmdr
@@ -32,7 +32,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
                 <cstring>Layout7</cstring>
             </property>
@@ -46,7 +46,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQLABEL_OBJECT_NAME_STRING>
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -124,7 +124,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout4</cstring>
             </property>
@@ -138,7 +138,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQLABEL_OBJECT_NAME_STRING row="2" column="0">
+                <widget class="TQLabel" row="2" column="0">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -146,7 +146,7 @@
                         <string>Expression:</string>
                     </property>
                 </widget>
-                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0">
+                <widget class="TQLayoutWidget" row="4" column="0">
                     <property name="name">
                         <cstring>Layout1</cstring>
                     </property>
diff --git a/kommander/examples/tutorial/dcop.kmdr b/kommander/examples/tutorial/dcop.kmdr
index a4fe69fc..0d591cf5 100644
--- a/kommander/examples/tutorial/dcop.kmdr
+++ b/kommander/examples/tutorial/dcop.kmdr
@@ -35,7 +35,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
diff --git a/kommander/examples/tutorial/dialogs.kmdr b/kommander/examples/tutorial/dialogs.kmdr
index cb3c81e2..fd5b678f 100644
--- a/kommander/examples/tutorial/dialogs.kmdr
+++ b/kommander/examples/tutorial/dialogs.kmdr
@@ -85,7 +85,7 @@ ListBox1.setText(a)
                 </stringlist>
             </property>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
diff --git a/kommander/examples/tutorial/globals.kmdr b/kommander/examples/tutorial/globals.kmdr
index 33d5dd40..d4d92d89 100644
--- a/kommander/examples/tutorial/globals.kmdr
+++ b/kommander/examples/tutorial/globals.kmdr
@@ -32,7 +32,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
diff --git a/kommander/examples/tutorial/initialize.kmdr b/kommander/examples/tutorial/initialize.kmdr
index 9dde0bfc..96239366 100644
--- a/kommander/examples/tutorial/initialize.kmdr
+++ b/kommander/examples/tutorial/initialize.kmdr
@@ -35,7 +35,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -98,7 +98,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
                 </spacer>
             </hbox>
         </widget>
-        <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>OpenLabel</cstring>
             </property>
@@ -106,7 +106,7 @@ dcop @dcopid KommanderIf changeWidgetText CloseLabel "$CLOSE"
                 <string>Opened:</string>
             </property>
         </widget>
-        <widget class=TQLABEL_OBJECT_NAME_STRING row="0" column="0">
+        <widget class="TQLabel" row="0" column="0">
             <property name="name">
                 <cstring>CloseLabel</cstring>
             </property>
diff --git a/kommander/examples/tutorial/loop.kmdr b/kommander/examples/tutorial/loop.kmdr
index a415a103..d5672338 100644
--- a/kommander/examples/tutorial/loop.kmdr
+++ b/kommander/examples/tutorial/loop.kmdr
@@ -79,7 +79,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="1">
+        <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -93,7 +93,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQLABEL_OBJECT_NAME_STRING>
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
diff --git a/kommander/examples/tutorial/picview.kmdr b/kommander/examples/tutorial/picview.kmdr
index c01a10e9..1617b53d 100644
--- a/kommander/examples/tutorial/picview.kmdr
+++ b/kommander/examples/tutorial/picview.kmdr
@@ -52,7 +52,7 @@
                 <enum>Directory</enum>
             </property>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
diff --git a/kommander/examples/tutorial/settings.kmdr b/kommander/examples/tutorial/settings.kmdr
index f4aaa0b1..d59d1bcf 100644
--- a/kommander/examples/tutorial/settings.kmdr
+++ b/kommander/examples/tutorial/settings.kmdr
@@ -32,7 +32,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -46,7 +46,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQLABEL_OBJECT_NAME_STRING>
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -69,7 +69,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout5</cstring>
             </property>
diff --git a/kommander/examples/tutorial/slots.kmdr b/kommander/examples/tutorial/slots.kmdr
index 6bbf7d5f..d4f2b524 100644
--- a/kommander/examples/tutorial/slots.kmdr
+++ b/kommander/examples/tutorial/slots.kmdr
@@ -30,7 +30,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -44,7 +44,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQLABEL_OBJECT_NAME_STRING>
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -68,7 +68,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -82,7 +82,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQLABEL_OBJECT_NAME_STRING>
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel2</cstring>
                     </property>
@@ -105,7 +105,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
diff --git a/kommander/examples/tutorial/strings.kmdr b/kommander/examples/tutorial/strings.kmdr
index 0b4af608..53f3908f 100644
--- a/kommander/examples/tutorial/strings.kmdr
+++ b/kommander/examples/tutorial/strings.kmdr
@@ -81,7 +81,7 @@ fi
                 </stringlist>
             </property>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -95,7 +95,7 @@ fi
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQLABEL_OBJECT_NAME_STRING>
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -121,7 +121,7 @@ fi
                 </widget>
             </hbox>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0">
+        <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
diff --git a/kommander/examples/tutorial/table.kmdr b/kommander/examples/tutorial/table.kmdr
index ff8982d4..8b219269 100644
--- a/kommander/examples/tutorial/table.kmdr
+++ b/kommander/examples/tutorial/table.kmdr
@@ -77,7 +77,7 @@
             </stringlist>
         </property>
     </widget>
-    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
+    <widget class="TQLayoutWidget">
         <property name="name">
             <cstring>Layout3</cstring>
         </property>
@@ -170,7 +170,7 @@
             </spacer>
         </vbox>
     </widget>
-    <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING>
+    <widget class="TQLayoutWidget">
         <property name="name">
             <cstring>Layout4</cstring>
         </property>
diff --git a/kommander/examples/tutorial/tree.kmdr b/kommander/examples/tutorial/tree.kmdr
index 0e5d76df..72410f79 100644
--- a/kommander/examples/tutorial/tree.kmdr
+++ b/kommander/examples/tutorial/tree.kmdr
@@ -33,7 +33,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -109,7 +109,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class=TQLABEL_OBJECT_NAME_STRING row="1" column="0">
+        <widget class="TQLabel" row="1" column="0">
             <property name="name">
                 <cstring>TextLabel1</cstring>
             </property>
@@ -130,7 +130,7 @@
                 <enum>Directory</enum>
             </property>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2">
+        <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout3</cstring>
             </property>
diff --git a/kommander/examples/tutorial/widgets.kmdr b/kommander/examples/tutorial/widgets.kmdr
index 5f283e49..03123265 100644
--- a/kommander/examples/tutorial/widgets.kmdr
+++ b/kommander/examples/tutorial/widgets.kmdr
@@ -82,7 +82,7 @@
                 </stringlist>
             </property>
         </widget>
-        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -96,7 +96,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class=TQLABEL_OBJECT_NAME_STRING>
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>