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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

24 files changed, 188 insertions, 188 deletions

diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp
index cd7454c7..9a19e5ec 100644
--- a/kbabel/kbabel/charselectview.cpp
+++ b/kbabel/kbabel/charselectview.cpp
@@ -33,7 +33,7 @@
 
 #include "charselectview.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
@@ -52,14 +52,14 @@ using namespace KBabel;
 CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    layout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    tqlayout->setResizeMode( TQLayout::Minimum );
 
-    layout->setSpacing( KDialog::spacingHint() );
+    tqlayout->setSpacing( KDialog::spacingHint() );
     
     TQHBox* bar = new TQHBox(this);
     bar->setSpacing( KDialog::spacingHint() );
-    layout->addWidget (bar);
+    tqlayout->addWidget (bar);
     
     TQLabel *lTable = new TQLabel( i18n( "Table:" ), bar );
     _tableNum = new TQSpinBox( 0, 255, 1, bar );
@@ -72,7 +72,7 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent
     _table->setNumRows(16);
     
     scroll->addChild(_table);
-    layout->addWidget (scroll);
+    tqlayout->addWidget (scroll);
     
     connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) );
     connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) ));
diff --git a/kbabel/kbabel/colorpreferences.ui b/kbabel/kbabel/colorpreferences.ui
index 63a0dcf1..ae8e57fe 100644
--- a/kbabel/kbabel/colorpreferences.ui
+++ b/kbabel/kbabel/colorpreferences.ui
@@ -164,7 +164,7 @@ phrases.&lt;/qt&gt;</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp
index e8a2e286..44a049dc 100644
--- a/kbabel/kbabel/commentview.cpp
+++ b/kbabel/kbabel/commentview.cpp
@@ -35,11 +35,11 @@
 
 #include "commentview.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqwhatsthis.h>
 #include <tqdragobject.h>
-#include <textview.h>
+#include <tqtextview.h>
 
 #include <kapplication.h>
 #include <kconfig.h>
@@ -67,7 +67,7 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje
 {
     setAcceptDrops(true);
 
-    TQVBoxLayout* layout=new TQVBoxLayout(this);
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(this);
 
     commentEdit = new MsgMultiLineEdit(0, 0, this);
     commentEdit->setMinimumHeight(50);
@@ -77,12 +77,12 @@ CommentView::CommentView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje
 
     TQLabel* label=new TQLabel(commentEdit,i18n("&Comment:"),this);
 
-    TQHBoxLayout* hb=new TQHBoxLayout(layout);
+    TQHBoxLayout* hb=new TQHBoxLayout(tqlayout);
     hb->addSpacing(KDialog::marginHint());
     hb->addWidget(label);
 
-    layout->addWidget(commentEdit);
-    layout->setStretchFactor(commentEdit,1);
+    tqlayout->addWidget(commentEdit);
+    tqlayout->setStretchFactor(commentEdit,1);
 
     TQWhatsThis::add(this,
        i18n("<qt><p><b>Comment Editor</b></p>\n\
diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp
index 4af2881e..11d8434a 100644
--- a/kbabel/kbabel/contextview.cpp
+++ b/kbabel/kbabel/contextview.cpp
@@ -35,8 +35,8 @@
 
 #include "contextview.h"
 
-#include <layout.h>
-#include <textview.h>
+#include <tqlayout.h>
+#include <tqtextview.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -50,14 +50,14 @@ using namespace KBabel;
 ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    layout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    tqlayout->setResizeMode( TQLayout::Minimum );
 
     _textview = new TQTextView (this, "context textview");
     KCursor::setAutoHideCursor(_textview->viewport(),true);
     _textview->setReadOnly(true);
     
-    layout->addWidget (_textview);
+    tqlayout->addWidget (_textview);
 
     TQWhatsThis::add(this,
         i18n("<qt><p><b>PO Context</b></p>"
@@ -137,7 +137,7 @@ void ContextView::updateView()
 		temp = "";
 		for( TQStringList::Iterator i=tempList.begin() ; i != tempList.end() ; ++i)
 		{
-		    temp += i18n("Plural %1: %2\n").arg(counter++).arg(*i);
+		    temp += i18n("Plural %1: %2\n").tqarg(counter++).tqarg(*i);
 		}
 	    }
             temp = TQStyleSheet::convertFromPlainText(temp);
diff --git a/kbabel/kbabel/editordiffpreferences.ui b/kbabel/kbabel/editordiffpreferences.ui
index 7aa23aad..33460635 100644
--- a/kbabel/kbabel/editordiffpreferences.ui
+++ b/kbabel/kbabel/editordiffpreferences.ui
@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -170,7 +170,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>
diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui
index 77c64683..15498f32 100644
--- a/kbabel/kbabel/editorpreferences.ui
+++ b/kbabel/kbabel/editorpreferences.ui
@@ -133,7 +133,7 @@ activated, you will still see a message in the statusbar.
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>21</height>
@@ -206,10 +206,10 @@ activated, you will still see a message in the statusbar.
                             <cstring>buttonGroup1</cstring>
                         </property>
                         <property name="title">
-                            <string>Status LEDs</string>
+                            <string>tqStatus LEDs</string>
                         </property>
                         <property name="whatsThis" stdset="0">
-                            <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;Status LEDs&lt;/b&gt;&lt;/p&gt;
+                            <string>&lt;qt&gt;&lt;p&gt;&lt;b&gt;tqStatus LEDs&lt;/b&gt;&lt;/p&gt;
 &lt;p&gt;Choose here where the status LEDs are displayed and what color they have.&lt;/p&gt;&lt;/qt&gt;</string>
                         </property>
                         <hbox>
@@ -245,7 +245,7 @@ activated, you will still see a message in the statusbar.
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>51</width>
                                         <height>20</height>
@@ -283,7 +283,7 @@ activated, you will still see a message in the statusbar.
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>29</height>
diff --git a/kbabel/kbabel/errorlistview.cpp b/kbabel/kbabel/errorlistview.cpp
index ef8c8008..719798d3 100644
--- a/kbabel/kbabel/errorlistview.cpp
+++ b/kbabel/kbabel/errorlistview.cpp
@@ -35,8 +35,8 @@
 
 #include "errorlistview.h"
 
-#include <layout.h>
-#include <textview.h>
+#include <tqlayout.h>
+#include <tqtextview.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -50,14 +50,14 @@ using namespace KBabel;
 ErrorListView::ErrorListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-	TQVBoxLayout* layout = new TQVBoxLayout( this );
-	layout->setResizeMode( TQLayout::Minimum );
+	TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+	tqlayout->setResizeMode( TQLayout::Minimum );
 
 	_textview = new TQTextView (this);
 	KCursor::setAutoHideCursor(_textview->viewport(),true);
 	_textview->setReadOnly(true);
 
-	layout->addWidget(_textview);
+	tqlayout->addWidget(_textview);
 
 	TQWhatsThis::add(this, i18n( "<qt><p><b>Error List</b></p>"
 			"<p>This window shows the list of errors found by validator tools "
@@ -70,7 +70,7 @@ void ErrorListView::updateView()
 	if( _catalog->numberOfEntries() == 0 )
 		return;
 
-	_textview->setText( _catalog->itemStatus( _currentIndex ).join( "\n---\n" ) );
+	_textview->setText( _catalog->itemtqStatus( _currentIndex ).join( "\n---\n" ) );
 }
 
 #include "errorlistview.moc"
diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp
index 62275cdd..553724bc 100644
--- a/kbabel/kbabel/headereditor.cpp
+++ b/kbabel/kbabel/headereditor.cpp
@@ -108,7 +108,7 @@ bool HeaderEditor::isModified()
 
 void HeaderEditor::readHeader(bool readOnly)
 {
-   setCaption(i18n("Header Editor for %1").arg(_catalog->currentURL().prettyURL()));
+   setCaption(i18n("Header Editor for %1").tqarg(_catalog->currentURL().prettyURL()));
 
    _editor->headerEdit->setReadOnly(readOnly);
    _editor->commentEdit->setReadOnly(readOnly);
diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp
index a3dcb3c3..3d0b128a 100644
--- a/kbabel/kbabel/hidingmsgedit.cpp
+++ b/kbabel/kbabel/hidingmsgedit.cpp
@@ -177,9 +177,9 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals )
   MsgMultiLineEdit* pl;
   for(uint i=0 ; i< _numberOfPlurals ; i++)
   {
-     pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").arg(i).local8Bit());
+     pl = new MsgMultiLineEdit( i, _spell, _multipleEdit, TQString("multipleEdit %1").tqarg(i).local8Bit());
      _allEdits.append(pl);
-     _multipleEdit->addTab( pl, i18n("Plural %1").arg(i+1));
+     _multipleEdit->addTab( pl, i18n("Plural %1").tqarg(i+1));
      if( _eventFilter )
         pl->installEventFilter(_eventFilter);
   }
diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp
index c98ccf59..24c3eae9 100644
--- a/kbabel/kbabel/kbabel.cpp
+++ b/kbabel/kbabel/kbabel.cpp
@@ -54,7 +54,7 @@
 #include <tqhbox.h>
 #include <tqwhatsthis.h>
 #include <tqsize.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>
 
@@ -115,9 +115,9 @@ class MyKProgress: public KProgress
 public:
     MyKProgress( TQWidget *parent, const char *name ) : KProgress( parent, name )
     {
-        setSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
+        tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Preferred );
     }
-    TQSize sizeHint() const { return TQSize( 1, 1);}
+    TQSize tqsizeHint() const { return TQSize( 1, 1);}
 };
 
 KBabelMW::KBabelMW(TQString projectFile)
@@ -129,7 +129,7 @@ KBabelMW::KBabelMW(TQString projectFile)
     
     if ( _project == NULL ) // FIXME should not happen anymore
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
     }
@@ -147,7 +147,7 @@ KBabelMW::KBabelMW(KBCatalog* catalog, TQString projectFile)
 
     if ( _project == NULL )
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(projectFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(projectFile)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
     }
@@ -333,7 +333,7 @@ void KBabelMW::init(KBCatalog* catalog)
                    "The minimum requirement is to fill out the Identity page.\n"
                    "Also check the encoding on the Save page, which is currently "
                    "set to %1. You may want to change this setting "
-                   "according to the settings of your language team.").arg(encodingStr));
+                   "according to the settings of your language team.").tqarg(encodingStr));
 
       TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure()));
     }
