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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

12 files changed, 146 insertions, 146 deletions

diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp
index 77abf661..df8ce38a 100644
--- a/kbabel/commonui/cmdedit.cpp
+++ b/kbabel/commonui/cmdedit.cpp
@@ -35,7 +35,7 @@
 #include <tqlistbox.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtoolbutton.h>
 #include <klocale.h>
@@ -45,38 +45,38 @@
 CmdEdit::CmdEdit(TQWidget* parent, const char* name)
        : TQWidget(parent,name)
 {
-    TQGridLayout* layout = new TQGridLayout( this , 1 , 1 );
-    layout->setSpacing( KDialog::spacingHint() );
+    TQGridLayout* tqlayout = new TQGridLayout( this , 1 , 1 );
+    tqlayout->setSpacing( KDialog::spacingHint() );
 
     TQLabel* nameLabel = new TQLabel( i18n("Command &Label:"), this);
     TQLabel* cmdLabel = new TQLabel( i18n("Co&mmand:"), this);
-    layout->addWidget( nameLabel, 0 , 0 );
-    layout->addWidget( cmdLabel, 0 , 1 );
+    tqlayout->addWidget( nameLabel, 0 , 0 );
+    tqlayout->addWidget( cmdLabel, 0 , 1 );
 
     _cmdNameEdit = new TQLineEdit( this , "cmdNameEdit" );
     _cmdNameEdit->setMaxLength(20);
     nameLabel->setBuddy(_cmdNameEdit);
-    layout->addWidget( _cmdNameEdit , 1 , 0 );
+    tqlayout->addWidget( _cmdNameEdit , 1 , 0 );
 
     _cmdEdit = new TQLineEdit( this , "cmdEdit" );
     cmdLabel->setBuddy(_cmdEdit);
-    layout->addWidget( _cmdEdit , 1 , 1 );
+    tqlayout->addWidget( _cmdEdit , 1 , 1 );
 
 
     _addButton = new TQPushButton( i18n("&Add"), this );
     _addButton->setEnabled(false);
-    layout->addWidget( _addButton , 1 , 2 );
+    tqlayout->addWidget( _addButton , 1 , 2 );
 
     _editButton = new TQPushButton( i18n("&Edit"), this );
     _editButton->setEnabled(false);
-    layout->addWidget( _editButton , 3 , 2 );
+    tqlayout->addWidget( _editButton , 3 , 2 );
 
     _removeButton = new TQPushButton( i18n("&Remove"), this );
     _removeButton->setEnabled(false);
-    layout->addWidget( _removeButton , 4 , 2 );
+    tqlayout->addWidget( _removeButton , 4 , 2 );
 
     TQHBoxLayout* hbox = new TQHBoxLayout();
-    layout->addLayout(hbox,5,2);
+    tqlayout->addLayout(hbox,5,2);
 
     _upButton = new TQToolButton(UpArrow,this);
     _upButton->setFixedSize(20,20);
@@ -90,21 +90,21 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name)
 
     _commandNames = new TQListBox( this , "commandNamesBox" );
     _commandNames->setMinimumSize(100, 100);
-    layout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0);
+    tqlayout->addMultiCellWidget( _commandNames , 3 , 6 , 0 , 0);
 
     _commands = new TQListBox( this , "commandsBox" );
     _commands->setMinimumSize(160, 100);
-    layout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 );
+    tqlayout->addMultiCellWidget( _commands , 3 , 6 , 1 ,1 );
 
 
-    layout->setColStretch(0,1);
-    layout->setColStretch(1,2);
-    layout->setColStretch(2,0);
+    tqlayout->setColStretch(0,1);
+    tqlayout->setColStretch(1,2);
+    tqlayout->setColStretch(2,0);
 
-    layout->addRowSpacing(2, KDialog::spacingHint());
-    layout->addRowSpacing(6, KDialog::spacingHint());
+    tqlayout->addRowSpacing(2, KDialog::spacingHint());
+    tqlayout->addRowSpacing(6, KDialog::spacingHint());
 
