3 files changed, 16 insertions, 16 deletions
diff --git a/kspread/tests/inspector.cc b/kspread/tests/inspector.cc
index 17179793..f861343c 100644
--- a/kspread/tests/inspector.cc
+++ b/kspread/tests/inspector.cc
@@ -19,9 +19,9 @@
 
 #include "inspector.h"
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include <kdialogbase.h>
 
@@ -65,7 +65,7 @@ static TQString boolAsString( bool b )
 
 static TQString longAsHexstring( long l )
 {
-    return TQString("%1").tqarg(l, 8, 16);
+    return TQString("%1").arg(l, 8, 16);
 }
 
 static TQString dirAsString( Sheet::LayoutDirection dir )
diff --git a/kspread/tests/tester.cc b/kspread/tests/tester.cc
index 05df95d1..cdadeaef 100644
--- a/kspread/tests/tester.cc
+++ b/kspread/tests/tester.cc
@@ -20,7 +20,7 @@
 #include "tester.h"
 
 #include <tqstringlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 using namespace KSpread;
 
diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cc
index 53fe60b3..fa45c9c0 100644
--- a/kspread/tests/testrunner.cc
+++ b/kspread/tests/testrunner.cc
@@ -22,8 +22,8 @@
 #include <tqapplication.h>
 #include <tqdict.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
-#include <tqtextedit.h>
+#include <layout.h>
+#include <textedit.h>
 
 #include <kcombobox.h>
 #include <kdialogbase.h>
@@ -58,23 +58,23 @@ TestRunner::TestRunner():
   d = new Private;
 
   TQFrame* mainWidget = plainPage();
-  TQGridLayout* tqlayout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() );
+  TQGridLayout* layout = new TQGridLayout( mainWidget, 3, 4, marginHint(), spacingHint() );
   setMinimumSize( 360, 230 );
 
   TQLabel* typeLabel = new TQLabel( "Type of Test:", mainWidget );
-  tqlayout->addWidget( typeLabel, 0, 0 );
+  layout->addWidget( typeLabel, 0, 0 );
 
   d->testType = new KComboBox( mainWidget );
-  tqlayout->addWidget( d->testType, 0, 1 );
+  layout->addWidget( d->testType, 0, 1 );
 
-  TQSpacerItem* tqspacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-  tqlayout->addItem( tqspacerItem, 0, 2 );
+  TQSpacerItem* spacerItem = new TQSpacerItem( 10, 10, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
+  layout->addItem( spacerItem, 0, 2 );
 
   d->runButton = new KPushButton( "Run", mainWidget );
-  tqlayout->addWidget( d->runButton, 0, 3 );
+  layout->addWidget( d->runButton, 0, 3 );
 
   d->logView = new TQTextEdit( mainWidget );
-  tqlayout->addMultiCellWidget( d->logView, 2, 2, 0, 3 );
+  layout->addMultiCellWidget( d->logView, 2, 2, 0, 3 );
   d->logView->setTextFormat( TQt::LogText );
 
   TQObject::connect( d->runButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( runTest() ) );
@@ -108,7 +108,7 @@ void TestRunner::runTest()
   if( tester )
   {
     d->logView->clear();
-    d->logView->append( TQString("Test: %1").tqarg( testName ) );
+    d->logView->append( TQString("Test: %1").arg( testName ) );
 
     TQApplication::setOverrideCursor(TQt::waitCursor);
     tester->run();
@@ -117,13 +117,13 @@ void TestRunner::runTest()
     TQStringList errorList = tester->errors();
     if( tester->failed() )
     {
-      d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").tqarg( tester->count() ).
+      d->logView->append( TQString( "%1 tests, <b>%2 failed.</b>").arg( tester->count() ).
         arg(  tester->failed() ) );
       for( unsigned k = 0; k < errorList.count(); k++ )
         d->logView->append( errorList[k] );
     }
     else
-      d->logView->append( TQString( "%1 tests, everything is OK. ").tqarg( tester->count() ) );
+      d->logView->append( TQString( "%1 tests, everything is OK. ").arg( tester->count() ) );
 
     d->logView->append( "Test finished." );
   }