@@ -455,7 +455,7 @@ void KBabelMW::setupActions()
                    ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr");
 
    a_unsetFuzzy = new KAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, TQT_TQOBJECT(m_view)
-                 , TQT_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy");
+                 , TQT_SLOT(removeFuzzytqStatus()), actionCollection(), "edit_toggle_fuzzy");
    action = new KAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()),
          actionCollection(), "edit_edit_header");
 
@@ -724,7 +724,7 @@ void KBabelMW::setupStatusBar()
        _errorLed->setFixedSize(15,12);
        new TQLabel(i18n("faulty")+" ",statusBox);
 
-       statusBox->setFixedWidth(statusBox->sizeHint().width());
+       statusBox->setFixedWidth(statusBox->tqsizeHint().width());
        statusBar()->addWidget(statusBox);
     }
 
@@ -732,7 +732,7 @@ void KBabelMW::setupStatusBar()
 
     statusBar()->insertItem(i18n("RW"),ID_STATUS_READONLY);
 
-    statusBar()->insertItem(i18n("Line: %1 Col: %2").arg(1).arg(1)
+    statusBar()->insertItem(i18n("Line: %1 Col: %2").tqarg(1).tqarg(1)
             ,ID_STATUS_CURSOR);
 
     TQHBox* progressBox = new TQHBox(statusBar(),"progressBox");
@@ -743,7 +743,7 @@ void KBabelMW::setupStatusBar()
     progressBox->setStretchFactor(_progressBar,1);
 
     statusBar()->addWidget(progressBox,1);
-    statusBar()->setMinimumHeight(progressBox->sizeHint().height());
+    statusBar()->setMinimumHeight(progressBox->tqsizeHint().height());
 
     TQWhatsThis::add(statusBar(),
        i18n("<qt><p><b>Statusbar</b></p>\n\
@@ -999,7 +999,7 @@ void KBabelMW::openRecent(const KURL& url)
    KBabelView *view = KBabelView::viewForURL(url,TQString());
    if(view)
    {
-       KWin::activateWindow(view->topLevelWidget()->winId());
+       KWin::activateWindow(view->tqtopLevelWidget()->winId());
        return;
    }
 
@@ -1019,7 +1019,7 @@ void KBabelMW::open(const KURL& url, const TQString package, bool newWindow)
    if(view)
    {
         kdDebug(KBABEL) << "there is a such view" << endl;
-       KWin::activateWindow(view->topLevelWidget()->winId());
+       KWin::activateWindow(view->tqtopLevelWidget()->winId());
        return;
    }
 
@@ -1361,23 +1361,23 @@ void KBabelMW::faultyDisplayed(bool flag)
 
 void KBabelMW::displayedEntryChanged(const KBabel::DocPosition& pos)
 {
-   statusBar()->changeItem(i18n("Current: %1").arg(pos.item+1),ID_STATUS_CURRENT);
+   statusBar()->changeItem(i18n("Current: %1").tqarg(pos.item+1),ID_STATUS_CURRENT);
   _currentIndex = pos.item;
 }
 
 void KBabelMW::setNumberOfTotal(uint number)
 {
-   statusBar()->changeItem(i18n("Total: %1").arg(number),ID_STATUS_TOTAL);
+   statusBar()->changeItem(i18n("Total: %1").tqarg(number),ID_STATUS_TOTAL);
 }
 
 void KBabelMW::setNumberOfFuzzies(uint number)
 {
-   statusBar()->changeItem(i18n("Fuzzy: %1").arg(number),ID_STATUS_FUZZY);
+   statusBar()->changeItem(i18n("Fuzzy: %1").tqarg(number),ID_STATUS_FUZZY);
 }
 
 void KBabelMW::setNumberOfUntranslated(uint number)
 {
-   statusBar()->changeItem(i18n("Untranslated: %1").arg(number),ID_STATUS_UNTRANS);
+   statusBar()->changeItem(i18n("Untranslated: %1").tqarg(number),ID_STATUS_UNTRANS);
 }
 
 void KBabelMW::hasFuzzyAfterwards(bool flag)
@@ -1566,7 +1566,7 @@ void KBabelMW::gettextHelp()
     if(!error.isEmpty())
     {
         KMessageBox::sorry(this,i18n("An error occurred while "
-                "trying to open the gettext info page:\n%1").arg(error));
+                "trying to open the gettext info page:\n%1").tqarg(error));
     }
 }
 