-    setMinimumSize(layout->sizeHint());
+    setMinimumSize(tqlayout->tqsizeHint());
 
 
     connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ;
diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp
index 338506f9..cb54e884 100644
--- a/kbabel/commonui/context.cpp
+++ b/kbabel/commonui/context.cpp
@@ -39,7 +39,7 @@
 #include <tqframe.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
diff --git a/kbabel/commonui/diffpreferences.ui b/kbabel/commonui/diffpreferences.ui
index a1bfd757..c52e3c27 100644
--- a/kbabel/commonui/diffpreferences.ui
+++ b/kbabel/commonui/diffpreferences.ui
@@ -72,7 +72,7 @@ in KBabel's main window.&lt;/p&gt;&lt;/qt&gt;</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -116,7 +116,7 @@ the database are used for diffing.&lt;/p&gt;&lt;/qt&gt;</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp
index 3205c062..980f9802 100644
--- a/kbabel/commonui/finddialog.cpp
+++ b/kbabel/commonui/finddialog.cpp
@@ -39,7 +39,7 @@
 #include <tqgroupbox.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 
@@ -57,15 +57,15 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 		, _regExpEditDialog(0), _replaceDlg(forReplace)
 {
 	TQWidget* page = new TQWidget(this);
-	TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 
 	TQLabel *label = new TQLabel(i18n("&Find:"),page);
-	layout->addWidget(label);
+	tqlayout->addWidget(label);
 
 	_findCombo = new KComboBox(true, page, "findCombo");
 	_findCombo->setMaxCount(10);
 	_findCombo->setInsertionPolicy(KComboBox::AtTop);
-	layout->addWidget(_findCombo);
+	tqlayout->addWidget(_findCombo);
 	label->setBuddy(_findCombo);
 
 	TQString msg=i18n("<qt><p><b>Find text</b></p>"
@@ -82,11 +82,11 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
                 setButtonOK(i18n("&Replace"));
 
 		_replaceLabel = new TQLabel(i18n("&Replace with:"),page);
-		layout->addWidget(_replaceLabel);
+		tqlayout->addWidget(_replaceLabel);
 		_replaceCombo = new KComboBox(true, page, "replaceCombo");
 		_replaceCombo->setMaxCount(10);
 		_replaceCombo->setInsertionPolicy(KComboBox::AtTop);
-		layout->addWidget(_replaceCombo);
+		tqlayout->addWidget(_replaceCombo);
 		_replaceLabel->setBuddy(_replaceCombo);
 
 	    	msg=i18n("<qt><p><b>Replace text</b></p>"
@@ -107,7 +107,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 
 	_buttonGrp = new TQButtonGroup(3, Qt::Horizontal, i18n("Where to Search"), page);
 	connect(_buttonGrp,TQT_SIGNAL(clicked(int)), this, TQT_SLOT(inButtonsClicked(int)));
-	layout->addWidget(_buttonGrp);
+	tqlayout->addWidget(_buttonGrp);
 
 	_inMsgid = new TQCheckBox(i18n("&Msgid"),_buttonGrp);
 	_inMsgstr = new TQCheckBox(i18n("M&sgstr"),_buttonGrp);
@@ -119,7 +119,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent)
 
 
 	TQGroupBox* box = new TQGroupBox(2, Qt::Horizontal, i18n("Options"), page);
-	layout->addWidget(box);
+	tqlayout->addWidget(box);
 
 	_caseSensitive = new TQCheckBox(i18n("C&ase sensitive"),box);
 	_wholeWords = new TQCheckBox(i18n("O&nly whole words"),box);
@@ -536,10 +536,10 @@ ReplaceDialog::ReplaceDialog(TQWidget* parent)
                    , true,false,i18n("&Replace"),i18n("&Goto Next"),i18n("R&eplace All"))
 {
 	TQWidget* page = plainPage();
-	TQVBoxLayout *layout = new TQVBoxLayout(page, 0, spacingHint());
+	TQVBoxLayout *tqlayout = new TQVBoxLayout(page, 0, spacingHint());
 
 	TQLabel *label = new TQLabel(i18n("Replace this string?"),page);
-	layout->addWidget(label);
+	tqlayout->addWidget(label);
 
 	connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(replace()));
 	connect(this,TQT_SIGNAL(user2Clicked()),this,TQT_SIGNAL(next()));
diff --git a/kbabel/commonui/kactionselector.cpp b/kbabel/commonui/kactionselector.cpp
index 3f23b24d..9e5d3e79 100644
--- a/kbabel/commonui/kactionselector.cpp
+++ b/kbabel/commonui/kactionselector.cpp
@@ -38,7 +38,7 @@
 #include <tqlistbox.h>
 #include <tqtoolbutton.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqevent.h>
 #include <tqwhatsthis.h>
 #include <tqapplication.h>
diff --git a/kbabel/commonui/klisteditor.ui b/kbabel/commonui/klisteditor.ui
index 4b7eeb0d..b31497b4 100644
--- a/kbabel/commonui/klisteditor.ui
+++ b/kbabel/commonui/klisteditor.ui
@@ -97,7 +97,7 @@
                                     <property name="name">
                                         <cstring>_list</cstring>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>200</width>
                                             <height>200</height>
@@ -172,7 +172,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>20</width>
                                                     <height>20</height>
diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp
index 9994b514..f34d2cc2 100644
--- a/kbabel/commonui/projectpref.cpp
+++ b/kbabel/commonui/projectpref.cpp
@@ -37,7 +37,7 @@
 #include "diffpreferences.h"
 #include "kbprojectsettings.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
 
diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp
index e10ba1bf..163b4eeb 100644
--- a/kbabel/commonui/projectprefwidgets.cpp
+++ b/kbabel/commonui/projectprefwidgets.cpp
@@ -58,7 +58,7 @@
 #include <kurldrag.h>
 #include <kurlrequester.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobjectlist.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
@@ -71,7 +71,7 @@
 #include <tqcombobox.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqwhatsthis.h>
 
 using namespace KBabel;
@@ -79,9 +79,9 @@ using namespace KBabel;
 static TQSize sizeHintForWidget(const TQWidget* widget)
 {
   //
-  // The size is computed by adding the sizeHint().height() of all
-  // widget children and taking the width of the widest child and adding
-  // layout()->margin() and layout()->spacing()
+  // The size is computed by adding the tqsizeHint().height() of all
+  // widget tqchildren and taking the width of the widest child and adding
+  // tqlayout()->margin() and tqlayout()->spacing()
   //
 
   TQSize size;
@@ -97,7 +97,7 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
       numChild += 1;
       TQWidget *w=((TQWidget*)o);
 
-      TQSize s = w->sizeHint();
+      TQSize s = w->tqsizeHint();
       if( s.isEmpty() == true )
       {
           s = TQSize( 50, 100 ); // Default size
@@ -109,8 +109,8 @@ static TQSize sizeHintForWidget(const TQWidget* widget)
 
   if( numChild > 0 )
   {
-    size.setHeight( size.height() + widget->layout()->spacing()*(numChild-1) );
-    size += TQSize( widget->layout()->margin()*2, widget->layout()->margin()*2 + 1 );
+    size.setHeight( size.height() + widget->tqlayout()->spacing()*(numChild-1) );
+    size += TQSize( widget->tqlayout()->margin()*2, widget->tqlayout()->margin()*2 + 1 );
   }
   else
   {
@@ -127,12 +127,12 @@ SavePreferences::SavePreferences(TQWidget *parent)
     :  KTabCtl(parent)
 {
     TQWidget* page = new TQWidget(this);
-    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
-    layout->addWidget(box);
+    tqlayout->addWidget(box);
 
     box->setMargin(KDialog::marginHint());
     _updateButton = new TQCheckBox(i18n("&Update header when saving"),box, "kcfg_AutoUpdate");
@@ -141,7 +141,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     _saveObsoleteButton = new TQCheckBox(i18n("Save &obsolete entries"),box, "kcfg_SaveObsolete");
     
     TQGroupBox* descBox=new TQGroupBox(1,Qt::Horizontal,i18n("De&scription"),page);
-    layout->addWidget(descBox);
+    tqlayout->addWidget(descBox);
     
     descBox->setMargin(KDialog::marginHint());
     _descriptionEdit = new TQLineEdit(descBox, "kcfg_DescriptionString");
@@ -149,7 +149,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     TQGroupBox* encodingBox = new TQGroupBox(1,Qt::Horizontal,i18n("Encoding")
                                   ,page);
     encodingBox->setMargin(KDialog::marginHint());
-    layout->addWidget(encodingBox);
+    tqlayout->addWidget(encodingBox);
     TQHBox *b = new TQHBox(encodingBox);
 
     TQLabel* tempLabel=new TQLabel(i18n("Default:"),b);
@@ -177,23 +177,23 @@ SavePreferences::SavePreferences(TQWidget *parent)
 
     _autoSaveBox = new TQGroupBox( 1, Qt::Horizontal, i18n( "Automatic Saving" ), page );
     _autoSaveBox->setMargin( KDialog::marginHint( ) );
-    layout->addWidget( _autoSaveBox );
+    tqlayout->addWidget( _autoSaveBox );
     _autoSaveDelay = new KIntNumInput( _autoSaveBox, "kcfg_AutoSaveDelay" );
     _autoSaveDelay->setRange( 0, 60 );
     _autoSaveDelay->setSuffix( i18n( "Short for minutes", " min" ) );
     _autoSaveDelay->setSpecialValueText( i18n( "No autosave" ) );
 
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("&General"));
     
     page = new TQWidget(this);
-    layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
     TQGroupBox* gridBox = new TQGroupBox(2,Qt::Horizontal,i18n("Fields to Update"),page);
-    layout->addWidget(gridBox);
+    tqlayout->addWidget(gridBox);
     gridBox->setMargin(KDialog::marginHint());
 
     _revisionButton = new TQCheckBox(i18n("Re&vision-Date"),gridBox, "kcfg_UpdateRevisionDate");
@@ -204,7 +204,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     _projectButton = new TQCheckBox(i18n("Pro&ject"),gridBox, "kcfg_UpdateProject");
 
     TQButtonGroup* dateBox = new TQButtonGroup(2,Qt::Horizontal,i18n("Format of Revision-Date"),page, "kcfg_DateFormat");
-    layout->addWidget(dateBox);
+    tqlayout->addWidget(dateBox);
     box->setMargin(KDialog::marginHint());
 
     // we remove/insert default date button to correctly map TQt::DateFormat to our Ids
@@ -225,7 +225,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
     TQGroupBox* projectBox = new TQGroupBox(1,Qt::Horizontal,i18n("Project String")
                                   ,page);
     projectBox->setMargin(KDialog::marginHint());
-    layout->addWidget(projectBox);
+    tqlayout->addWidget(projectBox);
     b = new TQHBox(projectBox);
 
     tempLabel=new TQLabel(i18n("Project-Id:"),b);
@@ -234,31 +234,31 @@ SavePreferences::SavePreferences(TQWidget *parent)
     b->setSpacing(KDialog::spacingHint());
     tempLabel->setBuddy(_projectEdit);
     
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("&Header"));
     
     page = new TQWidget(this);
-    layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
     TQGroupBox* translatorCopyrightBox = new TQGroupBox(1,Qt::Horizontal, page);
     translatorCopyrightBox->setMargin(KDialog::marginHint());
     _translatorCopyrightButton = 
 	new TQCheckBox(i18n("Update &translator copyright")
 	    ,translatorCopyrightBox, "kcfg_UpdateTranslatorCopyright");
-    layout->addWidget(translatorCopyrightBox);
+    tqlayout->addWidget(translatorCopyrightBox);
 
     TQGroupBox* fsfBox=new TQButtonGroup(1,Qt::Horizontal,i18n("Free Software Foundation Copyright"),page, "kcfg_FSFCopyright");
-    layout->addWidget(fsfBox);
+    tqlayout->addWidget(fsfBox);
 
     fsfBox->setMargin(KDialog::marginHint());
     _removeFSFButton = new TQRadioButton(i18n("&Remove copyright if empty"),fsfBox);
     _updateFSFButton = new TQRadioButton(i18n("&Update copyright"),fsfBox);
     _nochangeFSFButton = new TQRadioButton(i18n("Do &not change"),fsfBox);
 
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
     addTab(page, i18n("Cop&yright"));
 
@@ -289,7 +289,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
 "<ul><li><b>%1</b>: this is the encoding that fits the character "
 "set of your system language.</li>"
 "<li><b>%2</b>: uses Unicode (UTF-8) encoding.</li>"
-"</ul></qt>").arg(defaultName).arg(utf8Name) );
+"</ul></qt>").tqarg(defaultName).tqarg(utf8Name) );
 
 
     TQWhatsThis::add(_oldEncodingButton
@@ -323,7 +323,7 @@ SavePreferences::SavePreferences(TQWidget *parent)
 "in the online help.</p>"
 "</qt>") );
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 }
 
 
@@ -402,18 +402,18 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
          : TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
     if( !project.isEmpty() )
     {
 	// show the project name in the widget at the top
-	layout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").arg(project),page));
+	tqlayout->addWidget(new TQLabel(i18n("<font size=\"+1\">Project: %1</font>").tqarg(project),page));
     }
 
     TQGroupBox* group = new TQGroupBox(2,Qt::Horizontal,page);
