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

This reverts commit 64e14d1bc38e39001b5ec84a6e13198ef3c67315.

1 files changed, 13 insertions, 13 deletions

diff --git a/kbarcode/batchwizard.cpp b/kbarcode/batchwizard.cpp
index 951f4bd..ef1db26 100644
--- a/kbarcode/batchwizard.cpp
+++ b/kbarcode/batchwizard.cpp
@@ -31,12 +31,12 @@
 
 #include <tqbuffer.h>
 #include <tqcheckbox.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcursor.h>
 #include <tqdom.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqsqlselectcursor.h> 
 #include <tqtooltip.h>
@@ -394,7 +394,7 @@ void BatchWizard::setupStackPage4()
     TQFrame* buttons = new TQFrame( stack4 );
     buttons->setMargin( 10 );
 
-    TQVBoxLayout* layout = new TQVBoxLayout( buttons );
+    TQVBoxLayout* tqlayout = new TQVBoxLayout( buttons );
     TQSpacerItem* spacer1 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
     TQSpacerItem* spacer2 = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
 
@@ -413,12 +413,12 @@ void BatchWizard::setupStackPage4()
     TQToolTip::add( buttonRemoveAddress, i18n("Remove selected contacts from the list of contacts which will be printed.") );
     TQToolTip::add( buttonRemoveAllAddress, i18n("Remove all contacts from the list of contacts which will be printed.") );
 
-    layout->addItem( spacer1 );
-    layout->addWidget( buttonAddAllAddress );
-    layout->addWidget( buttonAddAddress );
-    layout->addWidget( buttonRemoveAddress );
-    layout->addWidget( buttonRemoveAllAddress );
-    layout->addItem( spacer2 );
+    tqlayout->addItem( spacer1 );
+    tqlayout->addWidget( buttonAddAllAddress );
+    tqlayout->addWidget( buttonAddAddress );
+    tqlayout->addWidget( buttonRemoveAddress );
+    tqlayout->addWidget( buttonRemoveAllAddress );
+    tqlayout->addItem( spacer2 );
 
     mainLayout->addWidget( list1 );
     mainLayout->addWidget( buttons );
@@ -558,7 +558,7 @@ void BatchWizard::printNow( const TQString & printer, bool bUserInteraction )
     // let's check if the label file does even exist!
     if( !TQFile::exists( m_url->url() ) ) 
     {
-        KMessageBox::error( this, TQString( i18n("The label file %1 was not found") ).arg( m_url->url()) );
+        KMessageBox::error( this, TQString( i18n("The label file %1 was not found") ).tqarg( m_url->url()) );
         return;
     }
 
@@ -747,7 +747,7 @@ bool BatchWizard::addItem( const TQString & article, const TQString & group, int
     TQString temp;
     temp.sprintf("%0*i", 5, sqlList->childCount() + 1 );
 
-    KListViewItem* item = new KListViewItem( sqlList, temp, TQString( "%1" ).arg( count ),
+    KListViewItem* item = new KListViewItem( sqlList, temp, TQString( "%1" ).tqarg( count ),
                           article, group );
     sqlList->insertItem( item );
 
@@ -873,7 +873,7 @@ void BatchWizard::loadFromFile()
 
 void BatchWizard::loadFromClipboard() 
 {
-    TQClipboard *cb = KApplication::clipboard();
+    TQClipboard *cb = KApplication::tqclipboard();
     loadData( cb->text() );
 }
 
@@ -1076,7 +1076,7 @@ bool BatchWizard::fillVarTable()
         file.setCSVFile(true);
 	if( !file.isValid() )
 	{
-	    KMessageBox::error( this, TQString( i18n("Can't open file: %1") ).arg( importCsvFile->url() ) );
+	    KMessageBox::error( this, TQString( i18n("Can't open file: %1") ).tqarg( importCsvFile->url() ) );
 	    return false;
 	}