@@ -1602,7 +1602,7 @@ void KBabelMW::buildDictMenus()
 
 void KBabelMW::updateCursorPosition(int line, int col)
 {
-    statusBar()->changeItem(i18n("Line: %1 Col: %2").arg(line+1).arg(col+1)
+    statusBar()->changeItem(i18n("Line: %1 Col: %2").tqarg(line+1).tqarg(col+1)
             ,ID_STATUS_CURSOR);
 }
 
@@ -1751,7 +1751,7 @@ void KBabelMW::projectOpen(const TQString& file)
     }
     else 
     {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(file)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(file)
             , i18n("Project File Error"));
 	_project = ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
 	m_view->useProject(_project);
diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp
index 848d506f..785943d8 100644
--- a/kbabel/kbabel/kbabelsplash.cpp
+++ b/kbabel/kbabel/kbabelsplash.cpp
@@ -53,9 +53,9 @@ KBabelSplash::KBabelSplash( TQWidget* parent, const char* name )
 
   picLabel->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
 
-  // Set geometry, with support for Xinerama systems
+  // Set tqgeometry, with support for Xinerama systems
   TQRect r;
-  r.setSize(sizeHint());
+  r.setSize(tqsizeHint());
   int ps = TQApplication::desktop()->primaryScreen();
   r.moveCenter( TQApplication::desktop()->screenGeometry(ps).center() );
   setGeometry(r);
diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp
index c4f84b2c..4c50a7e9 100644
--- a/kbabel/kbabel/kbabelview.cpp
+++ b/kbabel/kbabel/kbabelview.cpp
@@ -39,7 +39,7 @@
 #include "kbabelsettings.h"
 #include "kbprojectsettings.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <tqlabel.h>
 #include <tqframe.h>
@@ -48,10 +48,10 @@
 #include <tqwhatsthis.h>
 #include <tqdragobject.h>
 #include <tqpopupmenu.h>
-#include <stylesheet.h>
+#include <tqstylesheet.h>
 #include <tqtabwidget.h>
-#include <textview.h>
-#include <textstream.h>
+#include <tqtextview.h>
+#include <tqtextstream.h>
 #include <tqtimer.h>
 #include <tqvbox.h>
 
@@ -307,7 +307,7 @@ void KBabelView::initDockWidgets()
     TQWidget *tempWidget=new TQWidget(this,"msgidWidget");
     tempWidget->setMinimumSize(350,150);
 
-    TQVBoxLayout *layout=new TQVBoxLayout(tempWidget);
+    TQVBoxLayout *tqlayout=new TQVBoxLayout(tempWidget);
 
     msgidLabel = new HidingMsgEdit(2, this, 0, tempWidget,"msgidLabel");
     msgidLabel->installEventFilter(this);
@@ -328,16 +328,16 @@ void KBabelView::initDockWidgets()
 "and the behavior of KBabel and to Stephan Kulow, who always\n"
 "lends me a helping hand.\n\n"
 "Many good ideas, especially for the Catalog Manager, are taken\n"
-"from KTranslator by Andrea Rizzi.").arg(VERSION).arg(2006));
+"from KTranslator by Andrea Rizzi.").tqarg(VERSION).tqarg(2006));
 
     TQLabel *label=new TQLabel(msgidLabel,i18n("O&riginal string (msgid):"),tempWidget);
 
-    TQHBoxLayout* hb=new TQHBoxLayout(layout);
+    TQHBoxLayout* hb=new TQHBoxLayout(tqlayout);
     hb->addSpacing(KDialog::marginHint());
     hb->addWidget(label);
 
-    layout->addWidget(msgidLabel);
-    layout->setStretchFactor(msgidLabel,1);
+    tqlayout->addWidget(msgidLabel);
+    tqlayout->setStretchFactor(msgidLabel,1);
 
     TQWhatsThis::add(tempWidget,
        i18n("<qt><p><b>Original String</b></p>\n\
@@ -382,7 +382,7 @@ of the currently displayed entry.</p></qt>"));
     tempWidget=new TQWidget(this,"msgstrWidget");
     tempWidget->setMinimumSize(350,150);
 
-    layout=new TQVBoxLayout(tempWidget);
+    tqlayout=new TQVBoxLayout(tempWidget);
 
     // if undefined number of plural forms, use 1
     int pf = _catalog->defaultNumberOfPluralForms();
@@ -395,7 +395,7 @@ of the currently displayed entry.</p></qt>"));
 
     label=new TQLabel(msgstrEdit,i18n("Trans&lated string (msgstr):"),tempWidget);
 
-    hb=new TQHBoxLayout(layout);
+    hb=new TQHBoxLayout(tqlayout);
     hb->setSpacing(KDialog::spacingHint());
 
     hb->addSpacing(KDialog::marginHint());
@@ -443,8 +443,8 @@ of the currently displayed entry.</p></qt>"));
        TQWhatsThis::add(_errorLed,ledMsg);
     }
 
-    layout->addWidget(msgstrEdit);
-    layout->setStretchFactor(msgstrEdit,1);
+    tqlayout->addWidget(msgstrEdit);
+    tqlayout->setStretchFactor(msgstrEdit,1);
 
     TQWhatsThis::add(tempWidget,
        i18n("<qt><p><b>Translation Editor</b></p>\n\
@@ -685,7 +685,7 @@ void KBabelView::readSettings(KConfig* config)
    if(KBabelSettings::autoUnsetFuzzy())
    {
       connect(msgstrEdit,TQT_SIGNAL(textChanged())
-		  ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
+		  ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
    }
 
    setupAutoCheckTools();
@@ -788,7 +788,7 @@ void KBabelView::readProject(Project::Ptr project)
    {
     // turn off spellchecker
     msgstrEdit->setSpellChecker(0);
-    // invalidate the current settings, to make sure they are updated when needed
+    // tqinvalidate the current settings, to make sure they are updated when needed
     _spellcheckSettings.valid = false;
    }
 
@@ -854,12 +854,12 @@ void KBabelView::updateSettings()
     }
 
     disconnect(msgstrEdit,TQT_SIGNAL(textChanged())
-			 ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
+			 ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
 
    if(KBabelSettings::autoUnsetFuzzy())
    {
          connect(msgstrEdit,TQT_SIGNAL(textChanged())
-			 ,this,TQT_SLOT(autoRemoveFuzzyStatus()));
+			 ,this,TQT_SLOT(autoRemoveFuzzytqStatus()));
    }
 
    msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing());
@@ -1116,7 +1116,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
    cu.cleanPath();
    if(checkIfModified && !url.isEmpty() && cu==url)
    {
-       KWin::activateWindow(topLevelWidget()->winId());
+       KWin::activateWindow(tqtopLevelWidget()->winId());
        return;
    }
 
@@ -1155,12 +1155,12 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
 		return;
 	   }
 	   else {
-	        KWin::activateWindow(v->topLevelWidget()->winId());
+	        KWin::activateWindow(v->tqtopLevelWidget()->winId());
         	return;
 	   }
        }
 