-    layout->addWidget(group);
+    tqlayout->addWidget(group);
     group->setMargin(KDialog::marginHint());
     
     TQLabel* tempLabel=new TQLabel(i18n("&Name:"),group);
@@ -443,12 +443,12 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 
     tempLabel=new TQLabel(i18n("&Language mailing list:"),group);
     _listEdit = new TQLineEdit(group, "kcfg_Mailinglist");
-    _listEdit->setMinimumSize(100,_listEdit->sizeHint().height());
+    _listEdit->setMinimumSize(100,_listEdit->tqsizeHint().height());
     tempLabel->setBuddy(_listEdit);
  
     tempLabel=new TQLabel(i18n("&Timezone:"), group);
     _timezoneEdit = new TQLineEdit(group, "kcfg_Timezone");
-    _timezoneEdit->setMinimumSize(100,_timezoneEdit->sizeHint().height());
+    _timezoneEdit->setMinimumSize(100,_timezoneEdit->tqsizeHint().height());
     tempLabel->setBuddy(_timezoneEdit);
 
 
@@ -462,7 +462,7 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 
 
     group = new TQGroupBox(1,Qt::Horizontal,page);
-    layout->addWidget(group);
+    tqlayout->addWidget(group);
     group->setMargin(KDialog::marginHint());
 
     hbox = new TQHBox(group);
