Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

42 files changed, 94 insertions, 94 deletions

diff --git a/umbrello/umbrello/dialogs/activitydialog.cpp b/umbrello/umbrello/dialogs/activitydialog.cpp
index 6449bd50..ed7f779e 100644
--- a/umbrello/umbrello/dialogs/activitydialog.cpp
+++ b/umbrello/umbrello/dialogs/activitydialog.cpp
@@ -13,7 +13,7 @@
 #include "activitydialog.h"
 
 //qt includes
-#include <layout.h>
+#include <tqlayout.h>
 
 //kde includes
 #include <kiconloader.h>
diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp
index 5b604d1d..10ccb04b 100644
--- a/umbrello/umbrello/dialogs/activitypage.cpp
+++ b/umbrello/umbrello/dialogs/activitypage.cpp
@@ -18,7 +18,7 @@
 #include <klocale.h>
 #include <kbuttonbox.h>
 #include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstringlist.h>
 
 ActivityPage::ActivityPage( TQWidget * pParent, StateWidget * pWidget ) : TQWidget( pParent ) {
@@ -37,7 +37,7 @@ void ActivityPage::setupPage() {
 
     m_pActivityGB = new TQGroupBox(i18n("Activities"), this );
 
-    // vertical box layout for the activity lists, arrow buttons and the button box
+    // vertical box tqlayout for the activity lists, arrow buttons and the button box
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pActivityGB );
     listVBoxLayout -> setMargin(margin);
     listVBoxLayout -> setSpacing ( 10 );
diff --git a/umbrello/umbrello/dialogs/assocgenpage.cpp b/umbrello/umbrello/dialogs/assocgenpage.cpp
index 089a8427..b093cae0 100644
--- a/umbrello/umbrello/dialogs/assocgenpage.cpp
+++ b/umbrello/umbrello/dialogs/assocgenpage.cpp
@@ -13,7 +13,7 @@
 #include "assocgenpage.h"
 
 // qt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <kcombobox.h>
 
 // kde includes
diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp
index 67ff8cd1..ec95f619 100644
--- a/umbrello/umbrello/dialogs/assocpage.cpp
+++ b/umbrello/umbrello/dialogs/assocpage.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include "assocpage.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include "assocpropdlg.h"
 
@@ -25,12 +25,12 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa
     m_pAssocGB = new TQGroupBox(i18n("Associations"), this);
     mainLayout -> addWidget(m_pAssocGB);
 
-    TQHBoxLayout * layout = new TQHBoxLayout(m_pAssocGB);
-    layout -> setSpacing(10);
-    layout -> setMargin(margin);
+    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pAssocGB);
+    tqlayout -> setSpacing(10);
+    tqlayout -> setMargin(margin);
 
     m_pAssocLB = new TQListBox(m_pAssocGB);