-       ConversionStatus stat=_catalog->openURL(url, package);
+       ConversiontqStatus stat=_catalog->openURL(url, package);
 
        switch(stat)
        {
@@ -1180,14 +1180,14 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           {
               KMessageBox::error(this
                  ,i18n("Error while trying to read file:\n %1\n"
-                       "Maybe it is not a valid PO file.").arg(url.prettyURL()));
+                       "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
               break;
           }
           case NO_ENTRY_ERROR:
           {
               KMessageBox::error(this
                   ,i18n("Error while reading the file:\n %1\n"
-                  "No entry found.").arg(url.prettyURL()));
+                  "No entry found.").tqarg(url.prettyURL()));
               break;
           }
           case RECOVERED_PARSE_ERROR:
@@ -1204,25 +1204,25 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           case NO_PERMISSIONS:
           {
              KMessageBox::error(this,i18n(
-               "You do not have permissions to read file:\n %1").arg(url.prettyURL()));
+               "You do not have permissions to read file:\n %1").tqarg(url.prettyURL()));
              break;
           }
           case NO_FILE:
           {
              KMessageBox::error(this,i18n(
-                 "You have not specified a valid file:\n %1").arg(url.prettyURL()));
+                 "You have not specified a valid file:\n %1").tqarg(url.prettyURL()));
              break;
           }
 	  case NO_PLUGIN:
 	  {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
              break;
 	  }
 	  case UNSUPPORTED_TYPE:
 	  {
              KMessageBox::error(this,i18n(
-                 "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
+                 "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
              break;
 	  }
 	  case STOPPED:
@@ -1230,7 +1230,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo
           default:
           {
              KMessageBox::error(this,i18n(
-                  "Error while trying to open file:\n %1").arg(url.prettyURL()));
+                  "Error while trying to open file:\n %1").tqarg(url.prettyURL()));
              break;
           }
 
@@ -1282,7 +1282,7 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
        setCursor(KCursor::waitCursor());*/
 
 
-       ConversionStatus stat=_catalog->openURL(openURL,saveURL);
+       ConversiontqStatus stat=_catalog->openURL(openURL,saveURL);
 
        switch(stat)
        {
@@ -1295,21 +1295,21 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
                // For a template, recoverable errors are disqualifying
                 KMessageBox::sorry(this,
                     i18n("There was an error while reading the file header of file:\n %1")
-                    .arg(openURL.prettyURL()));
+                    .tqarg(openURL.prettyURL()));
                 break;
            }
            case PARSE_ERROR:
            {
                KMessageBox::error(this
                        ,i18n("Error while trying to read file:\n %1\n"
-                       "Maybe it is not a valid PO file.").arg(openURL.prettyURL()));
+                       "Maybe it is not a valid PO file.").tqarg(openURL.prettyURL()));
                break;
            }
            case NO_ENTRY_ERROR:
            {
                KMessageBox::error(this
                     ,i18n("Error while reading the file:\n %1\n"
-                       "No entry found.").arg(openURL.prettyURL()));
+                       "No entry found.").tqarg(openURL.prettyURL()));
                break;
            }
            case RECOVERED_PARSE_ERROR:
@@ -1317,36 +1317,36 @@ void KBabelView::openTemplate(const KURL& openURL, const KURL& saveURL)
                // For a template, recoverable errors are disqualifying
                KMessageBox::sorry(this,
                    i18n("Minor syntax errors were found while reading file:\n %1")
-                   .arg(openURL.prettyURL()));
+                   .tqarg(openURL.prettyURL()));
                break;
 	  }
 	  case NO_PERMISSIONS:
 	  {
-	      KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").arg(openURL.prettyURL()));
+	      KMessageBox::error(this,i18n("You do not have permissions to read file:\n %1").tqarg(openURL.prettyURL()));
 	      break;
 	  }
 	  case NO_FILE:
 	  {
-	      KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").arg(openURL.prettyURL()));
+	      KMessageBox::error(this,i18n("You have not specified a valid file:\n %1").tqarg(openURL.prettyURL()));
 	     break;
 	  }
 	  case NO_PLUGIN:
 	  {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(openURL.prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(openURL.prettyURL()));
              break;
 	  }
 	  case UNSUPPORTED_TYPE:
 	  {
              KMessageBox::error(this,i18n(
-                 "The import plugin cannot handle this type of the file:\n %1").arg(openURL.prettyURL()));
+                 "The import plugin cannot handle this type of the file:\n %1").tqarg(openURL.prettyURL()));
              break;
 	  }
           case STOPPED:
             break;
 	  default:
 	  {
-	     KMessageBox::error(this,i18n("Error while trying to open file:\n %1").arg(openURL.prettyURL()));
+	     KMessageBox::error(this,i18n("Error while trying to open file:\n %1").tqarg(openURL.prettyURL()));
 	     break;
 	  }
 
@@ -1368,7 +1368,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
    }
    else
    {
-      ConversionStatus stat=_catalog->saveFile();
+      ConversiontqStatus stat=_catalog->saveFile();
 
       int whatToDo = -1;
 
@@ -1386,20 +1386,20 @@ bool KBabelView::saveFile(bool syntaxCheck)
 	 {
 	    whatToDo=KMessageBox::warningContinueCancel(this,
 	     i18n("You do not have permission to write to file:\n%1\n"
-		  "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
+		  "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
 	     i18n("Error"),KStdGuiItem::save());
 	     break;
 	 }
 	 case NO_PLUGIN:
 	 {
              KMessageBox::error(this,i18n(
-                 "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
+                 "KBabel cannot find a corresponding plugin for the MIME type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
              break;
 	 }
 	 case UNSUPPORTED_TYPE:
 	 {
              KMessageBox::error(this,i18n(
-                 "The export plugin cannot handle this type of file:\n %1").arg(_catalog->currentURL().prettyURL()));
+                 "The export plugin cannot handle this type of file:\n %1").tqarg(_catalog->currentURL().prettyURL()));
              break;
 	 }
 	 case BUSY:
@@ -1415,7 +1415,7 @@ bool KBabelView::saveFile(bool syntaxCheck)
 	 {
 	    whatToDo=KMessageBox::warningContinueCancel(this,
 	     i18n("An error occurred while trying to write to file:\n%1\n"
-		  "Do you want to save to another file or cancel?").arg(_catalog->currentURL().prettyURL()),
+		  "Do you want to save to another file or cancel?").tqarg(_catalog->currentURL().prettyURL()),
 	     i18n("Error"),KStdGuiItem::save());
 	     break;
 	 }
@@ -1448,8 +1448,8 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 
    if (KIO::NetAccess::exists(url, false, this))
    {
-       if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. "
-						       "Do you want to overwrite it?").arg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
+       if(KMessageBox::warningContinueCancel(this,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. "
+						       "Do you want to overwrite it?").tqarg(url.prettyURL())),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Cancel)
       {
 	 return false;
       }