@@ -534,11 +534,11 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje
 	    "GNU gettext tools for currently set language; just press the <b>Lookup</b> "
 	    "button.</p></qt>"));
 
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 
     _mailEdit->installEventFilter(this);
     _listEdit->installEventFilter(this);
@@ -619,12 +619,12 @@ void IdentityPreferences::testPluralForm()
                 "of singular/plural forms automatically for the "
                 "language code \"%1\".\n"
                 "Do you have tdelibs.po installed for this language?\n"
-                "Please set the correct number manually.").arg(lang);
+                "Please set the correct number manually.").tqarg(lang);
     }
     else
     {
         msg = i18n("The number of singular/plural forms found for "
-                "the language code \"%1\" is %2.").arg(lang).arg(number);
+                "the language code \"%1\" is %2.").tqarg(lang).tqarg(number);
     }
 
     if(!msg.isEmpty())
@@ -663,13 +663,13 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    layout->addWidget(box);
+    tqlayout->addWidget(box);
 
     TQHBox *hbox = new TQHBox(box);
     hbox->setSpacing(KDialog::spacingHint());
@@ -715,7 +715,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
     vbgroup->setTitle(i18n("Compression Method for Mail Attachments"));
     vbgroup->setRadioButtonExclusive(true);
     vbgroup->setMargin(KDialog::marginHint());
