TQt4 port kdewebdev

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 61 insertions, 61 deletions

diff --git a/kommander/examples/current/a1.kmdr b/kommander/examples/current/a1.kmdr
index e8b99ac3..7399bc73 100755
--- a/kommander/examples/current/a1.kmdr
+++ b/kommander/examples/current/a1.kmdr
@@ -49,7 +49,7 @@ debug("pid="+pid)</string>
                 <cstring>StatusBar8</cstring>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="3" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout37</cstring>
             </property>
@@ -121,7 +121,7 @@ debug("pid="+pid)</string>
                 <string>and again</string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="4" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout83</cstring>
             </property>
@@ -145,7 +145,7 @@ debug("pid="+pid)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>0</height>
@@ -176,7 +176,7 @@ StatusBar8.setText("Returned: "+b)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>46</width>
                             <height>0</height>
@@ -185,7 +185,7 @@ StatusBar8.setText("Returned: "+b)</string>
                 </spacer>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout84</cstring>
             </property>
@@ -209,7 +209,7 @@ StatusBar8.setText("Returned: "+b)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>80</width>
                             <height>0</height>
@@ -243,7 +243,7 @@ StatusBar8.setText("Returned: "+b)</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>60</width>
                             <height>0</height>
@@ -254,5 +254,5 @@ StatusBar8.setText("Returned: "+b)</string>
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/b1.kmdr b/kommander/examples/current/b1.kmdr
index 09725243..bc02ab80 100755
--- a/kommander/examples/current/b1.kmdr
+++ b/kommander/examples/current/b1.kmdr
@@ -26,7 +26,7 @@ else
   StatusBar9.insertItem("ARG1="+_ARG1, 1)
   StatusBar9.insertItem("ARG2="+_ARG2, 2)
 endif
-//message_info(parentPid)</string>
+//message_info(tqparentPid)</string>
             <string></string>
         </stringlist>
     </property>
@@ -82,7 +82,7 @@ endif
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>111</width>
                     <height>0</height>
@@ -104,7 +104,7 @@ endif
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>50</width>
                     <height>0</height>
@@ -120,8 +120,8 @@ endif
             </property>
             <property name="associations" stdset="0">
                 <stringlist>
-                    <string>//message_info("parentPid = "+parentPid+"\npid = "+pid)
-dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello")
+                    <string>//message_info("tqparentPid = "+tqparentPid+"\npid = "+pid)
+dcop("kmdr-executor-"+tqparentPid, "KommanderIf", "setText(QString,QString)", "StatusBar8", "Hello")
 </string>
                 </stringlist>
             </property>