@@ -1458,7 +1458,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 
    bool wasReadOnly=_catalog->isReadOnly();
 
-   ConversionStatus stat=_catalog->saveFileAs(url,true);
+   ConversiontqStatus stat=_catalog->saveFileAs(url,true);
 
 
    // if the file was not saved sucessfully ask for saving to another file
@@ -1474,30 +1474,30 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 	      case NO_PERMISSIONS:
 	      {
 		  message=i18n("You do not have permission to write to file:\n%1\n"
-			       "Do you want to save to another file or cancel?").arg(url.prettyURL());
+			       "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
 		 break;
 	      }
 	      case NO_FILE:
 	      {
 		 message=i18n("You have specified a folder:\n%1\n"
-			      "Do you want to save to another file or cancel?").arg(url.prettyURL());
+			      "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
 		 break;
 	      }
 	      case NO_PLUGIN:
 	      {
-	         message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL());
+	         message=i18n("KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL());
                  break;
 	      }
 	      case UNSUPPORTED_TYPE:
 	      {
                  message=i18n(
-                    "The export plugin cannot handle this type of the file:\n %1").arg(url.prettyURL());
+                    "The export plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL());
                  break;
 	      }
 	      default:
 	      {
 		  message=i18n("An error occurred while trying to write to file:\n%1\n"
-			       "Do you want to save to another file or cancel?").arg(url.prettyURL());
+			       "Do you want to save to another file or cancel?").tqarg(url.prettyURL());
 		  break;
 	      }
 	  }
@@ -1518,7 +1518,7 @@ bool KBabelView::saveFileAs(KURL url, bool syntaxCheck)
 		if (KIO::NetAccess::exists(url, false, this))
 		{
 		    if(KMessageBox::warningContinueCancel(this,i18n("The file %1 already exists.\n"
-								    "Do you want to overwrite it?").arg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
+								    "Do you want to overwrite it?").tqarg(url.prettyURL()),i18n("Warning"),i18n("&Overwrite"))==KMessageBox::Continue)
 		   {
 		      stat=_catalog->saveFileAs(url);
 		      if(stat!=OK)
@@ -1625,7 +1625,7 @@ bool KBabelView::checkSyntax(bool msgOnlyAtError,bool question)
    bool returnCode=true;
    TQString output;
 
-   Msgfmt::Status result=_catalog->checkSyntax( output );
+   Msgfmt::tqStatus result=_catalog->checkSyntax( output );
 
    const TQStringList outputLines = TQStringList::split("\n",output);
    
@@ -1831,20 +1831,20 @@ void KBabelView::updateEditor(int form, bool delay)
 
    if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified())
    {
-       disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
+       disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
    }
 
    msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex));
-   msgidLabel->repaint();
+   msgidLabel->tqrepaint();
 
    msgstrEdit->setText(_catalog->msgstr(_currentIndex));
    msgstrEdit->showForm( form );
-   msgstrEdit->repaint();
+   msgstrEdit->tqrepaint();
    m_cataloglistview->setSelectedItem(_currentIndex);
 
    if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex))
    {
-      connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
+      connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
    }
 
    msgstrEdit->blockSignals(false);
@@ -2615,7 +2615,7 @@ void KBabelView::replaceAll()
 
 	while(success)
 	{
-		kapp->processEvents(100);
+		kapp->tqprocessEvents(100);
 
 		_replacesTotal++;
 
@@ -3159,7 +3159,7 @@ void KBabelView::forwardHistory()
    }
 }
 
-void KBabelView::removeFuzzyStatus()
+void KBabelView::removeFuzzytqStatus()
 {
    bool newState =  !_catalog->isFuzzy(_currentIndex);
    _catalog->setFuzzy(_currentIndex,newState);
@@ -3302,12 +3302,12 @@ void KBabelView::emitEntryState()
          TQPalette palette=msgstrEdit->palette();
          palette.setColor( TQColorGroup::Text, red );
 
-	 if( _catalog->itemStatus(_currentIndex).contains("syntax error"))
+	 if( _catalog->itemtqStatus(_currentIndex).contains("syntax error"))
          {
              msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
          }
          else
-	 if( !_catalog->itemStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
+	 if( !_catalog->itemtqStatus(_currentIndex).isEmpty() && KBabelSettings::autoCheckColorError())
          {
              msgstrEdit->setCurrentColor( MsgMultiLineEdit::ErrorColor );
          }
@@ -3332,12 +3332,12 @@ void KBabelView::checkUntranslated()
    emit signalUntranslatedInFront(_catalog->hasUntranslatedInFront(_currentIndex));
 }
 
-void KBabelView::autoRemoveFuzzyStatus()
+void KBabelView::autoRemoveFuzzytqStatus()
 {
    // only at first text change remove fuzzy status
-   disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus()));
+   disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzytqStatus()));
 
-   //removeFuzzyStatus();
+   //removeFuzzytqStatus();
 }
 
 void KBabelView::toggleFuzzyLed(bool on)
@@ -3541,7 +3541,7 @@ void KBabelView::forwardMsgstrEditCmd(EditCommand* cmd)
 
       _catalog->applyBeginCommand(_currentIndex,Msgstr,this);
 
-      removeFuzzyStatus();
+      removeFuzzytqStatus();
    }
 
    cmd->setPart(Msgstr);
@@ -3576,13 +3576,13 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 {
    if( !_autocheckTools.isEmpty() )
    {
-        TQStringList oldStatus = _catalog->itemStatus(_currentIndex);
+        TQStringList oldtqStatus = _catalog->itemtqStatus(_currentIndex);
 
-	TQStringList status = _catalog->itemStatus( _currentIndex,true, _autocheckTools );
+	TQStringList status = _catalog->itemtqStatus( _currentIndex,true, _autocheckTools );
 
 	// if there is more than one view, the status changes only in
 	// one view, so we have to update always.
-	if(_catalog->isLastView() && onlyWhenChanged && oldStatus == status)
+	if(_catalog->isLastView() && onlyWhenChanged && oldtqStatus == status)
 		return;
 
 	if( !status.isEmpty() )
@@ -3598,8 +3598,8 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 		else msg += ", "+locale->translate("what check found errors",(*it).utf8());
 	    }
 
-	    //i18n: translators: Status bar text that automatic checks have found some errors
-	    emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).arg(msg));
+	    //i18n: translators: tqStatus bar text that automatic checks have found some errors
+	    emit signalChangeStatusbar(i18n("1 error: %1", "%n errors: %1", status.size ()).tqarg(msg));
 	    emit signalFaultyDisplayed(true);
 
 	    if(KBabelSettings::autoCheckColorError())