-    layout->addWidget(vbgroup);
+    tqlayout->addWidget(vbgroup);
 
     bzipButton = new TQRadioButton(i18n("tar/&bzip2"), vbgroup, "kcfg_BZipCompression");
     gzipButton = new TQRadioButton(i18n("tar/&gzip"), vbgroup);
@@ -723,7 +723,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent)
     compressSingle = new TQCheckBox(i18n("&Use compression when sending "
 					"a single file"), vbgroup, "kcfg_CompressSingleFile");
 
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 }
 
@@ -794,30 +794,30 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
          : TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
 
     onFlyBtn = new TQCheckBox(i18n("On the &fly spellchecking"),page, "kcfg_OnFlySpellCheck");
-    layout->addWidget(onFlyBtn);
+    tqlayout->addWidget(onFlyBtn);
 
     TQWhatsThis::add(onFlyBtn, i18n("<qt><p><b>On the fly spellchecking</b></p>"
         "<p>Activate this to let KBabel spell check the text "
 	"as you type. Mispelled words will be colored by the error color.</p></qt>"));
 	
     spellConfig = new KSpellConfig(page,"spellConfigWidget",0,false);
-    layout->addWidget(spellConfig);
+    tqlayout->addWidget(spellConfig);
     remIgnoredBtn = new TQCheckBox(i18n("&Remember ignored words"),page, "kcfg_RememberIgnored");