-    layout -> addWidget(m_pAssocLB);
+    tqlayout -> addWidget(m_pAssocLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/assocpropdlg.cpp b/umbrello/umbrello/dialogs/assocpropdlg.cpp
index 32bedb48..1d5b9c77 100644
--- a/umbrello/umbrello/dialogs/assocpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/assocpropdlg.cpp
@@ -13,7 +13,7 @@
 #include "assocpropdlg.h"
 
 // qt/kde includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/assocrolepage.cpp b/umbrello/umbrello/dialogs/assocrolepage.cpp
index 1d884bad..a44a5f05 100644
--- a/umbrello/umbrello/dialogs/assocrolepage.cpp
+++ b/umbrello/umbrello/dialogs/assocrolepage.cpp
@@ -13,7 +13,7 @@
 #include "assocrolepage.h"
 
 // qt includes
-#include <layout.h>
+#include <tqlayout.h>
 
 // kde includes
 #include <klocale.h>
@@ -228,7 +228,7 @@ void AssocRolePage::constructWidget() {
     // m_pDocB-> setEnabled(false);
     m_pDocB->setWordWrap(TQMultiLineEdit::WidgetWidth);
 
-    // add group boxes to main layout 
+    // add group boxes to main tqlayout 
     mainLayout -> addWidget( propsAGB, 0, 0);
     mainLayout -> addWidget( scopeABG, 1, 0);
     mainLayout -> addWidget(changeABG, 2, 0);
diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp
index a21018a2..d633b6ae 100644
--- a/umbrello/umbrello/dialogs/classgenpage.cpp
+++ b/umbrello/umbrello/dialogs/classgenpage.cpp
@@ -13,7 +13,7 @@
 #include "classgenpage.h"
 
 // qt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp
index 16039a79..a96cb645 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.cpp
+++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp
@@ -25,7 +25,7 @@
 #include <kbuttonbox.h>
 #include <kdebug.h>
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 using namespace Uml;
 
@@ -60,11 +60,11 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi
     int margin = fontMetrics().height();
     setMinimumSize(310,330);
 
-    //main layout contains our two group boxes, the list and the documentation
+    //main tqlayout contains our two group boxes, the list and the documentation
     TQVBoxLayout* mainLayout = new TQVBoxLayout( this );
     mainLayout->setSpacing(10);
 
-    //top group box, contains a vertical layout with list box above and buttons below
+    //top group box, contains a vertical tqlayout with list box above and buttons below
     m_pItemListGB = new TQGroupBox(typeName, this );
     TQVBoxLayout* listVBoxLayout = new TQVBoxLayout( m_pItemListGB );
     listVBoxLayout->setMargin(margin);
diff --git a/umbrello/umbrello/dialogs/classifierlistpage.h b/umbrello/umbrello/dialogs/classifierlistpage.h
index fb3527b2..2675fd35 100644
--- a/umbrello/umbrello/dialogs/classifierlistpage.h
+++ b/umbrello/umbrello/dialogs/classifierlistpage.h
@@ -16,7 +16,7 @@
 #include <tqwidget.h>
 #include <tqgroupbox.h>
 #include <tqlistbox.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 //kde includes
 #include <karrowbutton.h>
 
diff --git a/umbrello/umbrello/dialogs/classoptionspage.cpp b/umbrello/umbrello/dialogs/classoptionspage.cpp
index 87e8430c..670d86f1 100644
--- a/umbrello/umbrello/dialogs/classoptionspage.cpp
+++ b/umbrello/umbrello/dialogs/classoptionspage.cpp
@@ -13,7 +13,7 @@
 #include "classoptionspage.h"
 
 // qt/kde includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <kdebug.h>
 
diff --git a/umbrello/umbrello/dialogs/classoptionspage.h b/umbrello/umbrello/dialogs/classoptionspage.h
index 718944cc..e9c81525 100644
--- a/umbrello/umbrello/dialogs/classoptionspage.h
+++ b/umbrello/umbrello/dialogs/classoptionspage.h
@@ -23,7 +23,7 @@ class ClassifierWidget;
 
 /**
  * A dialog page to display options for a @ref UMLWidget and its
- * children.  This is not normally called by you.  It is used by
+ * tqchildren.  This is not normally called by you.  It is used by
  * the @ref ClassPropDlg.
  *
  * @short A dialog page to display the options for a UMLWidget.
diff --git a/umbrello/umbrello/dialogs/classpropdlg.cpp b/umbrello/umbrello/dialogs/classpropdlg.cpp
index e1da407f..169de20e 100644
--- a/umbrello/umbrello/dialogs/classpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/classpropdlg.cpp
@@ -13,7 +13,7 @@
 #include "classpropdlg.h"
 
 // qt/kde includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <kiconloader.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp
index 432bf941..33fb743b 100644
--- a/umbrello/umbrello/dialogs/codeeditor.cpp
+++ b/umbrello/umbrello/dialogs/codeeditor.cpp
@@ -26,8 +26,8 @@
 #include <tqcursor.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
-#include <brush.h>
-#include <layout.h>
+#include <tqbrush.h>
+#include <tqlayout.h>
 #include <tqregexp.h>
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/codeeditor.h b/umbrello/umbrello/dialogs/codeeditor.h
index a1186223..d5c42d1f 100644
--- a/umbrello/umbrello/dialogs/codeeditor.h
+++ b/umbrello/umbrello/dialogs/codeeditor.h
@@ -22,7 +22,7 @@
 #include <tqpopupmenu.h>
 #include <tqstring.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include "../codeviewerstate.h"
 #include "../textblocklist.h"
 
diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
index 0adc90c3..601b5385 100644
--- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui
@@ -55,7 +55,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout1</cstring>
+                            <cstring>tqlayout1</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -163,7 +163,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -180,7 +180,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>30</width>
                                                 <height>20</height>
@@ -270,7 +270,7 @@ generator wants to use as output file already exists:</string>
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout8</cstring>
+                            <cstring>tqlayout8</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -297,7 +297,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
@@ -314,7 +314,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
@@ -331,7 +331,7 @@ generator wants to use as output file already exists:</string>
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>16</width>
                                                 <height>30</height>
diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
index b64e30dc..30ab5817 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp
+++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp
@@ -159,7 +159,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
         if(!info.exists())
         {
             if (KMessageBox::questionYesNo(this,
-                                           i18n("The folder %1 does not exist. Do you want to create it now?").arg(info.filePath()),
+                                           i18n("The folder %1 does not exist. Do you want to create it now?").tqarg(info.filePath()),
                                            i18n("Output Folder Does Not Exist"), i18n("Create Folder"), i18n("Do Not Create")) == KMessageBox::Yes)
             {
                 TQDir dir;
@@ -188,7 +188,7 @@ void CodeGenerationWizard::showPage(TQWidget *page) {
             // it exits and we can write... make sure it is a directory
             if(!info.isDir())
             {
-                KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").arg(info.filePath()),
+                KMessageBox::sorry(this,i18n("%1 does not seem to be a folder. Please choose a valid folder.").tqarg(info.filePath()),
                                    i18n("Please Choose Valid Folder"));
                 return;
             }
diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
index fdd59c2c..517df16e 100644
--- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
+++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui
@@ -88,7 +88,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -146,7 +146,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Fixed</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -190,7 +190,7 @@ for in the right hand side list</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>20</height>
@@ -206,7 +206,7 @@ for in the right hand side list</string>
             <cstring>status</cstring>
         </property>
         <attribute name="title">
-            <string>Code Generation Status</string>
+            <string>Code Generation tqStatus</string>
         </attribute>
         <vbox>
             <property name="name">
@@ -231,7 +231,7 @@ for in the right hand side list</string>
                     <cstring>GroupBox2</cstring>
                 </property>
                 <property name="title">
-                    <string>Generation Status</string>
+                    <string>Generation tqStatus</string>
                 </property>
                 <vbox>
                     <property name="name">
@@ -257,7 +257,7 @@ for in the right hand side list</string>
                         </column>
                         <column>
                             <property name="text">
-                                <string>Generation Status</string>
+                                <string>Generation tqStatus</string>
                             </property>
                             <property name="clickable">
                                 <bool>true</bool>
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
index 054f84d7..3f11adb3 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp
@@ -19,7 +19,7 @@
 #include "codeviewerdialog.h"
 
 // qt/kde includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqcheckbox.h>
 #include <kdebug.h>
@@ -69,7 +69,7 @@ void CodeViewerDialog::initGUI ( const char * name) {
 
     CodeViewerDialogBaseLayout->setMargin(margin);
 
-    resize( TQSize(width, height).expandedTo(minimumSizeHint()) );
+    resize( TQSize(width, height).expandedTo(tqminimumSizeHint()) );
 
 }
 
diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.h b/umbrello/umbrello/dialogs/codeviewerdialog.h
index d8774674..eef90445 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialog.h
+++ b/umbrello/umbrello/dialogs/codeviewerdialog.h
@@ -23,7 +23,7 @@
 #include <tqmap.h>
 #include <tqptrlist.h>
 #include <tqstring.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include "../codeviewerstate.h"
 #include "codeviewerdialogbase.h"
 
diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
index 1a283200..665d6ccf 100644
--- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
+++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
index 346dc44d..ed75ea9d 100644
--- a/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
+++ b/umbrello/umbrello/dialogs/codevieweroptionsbase.ui
@@ -31,7 +31,7 @@
         </widget>
         <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
-                <cstring>colorGroupBox</cstring>
+                <cstring>tqcolorGroupBox</cstring>
             </property>
             <property name="sizePolicy">
                 <sizepolicy>
@@ -161,7 +161,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="1" column="0">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -192,7 +192,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="4">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp
index 0301ca18..34176e3a 100644
--- a/umbrello/umbrello/dialogs/diagramprintpage.cpp
+++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp
@@ -13,7 +13,7 @@
 #include "diagramprintpage.h"
 
 // qt/kde includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqptrlist.h>
 #include <tqlistbox.h>
 #include <tqradiobutton.h>
@@ -112,13 +112,13 @@ void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*inclde
     for(int     i=0;i<listCount;i++) {
         if(m_pSelectLB -> isSelected(i)) {
             UMLView *view = (UMLView *)m_pDoc -> findView(m_nIdList[i]);
-            TQString sCount = TQString("%1").arg(count);
-            TQString sID = TQString("%1").arg(ID2STR(view -> getID()));
+            TQString sCount = TQString("%1").tqarg(count);
+            TQString sID = TQString("%1").tqarg(ID2STR(view -> getID()));
             opts.insert(diagram + sCount, sID);
             count++;
         }
     }
-    opts.insert("kde-uml-count", TQString("%1").arg(count));
+    opts.insert("kde-uml-count", TQString("%1").tqarg(count));
 }
 
 void DiagramPrintPage::setOptions( const TQMap<TQString,TQString>& /*opts*/ ) {}
diff --git a/umbrello/umbrello/dialogs/diagrampropertiespage.ui b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
index c7e430cb..8dc7f029 100644
--- a/umbrello/umbrello/dialogs/diagrampropertiespage.ui
+++ b/umbrello/umbrello/dialogs/diagrampropertiespage.ui
@@ -70,7 +70,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout20</cstring>
+                        <cstring>tqlayout20</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -78,7 +78,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -131,7 +131,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>50</width>
                                     <height>20</height>
@@ -164,7 +164,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -172,7 +172,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout6</cstring>
+                                <cstring>tqlayout6</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -218,7 +218,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -229,7 +229,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -307,7 +307,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -318,7 +318,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -369,7 +369,7 @@ If 'Snap to Grid' is enabled a component will always be aligned with the grid on
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
index 4ec2b30c..443ad9e2 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
+++ b/umbrello/umbrello/dialogs/exportallviewsdialog.cpp
@@ -13,7 +13,7 @@
 #include "exportallviewsdialog.h"
 
 // include files for TQt
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtooltip.h>
 
@@ -33,7 +33,7 @@ ExportAllViewsDialog::ExportAllViewsDialog(
   : ExportAllViewsDialogBase(parent,name, modal,fl) {
     // create and initialize m_imageType
     m_imageType = new KFileFilterCombo(this, "m_imageType");
-    m_imageType->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
+    m_imageType->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed, 0, 0, m_imageType->sizePolicy().hasHeightForWidth()));
     m_imageType->setEditable(false);
 
     m_imageType->setMimeFilter(UMLViewImageExporterModel::supportedMimeTypes(), defaultMimeType);
diff --git a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
index 4a7edb52..e795d2c9 100644
--- a/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
+++ b/umbrello/umbrello/dialogs/exportallviewsdialogbase.ui
@@ -120,7 +120,7 @@ Only the folders made by the user are created in the base directory (Logical vie
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -151,7 +151,7 @@ Only the folders made by the user are created in the base directory (Logical vie
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/umbrello/umbrello/dialogs/notedialog.cpp b/umbrello/umbrello/dialogs/notedialog.cpp
index ab823a4b..effb585d 100644
--- a/umbrello/umbrello/dialogs/notedialog.cpp
+++ b/umbrello/umbrello/dialogs/notedialog.cpp
@@ -15,8 +15,8 @@
 // qt/kde includes
 #include <tqlineedit.h>
 #include <tqgroupbox.h>
-#include <textedit.h>
-#include <layout.h>
+#include <tqtextedit.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/umbrello/umbrello/dialogs/overwritedialogue.cpp b/umbrello/umbrello/dialogs/overwritedialogue.cpp
index d2baa69e..9088b794 100644
--- a/umbrello/umbrello/dialogs/overwritedialogue.cpp
+++ b/umbrello/umbrello/dialogs/overwritedialogue.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <klocale.h>
 #include <kdebug.h>
@@ -26,14 +26,14 @@ OverwriteDialogue::OverwriteDialogue(
         bool applyToAllRemaining, TQWidget* parent, const char* name) :
 KDialogBase(Plain, i18n("Destination File Already Exists"), Ok|Apply|Cancel, Yes, parent, name) {
 
-    TQVBoxLayout* layout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( plainPage(), 0, spacingHint() );
 
-    TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").arg(fileName).arg(outputDirectory), plainPage() );
-    layout->addWidget(dialogueLabel);
+    TQLabel* dialogueLabel = new TQLabel(i18n("The file %1 already exists in %2.\n\nUmbrello can overwrite the file, generate a similar\nfile name or not generate this file.").tqarg(fileName).tqarg(outputDirectory), plainPage() );
+    tqlayout->addWidget(dialogueLabel);
 
     m_applyToAllRemaining = new TQCheckBox( i18n("&Apply to all remaining files"), plainPage() );
     m_applyToAllRemaining->setChecked(applyToAllRemaining);
-    layout->addWidget(m_applyToAllRemaining);
+    tqlayout->addWidget(m_applyToAllRemaining);
 
     setButtonText(KDialogBase::Ok, i18n("&Overwrite"));
     setButtonText(KDialogBase::Apply, i18n("&Generate Similar File Name"));
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.cpp b/umbrello/umbrello/dialogs/parmpropdlg.cpp
index c0f161dc..38a75292 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.cpp
+++ b/umbrello/umbrello/dialogs/parmpropdlg.cpp
@@ -13,7 +13,7 @@
 #include "parmpropdlg.h"
 
 // qt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 
 // kde includes
diff --git a/umbrello/umbrello/dialogs/parmpropdlg.h b/umbrello/umbrello/dialogs/parmpropdlg.h
index 851eedae..0164277d 100644
--- a/umbrello/umbrello/dialogs/parmpropdlg.h
+++ b/umbrello/umbrello/dialogs/parmpropdlg.h
@@ -16,7 +16,7 @@
 #include <kcombobox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqlineedit.h>
 #include <tqbuttongroup.h>
diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
index 172fc0cd..a5b742b1 100644
--- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp
+++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp
@@ -10,7 +10,7 @@
  ***************************************************************************/
 
 #include "pkgcontentspage.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include "../umlobjectlist.h"
 #include "../uml.h"
@@ -29,12 +29,12 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg)
     m_pContentGB = new TQGroupBox(i18n("Contained Items"), this);
     mainLayout -> addWidget(m_pContentGB);
 
-    TQHBoxLayout * layout = new TQHBoxLayout(m_pContentGB);
-    layout -> setSpacing(10);
-    layout -> setMargin(margin);
+    TQHBoxLayout * tqlayout = new TQHBoxLayout(m_pContentGB);
+    tqlayout -> setSpacing(10);
+    tqlayout -> setMargin(margin);
 
     m_pContentLB = new TQListBox(m_pContentGB);
-    layout -> addWidget(m_pContentLB);
+    tqlayout -> addWidget(m_pContentLB);
     setMinimumSize(310, 330);
     fillListBox();
     m_pMenu = 0;
diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp
index d4694afb..1c175752 100644
--- a/umbrello/umbrello/dialogs/selectopdlg.cpp
+++ b/umbrello/umbrello/dialogs/selectopdlg.cpp
@@ -13,7 +13,7 @@
 #include "selectopdlg.h"
 
 // qt includes
-#include <layout.h>
+#include <tqlayout.h>
 
 // kde includes
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp
index f4827ac8..b5cddff5 100644
--- a/umbrello/umbrello/dialogs/settingsdlg.cpp
+++ b/umbrello/umbrello/dialogs/settingsdlg.cpp
@@ -13,7 +13,7 @@
 #include "settingsdlg.h"
 
 // qt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqvbox.h>
 // kde includes
diff --git a/umbrello/umbrello/dialogs/statedialog.cpp b/umbrello/umbrello/dialogs/statedialog.cpp
index 1d3288d7..564146ec 100644
--- a/umbrello/umbrello/dialogs/statedialog.cpp
+++ b/umbrello/umbrello/dialogs/statedialog.cpp
@@ -13,7 +13,7 @@
 #include "statedialog.h"
 
 //qt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqmultilineedit.h>
diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp
index c46e2af6..d6ea57ce 100644
--- a/umbrello/umbrello/dialogs/umlattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp
@@ -13,7 +13,7 @@
 #include "umlattributedialog.h"
 
 // qt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
index d00718b6..55a47857 100644
--- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
+++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp
@@ -13,7 +13,7 @@
 #include "umlentityattributedialog.h"
 
 // qt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp
index c177a01b..e8216b99 100644
--- a/umbrello/umbrello/dialogs/umloperationdialog.cpp
+++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp
@@ -13,7 +13,7 @@
 #include "umloperationdialog.h"
 
 //qt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqlistbox.h>
 #include <tqbuttongroup.h>
@@ -463,7 +463,7 @@ bool UMLOperationDialog::apply()
     if( classifier != 0L &&
             classifier->checkOperationSignature(name, m_pOperation->getParmList(), m_pOperation) )
     {
-        TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).arg(classifier->getName())
+        TQString msg = TQString(i18n("An operation with that signature already exists in %1.\n")).tqarg(classifier->getName())
                       +
                       TQString(i18n("Choose a different name or parameter list." ));
         KMessageBox::error(this, msg, i18n("Operation Name Invalid"), false);
diff --git a/umbrello/umbrello/dialogs/umlroledialog.cpp b/umbrello/umbrello/dialogs/umlroledialog.cpp
index e66c841f..607ac759 100644
--- a/umbrello/umbrello/dialogs/umlroledialog.cpp
+++ b/umbrello/umbrello/dialogs/umlroledialog.cpp
@@ -13,7 +13,7 @@
 #include "umlroledialog.h"
 
 // qt/kde  includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <kdebug.h>
 #include <klocale.h>
 
@@ -35,7 +35,7 @@ void UMLRoleDialog::setupDialog() {
     m_pRoleProps = new UMLRoleProperties(this, m_pRole);
     setMainWidget( m_pRoleProps );
 
-    resize( TQSize(425, 620).expandedTo(minimumSizeHint()) );
+    resize( TQSize(425, 620).expandedTo(tqminimumSizeHint()) );
 
     //  topLayout -> addWidget( m_pParmsGB);
 
diff --git a/umbrello/umbrello/dialogs/umlroleproperties.cpp b/umbrello/umbrello/dialogs/umlroleproperties.cpp
index 998a6311..fe2e2f5f 100644
--- a/umbrello/umbrello/dialogs/umlroleproperties.cpp
+++ b/umbrello/umbrello/dialogs/umlroleproperties.cpp
@@ -14,7 +14,7 @@
 
 // qt/kde includes
 #include <tqradiobutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqlineedit.h>
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
index dde405a5..ecaa98ae 100644
--- a/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
+++ b/umbrello/umbrello/dialogs/umlrolepropertiesbase.ui
@@ -14,7 +14,7 @@
     </property>
     <widget class="TQLayoutWidget">
         <property name="name">
-            <cstring>layout6</cstring>
+            <cstring>tqlayout6</cstring>
         </property>
         <property name="geometry">
             <rect>
@@ -37,7 +37,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <property name="geometry">
                         <rect>
@@ -111,7 +111,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout2</cstring>
+                            <cstring>tqlayout2</cstring>
                         </property>
                         <grid>
                             <property name="name">
diff --git a/umbrello/umbrello/dialogs/umltemplatedialog.cpp b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
index de8af77c..6075fbe4 100644
--- a/umbrello/umbrello/dialogs/umltemplatedialog.cpp
+++ b/umbrello/umbrello/dialogs/umltemplatedialog.cpp
@@ -13,7 +13,7 @@
 #include "umltemplatedialog.h"
 
 // qt includes
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqcombobox.h>
 #include <tqlabel.h>
diff --git a/umbrello/umbrello/dialogs/umlviewdialog.cpp b/umbrello/umbrello/dialogs/umlviewdialog.cpp
index 586f729d..33a6a21f 100644
--- a/umbrello/umbrello/dialogs/umlviewdialog.cpp
+++ b/umbrello/umbrello/dialogs/umlviewdialog.cpp
@@ -14,12 +14,12 @@
 
 // qt/kde includes
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqgroupbox.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqspinbox.h>
 #include <kiconloader.h>
 #include <klocale.h>
diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
index ca84bf7d..824d708f 100644
--- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
+++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp
@@ -14,7 +14,7 @@
 #include "../umlview.h"
 #include "../umlwidget.h"
 #include <klocale.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>