@@ -3611,7 +3611,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 	    {
 		if(onlyWhenChanged)
 		{
-		    if(oldStatus != status && oldStatus.isEmpty() )
+		    if(oldtqStatus != status && oldtqStatus.isEmpty() )
 		    {
 			KNotifyClient::beep();
 		    }
@@ -3622,7 +3622,7 @@ void KBabelView::autoCheck(bool onlyWhenChanged)
 		}
 	    }
 	}
-	else if( _catalog->itemStatus(_currentIndex).isEmpty() )
+	else if( _catalog->itemtqStatus(_currentIndex).isEmpty() )
 	{
 	    _catalog->removeFromErrorList(_currentIndex);
 
@@ -3888,7 +3888,7 @@ void KBabelView::spellcheck()
 	    if(emitProgress)
 	    {
 		emit signalResetProgressBar(i18n("Preparing spell check"),100);
-		kapp->processEvents(100);
+		kapp->tqprocessEvents(100);
 	    }
 
 	    uint total=last-first+1;
@@ -3900,7 +3900,7 @@ void KBabelView::spellcheck()
 		    lastPercent++;
 		    emit signalProgress(lastPercent);
 
-		    kapp->processEvents(100);
+		    kapp->tqprocessEvents(100);
 		}
 
 		TQStringList msgs=_catalog->msgstr(i);
@@ -4004,7 +4004,7 @@ void KBabelView::spellStart(KSpell *)
 				KMessageBox::sorry(this,
 				            i18n("Error opening the file that contains words "
 				            "to ignore during spell checking:\n"
-							"%1").arg(file.name()));
+							"%1").tqarg(file.name()));
 			}
 		}
 		else
@@ -4012,13 +4012,13 @@ void KBabelView::spellStart(KSpell *)
 			KMessageBox::sorry(this,
 			            i18n("Only local files are allowed for saving "
 			                 "ignored words to during spell checking:\n"
-							 "%1").arg(urlString));
+							 "%1").tqarg(urlString));
 		}
 
 		if(spell.ignoreList.count() > 0)
 		{
 			emit signalResetProgressBar(i18n("Preparing spell check"),100);
-			kapp->processEvents(100);
+			kapp->tqprocessEvents(100);
 
 			uint total = spell.ignoreList.count();
 			uint oldPercent=0;
@@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *)
 				{
 					oldPercent++;
 					emit signalProgress(oldPercent);
-					kapp->processEvents(100);
+					kapp->tqprocessEvents(100);
 				}
 
 				spell.kspell->ignore(*it);
diff --git a/kbabel/kbabel/kbabelview.h b/kbabel/kbabel/kbabelview.h
index af7fff86..3398457d 100644
--- a/kbabel/kbabel/kbabelview.h
+++ b/kbabel/kbabel/kbabelview.h
@@ -268,7 +268,7 @@ public slots:
     void skipToTagFromTool(int index);
     void wordCount();
 
-    void removeFuzzyStatus();
+    void removeFuzzytqStatus();
     /** opens the header editor for the po-file */
     void editHeader();
 
@@ -451,7 +451,7 @@ protected slots:
 
 private slots:
    void msgstrPluralFormChanged (uint index);
-   void autoRemoveFuzzyStatus();
+   void autoRemoveFuzzytqStatus();
 
    /** connected to the catalog. it is called when a new file is opened*/
    void newFileOpened(bool readOnly);
diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp
index 2458d3dc..c70b42e7 100644
--- a/kbabel/kbabel/kbabelview2.cpp
+++ b/kbabel/kbabel/kbabelview2.cpp
@@ -45,7 +45,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmessagebox.h>
 #include <tqpopupmenu.h>
 #include <tqvbox.h>
@@ -537,7 +537,7 @@ void KBabelView::diffInternal(bool autoDf)
     	            KMessageBox::sorry(this
         	        ,i18n("An error occurred while trying to get the list "
                         "of messages for this file from the database:\n"
-                        "%1").arg(error));
+                        "%1").tqarg(error));
 
             	    _diffing=false;
                     _diffEnabled=false;
@@ -709,7 +709,7 @@ bool KBabelView::openDiffFile(bool autoDiff)
     connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int)));
     emit signalResetProgressBar(i18n("loading file for diff"),100);
 
-    ConversionStatus stat = cat.openURL(url);
+    ConversiontqStatus stat = cat.openURL(url);
 
     emit signalClearProgressBar();
 
@@ -722,40 +722,40 @@ bool KBabelView::openDiffFile(bool autoDiff)
             {
                 KMessageBox::sorry(this
                     ,i18n("Error while trying to read file:\n %1\n"
-                   "Maybe it is not a valid PO file.").arg(url.prettyURL()));
+                   "Maybe it is not a valid PO file.").tqarg(url.prettyURL()));
                 break;
             }
             case NO_PERMISSIONS:
             {
                 KMessageBox::sorry(this,i18n(
                 "You do not have permissions to read file:\n %1")
-                        .arg(url.prettyURL()));
+                        .tqarg(url.prettyURL()));
                 break;
             }
             case NO_FILE:
             {
                  KMessageBox::sorry(this,i18n(
                  "You have not specified a valid file:\n %1")
-                         .arg(url.prettyURL()));
+                         .tqarg(url.prettyURL()));
                 break;
             }
 	    case NO_PLUGIN:
 	    {
 	         KMessageBox::error(this,i18n(
-	              "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").arg(url.prettyURL()));
+	              "KBabel cannot find a corresponding plugin for the MIME type of the file:\n %1").tqarg(url.prettyURL()));
 	         break;
 	    }
 	    case UNSUPPORTED_TYPE:
 	    {
 	          KMessageBox::error(this,i18n(
-	               "The import plugin cannot handle this type of the file:\n %1").arg(url.prettyURL()));
+	               "The import plugin cannot handle this type of the file:\n %1").tqarg(url.prettyURL()));
                   break;
 	    }
             default:
             {
                  KMessageBox::sorry(this,i18n(
                   "Error while trying to open file:\n %1")
-                         .arg(url.prettyURL()));
+                         .tqarg(url.prettyURL()));
                  break;
             }
 
@@ -802,8 +802,8 @@ void KBabelView::showTryLaterMessageBox()
 	         "However, the string might be found "
 		 "in the files being searched at the moment.\n"
 		 "Please try later."), contents);
-    label2->setAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
-    label2->setMinimumSize(label2->sizeHint());
+    label2->tqsetAlignment( TQt::AlignAuto | TQt::AlignVCenter | TQt::ExpandTabs | TQt::WordBreak );
+    label2->setMinimumSize(label2->tqsizeHint());
     lay->add( label2 );
     lay->addStretch(1);
 