-    layout->addWidget(remIgnoredBtn);
+    tqlayout->addWidget(remIgnoredBtn);
     
     connect( spellConfig, TQT_SIGNAL( configChanged() )
 	, this, TQT_SIGNAL ( settingsChanged() ) );
 
     TQLabel *tempLabel = new TQLabel(i18n("F&ile to store ignored words:"),page);
-    layout->addWidget(tempLabel);
+    tqlayout->addWidget(tempLabel);
     ignoreURLEdit = new KURLRequester(page, "kcfg_IgnoreURL");
-    layout->addWidget(ignoreURLEdit);
+    tqlayout->addWidget(ignoreURLEdit);
     tempLabel->setBuddy(ignoreURLEdit);
 
     connect(remIgnoredBtn,TQT_SIGNAL(toggled(bool)),ignoreURLEdit
@@ -833,11 +833,11 @@ SpellPreferences::SpellPreferences(TQWidget* parent)
     TQWhatsThis::add(tempLabel,msg);
     TQWhatsThis::add(ignoreURLEdit,msg);
 
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 }
 
 
@@ -879,13 +879,13 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    layout->addWidget(box);
+    tqlayout->addWidget(box);
 
     TQLabel* label=new TQLabel(i18n("&Base folder of PO files:"),box);
     TQHBox* hbox = new TQHBox(box);
@@ -896,7 +896,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 												
     _poDirEdit = new KURLRequester(hbox, "kcfg_PoBaseDir");
     _poDirEdit->setMode( mode );
-    _poDirEdit->setMinimumSize(250,_poDirEdit->sizeHint().height());
+    _poDirEdit->setMinimumSize(250,_poDirEdit->tqsizeHint().height());
     label->setBuddy(_poDirEdit);
 
 
@@ -906,7 +906,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 
     _potDirEdit = new KURLRequester(hbox, "kcfg_PotBaseDir");
     _potDirEdit->setMode( mode );
-    _potDirEdit->setMinimumSize(250,_potDirEdit->sizeHint().height());
+    _potDirEdit->setMinimumSize(250,_potDirEdit->tqsizeHint().height());
     label->setBuddy(_potDirEdit);
 
 
@@ -919,7 +919,7 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
 
     box=new TQGroupBox(1,Qt::Horizontal,page);
     box->setMargin(KDialog::marginHint());
-    layout->addWidget(box);
+    tqlayout->addWidget(box);
 
     _openWindowButton = new TQCheckBox(i18n("O&pen files in new window"),box, "kcfg_OpenWindow");
 