@@ -131,5 +131,5 @@ dcop("kmdr-executor-"+parentPid, "KommanderIf", "setText(QString,QString)", "Sta
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/editor-poc.kmdr b/kommander/examples/current/editor-poc.kmdr
index d9b14fd1..6a084397 100755
--- a/kommander/examples/current/editor-poc.kmdr
+++ b/kommander/examples/current/editor-poc.kmdr
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>KEdemo</class>
-<widget class="QMainWindow">
+<widget class=TQMAINWINDOW_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>KEdemo</cstring>
     </property>
@@ -73,7 +73,7 @@ _file["dirty"] = true</string>
             </property>
             <property name="associations" stdset="0">
                 <stringlist>
-                    <string>@Input.text("Kommander Edit", "Text to find", "")</string>
+                    <string>@Input.text("Kommander Edit", "Text to tqfind", "")</string>
                 </stringlist>
             </property>
         </widget>
@@ -179,16 +179,16 @@ while chrs &lt; maxc do
   //debug("link test = "+str_mid(a, ch, 2)+" pos="+ch)
   if str_mid(a, ch, 2) == "&lt;a" then
     inlink = true
-    lb = str_toint(str_find(a, "\"", ch)+1)
-    le = str_toint(str_find(a, "\"", lb))
+    lb = str_toint(str_tqfind(a, "\"", ch)+1)
+    le = str_toint(str_tqfind(a, "\"", lb))
     linkscript = str_mid(a, lb, le-lb)
     //debug("link data - "+lb+" "+le+" "+linkscript)
   elseif str_mid(a, ch, 3) == "&lt;p&gt;" then
     lc = lc + 1
     cc = 0
   endif
-  ck1 = str_toint(str_find(a, "&gt;", ch))+1
-  ck2 = str_find(a, "&lt;", ck1)
+  ck1 = str_toint(str_tqfind(a, "&gt;", ch))+1
+  ck2 = str_tqfind(a, "&lt;", ck1)
   if ck1 == -1 || ck2 == -1 then
     break
   endif
@@ -303,9 +303,9 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1))
         &lt;stringlist&gt;
             &lt;string&gt;&lt;/string&gt;
             &lt;string&gt;@Array.setValue(help, "Proof of concept", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Kommander MainWindow frames!&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As Kommander took on functionality an attempt was made to make a MainWindow Kommander widget. Sadly it was a huge time loss for two developers who both gave up after days of trying. The problem was with the editor. However you can use a Qt Designer generated UI file renamed to a *.kmdr file. Into this frame you can place your widgets and make a working application where nearly everything works.&amp;lt;/p&amp;gt;")
-@Array.setValue(help, "Known limitations", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Known limitations&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are signals for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and KActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &amp;lt;/p&amp;gt;")
+@Array.setValue(help, "Known limitations", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Known limitations&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;As of this writing what is known not to work on the Kommander side is the settings read and write. There is no Initialize or Destroy section as there is no Kommander Text, however there are Q_SIGNALS for this on the window, so the functionality is intact. On the MainWindow side it is not possible to talk to any Actions as these are QActions from Designer and KActions are not derived from QActions in KDE 3x. This means a DCOP call to list actions or set states will not work. It is also not possible to talk to the Statusbar. Also submenus on the menubar and dropdown actions on the Toolbar will not work. Given that this is an unsupported use of Kommander it everything that does work makes it suitable for probably most small application uses.. &amp;lt;/p&amp;gt;")
 @Array.setValue(help, "Rolling your own", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Rolling your own&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;It is our intention to have a template in the 1.3 release of a MainWindow, but if you have Qt Designer for Qt 3x you can easily start a window design, save it, rename to *.kmdr and open in Kommander. Remember not to add widgets in Designer as Kommander will not recognize them.&amp;lt;/p&amp;gt;")
-@Array.setValue(help, "Using Actions", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Using Actions&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with signals and slots. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&amp;lt;/p&amp;gt;
+@Array.setValue(help, "Using Actions", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Using Actions&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;If you want to get the goodies, menus, toolbars and accelerator keys, you need to use actions. Kommander has an Action editor on the window menu under Views. There you can add actions and there is a shortcut to connecting them with Q_SIGNALS and Q_SLOTS. To get everything working select an Action and look in the properties menu for settings like name, text and icon. For menus and toolbars try right clicking on them for context menus. Now from the Action View drag an Action to the menu or toolbar. See the visual feedback? Just connect your Action to a script and you have three different ways to call it.&amp;lt;/p&amp;gt;
 ")
 @Array.setValue(help, "Link examples", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;Link examples&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;This demo shows examples of linking. Links will show in the TextEdit widget, but they don't do anything. In the TextBrowser they open web pages and email links, but of course you can't edit in the TextBrowser. If you don't mind writing some script you can set up your own link handling, which I've done here. Note that it will follow links anywhere in the editor. If the link is a widget name it assumes it to be a script and calls it. If not it looks to see if it is a web link and calls that&amp;lt;/p&amp;gt;&amp;lt;p&amp;gt;It would be easy to extend this script to accept link parameters and process emails. You could also make a reference to other text objects, tab widget tabs, pretty much anything you can think of.&amp;lt;/p&amp;gt;")
 @Array.setValue(help, "How this help works", "&amp;lt;center&amp;gt;&amp;lt;h2&amp;gt;How this help works&amp;lt;/h2&amp;gt;&amp;lt;/center&amp;gt;&amp;lt;p&amp;gt;Do you wonder where this help came from? It is possible to use KDE help if you write DocBook, make it and install it. This quick help is fast and can contain &amp;lt;i&amp;gt;rich text&amp;lt;/i&amp;gt;. To look at the dialog copy the text in the hidden TextEdit (set to text mode so as not to muck things up with rich text interperting XML) and paste it to a text editor like KWrite. Save it as a Kommander file and open it in the Kommander Editor.&amp;lt;/p&amp;gt;")
@@ -331,7 +331,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1))
         &lt;property name="spacing"&gt;
             &lt;number&gt;6&lt;/number&gt;
         &lt;/property&gt;
-        &lt;widget class="QSplitter" row="0" column="0" rowspan="2" colspan="2"&gt;
+        &lt;widget class=TQSPLITTER_OBJECT_NAME_STRING row="0" column="0" rowspan="2" colspan="2"&gt;
             &lt;property name="name"&gt;
                 &lt;cstring&gt;Splitter5&lt;/cstring&gt;
             &lt;/property&gt;
@@ -428,7 +428,7 @@ debug("Clicked at: "+Self.Item(0)+" "+Self.Item(1))
         &lt;slot&gt;execute()&lt;/slot&gt;
     &lt;/connection&gt;
 &lt;/connections&gt;
-&lt;layoutdefaults spacing="6" margin="11"/&gt;
+&lt;tqlayoutdefaults spacing="6" margin="11"/&gt;
 &lt;/UI&gt;
 </string>
             </property>
@@ -1064,5 +1064,5 @@ TextEdit5.setColor(color)</string>
         <slot>setChecked(bool)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/keyvaluecombo.kmdr b/kommander/examples/current/keyvaluecombo.kmdr
index 9815c333..b4a35126 100644
--- a/kommander/examples/current/keyvaluecombo.kmdr
+++ b/kommander/examples/current/keyvaluecombo.kmdr
@@ -63,7 +63,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout27</cstring>
             </property>
@@ -100,7 +100,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
             <property name="name">
                 <cstring>Layout30</cstring>
             </property>
@@ -122,7 +122,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
                         <string>Right click for menu</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="2">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="2">
                     <property name="name">
                         <cstring>Layout24</cstring>
                     </property>
@@ -164,7 +164,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="0" column="0">
                     <property name="name">
                         <cstring>Layout23</cstring>
                     </property>
@@ -227,7 +227,7 @@ PopupMenu1.insertMenuItem("Help About", "PopupMenu1", 10)
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="2" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="2" column="0">
             <property name="name">
                 <cstring>Layout31</cstring>
             </property>
@@ -384,5 +384,5 @@ endif</string>
     <tabstop>ComboBox10</tabstop>
     <tabstop>ListBox1</tabstop>
 </tabstops>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/kpartmwframe.kmdr b/kommander/examples/current/kpartmwframe.kmdr
index 134f28af..6e334aa6 100755
--- a/kommander/examples/current/kpartmwframe.kmdr
+++ b/kommander/examples/current/kpartmwframe.kmdr
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.0" stdsetdef="1">
 <class>KKPdemo</class>
-<widget class="QMainWindow">
+<widget class=TQMAINWINDOW_OBJECT_NAME_STRING>
     <property name="name">
         <cstring>KKPdemo</cstring>
     </property>
@@ -58,7 +58,7 @@
                         </sizepolicy>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget" row="1" column="0">
+                <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
                     <property name="name">
                         <cstring>Layout5</cstring>
                     </property>
@@ -95,7 +95,7 @@ _loadup = 2
                                 <stringlist>
                                     <string>#!kommander
 if widgetExists("ScriptObject13") then
-  TextBrowser1.setText("This text was written by a script on the parent frame window. It could have been a dialog, but we chose to illustrate with a MainWindow for this demo.")
+  TextBrowser1.setText("This text was written by a script on the tqparent frame window. It could have been a dialog, but we chose to illustrate with a MainWindow for this demo.")
   ScriptObject13.execute
 else
   message_error("You do not have the KPart child dialog loaded")
@@ -614,5 +614,5 @@ endif</string>
         <slot>execute()</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/kpartpart.kmdr b/kommander/examples/current/kpartpart.kmdr
index 928ecdc6..0763fada 100755
--- a/kommander/examples/current/kpartpart.kmdr
+++ b/kommander/examples/current/kpartpart.kmdr
@@ -42,16 +42,16 @@
             </property>
             <property name="text">
                 <string>You can click the test button to insert text
-If you are loaded in the parent frame you can click the rocket icon on the toolbar or use the function menu to select "Talk to KPart". 
+If you are loaded in the tqparent frame you can click the rocket icon on the toolbar or use the function menu to select "Talk to KPart". 
 
-Any Kommander program can be run as a KPart. You need the KPart plugin to load KParts. Note that running Kommander programs as KParts is not without risks. For one thing you loose DCOP in the parent and the old parser ceases to work. Additionally since all widgets are accecssible from the parent and duplicate widget name can cause a Kommander lock up. 
+Any Kommander program can be run as a KPart. You need the KPart plugin to load KParts. Note that running Kommander programs as KParts is not without risks. For one thing you loose DCOP in the tqparent and the old parser ceases to work. Additionally since all widgets are accecssible from the tqparent and duplicate widget name can cause a Kommander lock up. 
 
-Because of all this and the fact that the Actions on the unsupported MainWindow are incompatible it is impossible for the child to talk with the parent. On this dialog we use a timer on the parent polling the child for requests every 100 ms. It's a crude hack but it does yield acceptable behavior. 
+Because of all this and the fact that the Actions on the unsupported MainWindow are incompatible it is impossible for the child to talk with the tqparent. On this dialog we use a timer on the tqparent polling the child for requests every 100 ms. It's a crude hack but it does yield acceptable behavior. 
 
 This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string>
             </property>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0">
             <property name="name">
                 <cstring>Layout70</cstring>
             </property>
@@ -75,7 +75,7 @@ This demo is intended to run both kpartwmframe.kmdr and kpartpart.kmdr. </string
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>75</width>
                             <height>0</height>
@@ -97,7 +97,7 @@ endif
 if _LOADED == true then
   kpmessage.setText("You have mail")
 else
-  message_info("this only works when loaded as a KPart in it's parent window")
+  message_info("this only works when loaded as a KPart in it's tqparent window")
 endif
 </string>
                         </stringlist>
@@ -122,7 +122,7 @@ endif
                     </property>
                     <property name="associations" stdset="0">
                         <stringlist>
-                            <string>message_info("We just got a message from our parent frame!", "Parent called Child")</string>
+                            <string>message_info("We just got a message from our tqparent frame!", "Parent called Child")</string>
                         </stringlist>
                     </property>
                 </widget>
@@ -156,7 +156,7 @@ endif
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>0</height>
@@ -167,5 +167,5 @@ endif
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/passvariables.kmdr b/kommander/examples/current/passvariables.kmdr
index 2d3b9e03..95270a83 100644
--- a/kommander/examples/current/passvariables.kmdr
+++ b/kommander/examples/current/passvariables.kmdr
@@ -90,7 +90,7 @@ LineEdit6.setText(ret)</string>
             <property name="text">
                 <string>Set</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -101,7 +101,7 @@ LineEdit6.setText(ret)</string>
             <property name="text">
                 <string>Pass back</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -124,7 +124,7 @@ LineEdit6.setText(ret)</string>
                 <stringlist>
                     <string>// test for PHP
 pt = exec("php --version")
-if str_contains(pt, "Zend") then
+if str_tqcontains(pt, "Zend") then
   php = ScriptObjectPHP.execute(LineEdit7.text,LineEdit1.text,LineEdit2.text)
   LineEdit4.setText(php)
 else
@@ -140,7 +140,7 @@ endif</string>
             <property name="text">
                 <string>Pass back</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -151,7 +151,7 @@ endif</string>
             <property name="text">
                 <string>Set with @</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -162,7 +162,7 @@ endif</string>
             <property name="text">
                 <string>Return</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -178,7 +178,7 @@ endif</string>
             <property name="text">
                 <string>Return</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -272,14 +272,14 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>108</width>
                     <height>0</height>
                 </size>
             </property>
         </spacer>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="7">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="7">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -303,7 +303,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>71</width>
                             <height>0</height>
@@ -368,7 +368,7 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>71</width>
                             <height>0</height>
@@ -412,5 +412,5 @@ echo round(@Self.Item(1)/@Self.Item(2),5)
         <slot>popup(int,int)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/kommander/examples/current/tableselect.kmdr b/kommander/examples/current/tableselect.kmdr
index 09dd6cd8..a8617103 100755
--- a/kommander/examples/current/tableselect.kmdr
+++ b/kommander/examples/current/tableselect.kmdr
@@ -51,7 +51,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string>
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QLayoutWidget" row="1" column="3" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="3" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout2</cstring>
             </property>
@@ -99,7 +99,7 @@ AboutDialog9.setBugAddress("eric@kdewebdev.org")</string>
                 </widget>
             </grid>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+        <widget class=TQLAYOUTWIDGET_OBJECT_NAME_STRING row="1" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>Layout1</cstring>
             </property>
@@ -348,7 +348,7 @@ TextBrowser1.setText(result)
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>24</width>
                     <height>24</height>
@@ -407,7 +407,7 @@ end
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>24</width>
                     <height>24</height>
@@ -498,5 +498,5 @@ end
         <slot>popup(int,int)</slot>
     </connection>
 </connections>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>