@@ -1020,6 +1020,6 @@ void KBabelView::wordCount()
     KMessageBox::information( this
 	, i18n("Total words: %1\n\n"
 "Words in untranslated messages: %2\n\n"
-"Words in fuzzy messages: %3").arg(total).arg(untranslated).arg(fuzzy)
+"Words in fuzzy messages: %3").tqarg(total).tqarg(untranslated).tqarg(fuzzy)
 	, i18n("Word Count") );
 }
diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp
index 488a4281..d9f080cb 100644
--- a/kbabel/kbabel/kbbookmarkhandler.cpp
+++ b/kbabel/kbabel/kbbookmarkhandler.cpp
@@ -94,7 +94,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b)
 
   // if it's okay then add the bookmark
   _list.append(b);
-  _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()),
+  _menu->insertItem(TQString("#%1 - %2").tqarg(b->msgindex()).tqarg(b->msgtext()),
     this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex());
 }
 
diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp
index 3b98d355..cd48f274 100644
--- a/kbabel/kbabel/kbcataloglistview.cpp
+++ b/kbabel/kbabel/kbcataloglistview.cpp
@@ -29,7 +29,7 @@
 #include <klocale.h>
 #include <klistview.h>
 #include <tqcolor.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kglobalsettings.h>
 
 using namespace KBabel;
@@ -38,7 +38,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
  : TQWidget(parent)
 {
     m_catalog= catalog;
-    TQVBoxLayout* layout=new TQVBoxLayout(this);
+    TQVBoxLayout* tqlayout=new TQVBoxLayout(this);
     
     m_listview = new KListView(this, "catalogListView");
     m_listview->addColumn(i18n("Id"));
@@ -49,8 +49,8 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe
     m_listview->setAllColumnsShowFocus(true);
     m_listview->resize(this->size());
 
-    layout->addWidget(m_listview);
-    layout->setStretchFactor(m_listview,1);
+    tqlayout->addWidget(m_listview);
+    tqlayout->setStretchFactor(m_listview,1);
     
     connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *)));
 }
diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp
index 4bbc3049..dd14221c 100644
--- a/kbabel/kbabel/kbcataloglistviewitem.cpp
+++ b/kbabel/kbabel/kbcataloglistviewitem.cpp
@@ -38,14 +38,14 @@ void KBCatalogListViewItem::setMsgId(const TQString& st)
 {
     m_msgid = st;
     setup();
-    repaint();
+    tqrepaint();
 }
 
 void KBCatalogListViewItem::setMsgStr(const TQString& st)
 {
     m_msgstr = st;
     setup();
-    repaint();
+    tqrepaint();
 }
 
 uint KBCatalogListViewItem::getId()
@@ -57,7 +57,7 @@ void KBCatalogListViewItem::setId(const uint id)
 {
     m_id = id;
     setup();
-    repaint();
+    tqrepaint();
 }
 
 TQString KBCatalogListViewItem::key ( int column, bool ascending ) const{
diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp
index d9e7daaa..c67d56a7 100644
--- a/kbabel/kbabel/kbhighlighting.cpp
+++ b/kbabel/kbabel/kbhighlighting.cpp
@@ -37,7 +37,7 @@
 #include <tqcolor.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 
 #include "kapplication.h"
 #include <kconfig.h>
@@ -300,7 +300,7 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell )
             this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int)));
 
 	// wait for KSpell to startup correctly
-	kapp->processEvents(500);
+	kapp->tqprocessEvents(500);
     }    
     
     highlight();
diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp
index 85158efa..f36a0b94 100644
--- a/kbabel/kbabel/main.cpp
+++ b/kbabel/kbabel/main.cpp
@@ -242,7 +242,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
     KBabelMW *kb = KBabelMW::winForURL(u,project);
     if(kb)
     {
-        KWin::activateWindow(kb->topLevelWidget()->winId());
+        KWin::activateWindow(kb->tqtopLevelWidget()->winId());
     }
     else
     {
@@ -255,7 +255,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	    if( mw->inherits("KBabelMW") && mw->winId() == window)
     	    {
         	kb = static_cast<KBabelMW*>(mw);
-        	KWin::activateWindow(kb->topLevelWidget()->winId());
+        	KWin::activateWindow(kb->tqtopLevelWidget()->winId());
         	kb->open(u, TQString::fromUtf8(package),newWindow);
 
 		kdDebug () << "Resuming DCOP" << endl;
@@ -272,7 +272,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	{
 	    // here, we don't care about "open in new window", because
 	    // it's empty
-    	    KWin::setActiveWindow(kb->topLevelWidget()->winId());
+    	    KWin::setActiveWindow(kb->tqtopLevelWidget()->winId());
 	    kb->projectOpen(projectFile);
     	    kb->open(u,TQString::fromUtf8(package),false);
 
@@ -289,7 +289,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	    if( mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
     	    {
         	kb = static_cast<KBabelMW*>(mw);
-        	KWin::activateWindow(kb->topLevelWidget()->winId());
+        	KWin::activateWindow(kb->tqtopLevelWidget()->winId());
         	kb->open(u, TQString::fromUtf8(package),newWindow);
 
 		kdDebug () << "Resuming DCOP" << endl;
@@ -305,7 +305,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int
 	    kb = new KBabelMW(project);
     	    kb->show();
 	} else kb = static_cast<KBabelMW*>(mw);
-        KWin::activateWindow(kb->topLevelWidget()->winId());
+        KWin::activateWindow(kb->tqtopLevelWidget()->winId());
         kb->open(u,TQString::fromUtf8(package),newWindow);
     }
     
@@ -331,7 +331,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
     KBabelMW *kb = KBabelMW::winForURL(u, project);
     if(kb)
     {
-        KWin::activateWindow(kb->topLevelWidget()->winId());
+        KWin::activateWindow(kb->tqtopLevelWidget()->winId());
     }
     else
     {
@@ -342,7 +342,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
         if(mw && mw->inherits("KBabelMW") && static_cast<KBabelMW*>(mw)->project()==project)
         {
             kb = static_cast<KBabelMW*>(mw);
-            KWin::activateWindow(kb->topLevelWidget()->winId());
+            KWin::activateWindow(kb->tqtopLevelWidget()->winId());
 	    kb->projectOpen(projectFile);
             kb->openTemplate(t,u,TQString::fromUtf8(package),newWindow);
         }
@@ -350,7 +350,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam
         {
             kb = new KBabelMW(project);
             kb->show();
-            KWin::activateWindow(kb->topLevelWidget()->winId());
+            KWin::activateWindow(kb->tqtopLevelWidget()->winId());
             kb->openTemplate(t,u,TQString::fromUtf8(package));
         }
     }
@@ -505,7 +505,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec
 
 	if(kb)
 	{
-    	    KWin::activateWindow(kb->topLevelWidget()->winId());
+    	    KWin::activateWindow(kb->tqtopLevelWidget()->winId());
 	}
     }
 
diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp
index cc84b3c3..af824fdd 100644
--- a/kbabel/kbabel/mymultilineedit.cpp
+++ b/kbabel/kbabel/mymultilineedit.cpp
@@ -46,7 +46,7 @@
 #include <tqvaluelist.h>
 #include <tqstringlist.h>
 #include <tqregexp.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqapplication.h>
 #include <tqdragobject.h>
 //#include <private/tqrichtext_p.h>
@@ -120,7 +120,7 @@ void MyMultiLineEdit::processCommand(EditCommand* cmd, bool undo)
 
   TQPalette _visibleHighlight( palette() );
   TQPalette _invisibleHighlight( palette() );
-  TQColorGroup newcg( colorGroup() );
+  TQColorGroup newcg( tqcolorGroup() );
   newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
   newcg.setColor( TQColorGroup::Highlight, newcg.base() );
   if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -362,7 +362,7 @@ void MyMultiLineEdit::insert( const TQString & text, bool indent, bool checkNewL
    
    TQPalette _visibleHighlight( palette() );
    TQPalette _invisibleHighlight( palette() );
-   TQColorGroup newcg( colorGroup() );
+   TQColorGroup newcg( tqcolorGroup() );
    newcg.setColor( TQColorGroup::HighlightedText, newcg.text() );
    newcg.setColor( TQColorGroup::Highlight, newcg.base() );
    if( hasFocus() ) _invisibleHighlight.setActive( newcg );
@@ -598,7 +598,7 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const
                 _cleverEditing(false),
                 _highlightBg(false),
                 _spacePoints(false),
-                _bgColor(colorGroup().base().dark(110)),
+                _bgColor(tqcolorGroup().base().dark(110)),
 		_textColor(KGlobalSettings::textColor()),
 		_errorColor(TQt::red),
 		_currentColor(KGlobalSettings::textColor()),
@@ -885,7 +885,7 @@ void MsgMultiLineEdit::setFont(const TQFont& font)
    _wsOffsetX = TQMAX(fm.width(' ')/2-2,1);
    _wsOffsetY = TQMAX(fm.height()/2-1,0);
    
-   repaint();
+   tqrepaint();
 }
 
 void MsgMultiLineEdit::setDiffDisplayMode(bool addUnderline, bool delStrikeOut)
@@ -910,7 +910,7 @@ void MsgMultiLineEdit::setDiffColors(const TQColor& addColor
 void MsgMultiLineEdit::setTextColor(const TQColor &color )
 {
   TQPalette p( palette() );
-  TQColorGroup newcg( colorGroup() );
+  TQColorGroup newcg( tqcolorGroup() );
   newcg.setColor( TQColorGroup::Text, color );
   if( hasFocus() ) p.setActive( newcg );
   else p.setInactive( newcg );
@@ -992,7 +992,7 @@ void MsgMultiLineEdit::paintSpacePoints()
             int i = s.find( " " );
             while( (i >= 0) && (i < (int)s.length()-1) ) // -1 because text will end by EOLN
             {
-                TQPixmap* pm = ( s.at(i).unicode() == 0x00A0U ) ? wsnb : ws;
+                TQPixmap* pm = ( s.tqat(i).tqunicode() == 0x00A0U ) ? wsnb : ws;
                 TQRect r = mapToView( curpara, i );
                 r.moveBy( r.width()/2, (r.height() - fm.descent())/2 );
                 r.moveBy( -pm->rect().width()/2, -pm->rect().height()/2-1 );
@@ -1141,10 +1141,10 @@ void MsgMultiLineEdit::paintSpacePoints()
     }
 }
 
-void MsgMultiLineEdit::repaint()
+void MsgMultiLineEdit::tqrepaint()
 {
     highlight();
-    MyMultiLineEdit::repaint();
+    MyMultiLineEdit::tqrepaint();
 }
 
 void MsgMultiLineEdit::forceUpdate()
@@ -1152,7 +1152,7 @@ void MsgMultiLineEdit::forceUpdate()
     _firstChangedLine=0;
     _lastChangedLine=paragraphs()-1;
     highlighter->highlight();
-    MyMultiLineEdit::repaint();
+    MyMultiLineEdit::tqrepaint();
 }
 
 void MsgMultiLineEdit::ensureCursorVisible()
@@ -1167,7 +1167,7 @@ void MsgMultiLineEdit::highlight()
     
     TQColor bg;
     if( _highlightBg ) bg = _bgColor;
-    else bg = colorGroup().base(); 
+    else bg = tqcolorGroup().base(); 
 
     for( int i = 0 ; i < paragraphs() ; i++ )
 	    setParagraphBackgroundColor( i, bg );
diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h
index ba6a96e6..272878da 100644
--- a/kbabel/kbabel/mymultilineedit.h
+++ b/kbabel/kbabel/mymultilineedit.h
@@ -229,7 +229,7 @@ public slots:
    /**
    *  reimplemented to call highlight()
    */
-   void repaint(); 
+   void tqrepaint(); 
    void forceUpdate();
    void emittedTextChanged();
    
diff --git a/kbabel/kbabel/searchpreferences.ui b/kbabel/kbabel/searchpreferences.ui
index e5177523..c00e537f 100644
--- a/kbabel/kbabel/searchpreferences.ui
+++ b/kbabel/kbabel/searchpreferences.ui
@@ -51,7 +51,7 @@ in the toolbar pressed for a while.&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">
@@ -96,7 +96,7 @@ the desired dictionary from &lt;b&gt;Settings-&gt;Configure Dictionary&lt;/b&gt;
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>31</width>
                     <height>91</height>
diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp
index 7a2965ac..33b0d27b 100644
--- a/kbabel/kbabel/sourceview.cpp
+++ b/kbabel/kbabel/sourceview.cpp
@@ -34,7 +34,7 @@
 #include "sourceview.h"
 #include "context.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -48,11 +48,11 @@ using namespace KBabel;
 SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    layout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    tqlayout->setResizeMode( TQLayout::Minimum );
 
     _contextView = new SourceContext (this, project);
-    layout->addWidget (_contextView);
+    tqlayout->addWidget (_contextView);
     
     connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool)));
 }
diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp
index 751a2701..62d4eba5 100644
--- a/kbabel/kbabel/taglistview.cpp
+++ b/kbabel/kbabel/taglistview.cpp
@@ -33,7 +33,7 @@
 
 #include "taglistview.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 
 #include <kcursor.h>
@@ -47,12 +47,12 @@ using namespace KBabel;
 TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project)
     : KBCatalogView(catalog,parent,project)
 {
-    TQVBoxLayout* layout = new TQVBoxLayout( this );
-    layout->setResizeMode( TQLayout::Minimum );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( this );
+    tqlayout->setResizeMode( TQLayout::Minimum );
 
     _tagBox = new KListBox (this, "taglist textview");
     
-    layout->addWidget (_tagBox);
+    tqlayout->addWidget (_tagBox);
     
     connect(_tagBox,TQT_SIGNAL(selected(const TQString&))
             , this, TQT_SIGNAL(signalTagSelected(const TQString&)));