@@ -956,11 +956,11 @@ CatmanPreferences::CatmanPreferences(TQWidget* parent)
         "so invalid PO files could be shown as good ones, "
         "even if Gettext tools would reject such files.</p></qt>") );
 
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 }
 
 
@@ -981,13 +981,13 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box = new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Folders") , page );
     box->setMargin( KDialog::marginHint() );
-    layout->addWidget( box );
+    tqlayout->addWidget( box );
 
     _dirCmdEdit = new CmdEdit( box );
     new TQLabel( i18n("Replaceables:\n@PACKAGE@, @PODIR@, @POTDIR@\n"
@@ -1010,10 +1010,10 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent)
 
 
 
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 }
 
 
@@ -1044,13 +1044,13 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox( 1 , Qt::Horizontal , i18n("Commands for Files") , page );
     box->setMargin( KDialog::marginHint() );
-    layout->addWidget( box );
+    tqlayout->addWidget( box );
 
     _fileCmdEdit = new CmdEdit( box );
     new TQLabel( i18n("Replaceables:\n"
@@ -1074,10 +1074,10 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent)
 
 
 
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 }
 
 
@@ -1107,13 +1107,13 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
 {
     TQWidget* page = this;
 
-    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
 
     TQGroupBox* box=new TQGroupBox(2, Qt::Horizontal,i18n("Shown Columns"),page);
     box->setMargin(KDialog::marginHint());
-    layout->addWidget(box);
+    tqlayout->addWidget(box);
 
     _flagColumnCheckbox = new TQCheckBox( i18n("Fla&g"), box, "kcfg_ShowFlagColumn" );
     _fuzzyColumnCheckbox = new TQCheckBox( i18n("&Fuzzy"), box, "kcfg_ShowFuzzyColumn" );
@@ -1126,11 +1126,11 @@ ViewPreferences::ViewPreferences(TQWidget* parent)
     TQWhatsThis::add(box,i18n("<qt><p><b>Shown columns</b></p>\n"
      "<p></p></qt>"));
      
-    layout->addStretch(1);
+    tqlayout->addStretch(1);
 
     page->setMinimumSize(sizeHintForWidget(page));
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 }
 
 
@@ -1148,9 +1148,9 @@ void ViewPreferences::defaults(const CatManSettings& _settings)
 SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(parent)
 {
     TQWidget* page = this;
-    TQVBoxLayout* layout=new TQVBoxLayout(page);
-    layout->setSpacing(KDialog::spacingHint());
-    layout->setMargin(KDialog::marginHint());
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(page);
+    tqlayout->setSpacing(KDialog::spacingHint());
+    tqlayout->setMargin(KDialog::marginHint());
     
     TQHBox* box = new TQHBox(page);
     box->setSpacing(KDialog::spacingHint());
@@ -1159,21 +1159,21 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p
     const KFile::Mode mode = static_cast<KFile::Mode>( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly );
     _coderootEdit = new KURLRequester ( box, "kcfg_CodeRoot" );
     _coderootEdit->setMode( mode );
-    _coderootEdit->setMinimumSize( 250, _coderootEdit->sizeHint().height() );
+    _coderootEdit->setMinimumSize( 250, _coderootEdit->tqsizeHint().height() );
     tempLabel->setBuddy( _coderootEdit );
-    layout->addWidget(box);
+    tqlayout->addWidget(box);
 												
     // FIXME: use KConfigXT    
     _pathsEditor = new KListEditor(page);
     _pathsEditor->setTitle(i18n("Path Patterns"));
-    layout->addWidget(_pathsEditor);
+    tqlayout->addWidget(_pathsEditor);
     
     connect ( _pathsEditor, TQT_SIGNAL (itemsChanged ())
 	, this, TQT_SIGNAL (itemsChanged ()));
     
     _pathsEditor->installEventFilter(this);
 				    
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 }
 
 SourceContextPreferences::~SourceContextPreferences()
diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp
index 31b4ab86..00a88631 100644
--- a/kbabel/commonui/projectwizard.cpp
+++ b/kbabel/commonui/projectwizard.cpp
@@ -138,7 +138,7 @@ void ProjectWizard::next()
     if( file.exists() )
     {
 	if (KMessageBox::warningContinueCancel(0, i18n("The file '%1' already exists.\n"
-	    "Do you want to replace it?").arg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel)
+	    "Do you want to replace it?").tqarg(url()), i18n("File Exists"), i18n("Replace") ) == KMessageBox::Cancel)
 		return;
     }
 
diff --git a/kbabel/commonui/projectwizardwidget.ui b/kbabel/commonui/projectwizardwidget.ui
index 8fae37ec..c9329be7 100644
--- a/kbabel/commonui/projectwizardwidget.ui
+++ b/kbabel/commonui/projectwizardwidget.ui
@@ -40,7 +40,7 @@ and also a type of the translation project.
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kbabel/commonui/projectwizardwidget2.ui b/kbabel/commonui/projectwizardwidget2.ui
index ef1fb414..97030b94 100644
--- a/kbabel/commonui/projectwizardwidget2.ui
+++ b/kbabel/commonui/projectwizardwidget2.ui
@@ -46,7 +46,7 @@ will not work.</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -88,7 +88,7 @@ will not work.</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -138,7 +138,7 @@ will not work.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>31</width>
                     <height>100</height>
diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp
index 7f671d43..57fb21d0 100644
--- a/kbabel/commonui/roughtransdlg.cpp
+++ b/kbabel/commonui/roughtransdlg.cpp
@@ -44,7 +44,7 @@
 #include <tqcheckbox.h>
 #include <tqhbuttongroup.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqtimer.h>
 #include <tqvgroupbox.h>
@@ -187,9 +187,9 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat
     progressbar = new KProgress(mw,"progressbar");
     progressbar->setTextEnabled(true);
     progressbar->setFormat("%v/%m (%p%)");
-    TQHBoxLayout* pblayout= new TQHBoxLayout(mainLayout);
-    pblayout->add(label);
-    pblayout->add(progressbar);
+    TQHBoxLayout* pbtqlayout= new TQHBoxLayout(mainLayout);
+    pbtqlayout->add(label);
+    pbtqlayout->add(progressbar);
 
     transButton->setChecked(config->readBoolEntry("Translated",false));
     untransButton->setChecked(config->readBoolEntry("Untranslated",true));
@@ -278,7 +278,7 @@ void RoughTransDlg::translate()
     for(int i = 0; i < total; i++)
     {
         progressbar->setProgress(i+1);
-        kapp->processEvents(100);
+        kapp->tqprocessEvents(100);
 
         if(stop || cancel) break;
 
@@ -673,13 +673,13 @@ void RoughTransDlg::showStatistics()
             "Exact translations: %2 (%3%)\n"
             "Approximate translations: %4 (%5%)\n"
             "Nothing found: %6 (%7%)")
-            .arg( locale->formatNumber(totalTried,0) )
-            .arg( locale->formatNumber(exactTransCounter,0) )
-            .arg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) )
-            .arg( locale->formatNumber(partTransCounter,0) )
-            .arg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) )
-            .arg( locale->formatNumber(nothing,0) )
-            .arg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) );
+            .tqarg( locale->formatNumber(totalTried,0) )
+            .tqarg( locale->formatNumber(exactTransCounter,0) )
+            .tqarg( locale->formatNumber( ((double)(10000*exactTransCounter/TQMAX(totalTried,1)))/100) )
+            .tqarg( locale->formatNumber(partTransCounter,0) )
+            .tqarg( locale->formatNumber(((double)(10000*partTransCounter/TQMAX(totalTried,1)))/100) )
+            .tqarg( locale->formatNumber(nothing,0) )
+            .tqarg( locale->formatNumber(((double)(10000*nothing/TQMAX(totalTried,1)))/100) );
 
     KMessageBox::information(this, statMsg
             , i18n("Rough Translation Statistics"));