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

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

1 files changed, 12 insertions, 12 deletions

diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp
index 01aa6b41..572c593c 100644
--- a/kbabel/catalogmanager/catalogmanager.cpp
+++ b/kbabel/catalogmanager/catalogmanager.cpp
@@ -79,7 +79,7 @@
 #include <tqwhatsthis.h>
 #include <tqheader.h>
 #include <tqdragobject.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 
 using namespace KBabel;
@@ -126,7 +126,7 @@ void CatalogManager::init()
    
    if ( _project == NULL )
    {
-	KMessageBox::error( this, i18n("Cannot open project file\n%1").arg(_configFile)
+	KMessageBox::error( this, i18n("Cannot open project file\n%1").tqarg(_configFile)
 	    , i18n("Project File Error"));
 
 	_project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName());
@@ -136,13 +136,13 @@ void CatalogManager::init()
 	, TQT_TQOBJECT(this), TQT_SLOT (updateSettings()));
 
    TQWidget *view = new TQWidget(this);
-   TQVBoxLayout* layout= new TQVBoxLayout(view);
-   layout->setMargin(0);
-   layout->setSpacing(KDialog::spacingHint());
+   TQVBoxLayout* tqlayout= new TQVBoxLayout(view);
+   tqlayout->setMargin(0);
+   tqlayout->setSpacing(KDialog::spacingHint());
 
    _catalogManager=new CatalogManagerView(_project, view,"catalog manager");
-   layout->addWidget(_catalogManager);
-   layout->setStretchFactor(_catalogManager,1);
+   tqlayout->addWidget(_catalogManager);
+   tqlayout->setStretchFactor(_catalogManager,1);
 
    connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings))
             ,TQT_TQOBJECT(_catalogManager),TQT_SLOT(setSettings(KBabel::CatManSettings)));
@@ -162,7 +162,7 @@ void CatalogManager::init()
    KWin::setIcons(winId(),BarIcon("catalogmanager",32)
            ,SmallIcon("catalogmanager"));
 
-   TQHBoxLayout* hBoxL = new TQHBoxLayout(layout);
+   TQHBoxLayout* hBoxL = new TQHBoxLayout(tqlayout);
    _progressLabel = new TQLabel(view);
    hBoxL->addWidget(_progressLabel);
    _progressBar=new KProgress(view);
@@ -431,7 +431,7 @@ void CatalogManager::setupActions()
     (void)new KAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager),
       TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" );
     (void)new KAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager),
-      TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" );
+      TQT_SLOT( cvstqStatus( ) ), actionCollection( ), "cvs_status" );
     (void)new KAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager),
       TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" );
     (void)new KAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager),
@@ -552,7 +552,7 @@ void CatalogManager::setupStatusBar()
     _statusProgressBar->hide();
 
     statusBar()->addWidget(progressBox,1);
-    statusBar()->setMinimumHeight(_statusProgressBar->sizeHint().height());
+    statusBar()->setMinimumHeight(_statusProgressBar->tqsizeHint().height());
 
     TQWhatsThis::add(statusBar(),
 	i18n("<qt><p><b>Statusbar</b></p>\n"
@@ -912,7 +912,7 @@ void CatalogManager::clearStatusProgressBar()
 
 void CatalogManager::setNumberOfFound(int toBeSent, int total)
 {
-    _foundLabel->setText(i18n("Found: %1/%2").arg(toBeSent).arg(total));
+    _foundLabel->setText(i18n("Found: %1/%2").tqarg(toBeSent).tqarg(total));
 }
 
 void CatalogManager::decreaseNumberOfFound()
@@ -1232,7 +1232,7 @@ void CatalogManager::projectOpen()
     }
     else
     {
-	KMessageBox::error (this, i18n("Cannot open project file %1").arg(file));
+	KMessageBox::error (this, i18n("Cannot open project file %1").tqarg(file));
     }
 }