expand tabs and related whitespace fixes in *.{cpp,h,qdoc}

the diff -w for this commit is empty.

Started-by: Thiago Macieira <thiago.macieira@intel.com>
Change-Id: I77bb84e71c63ce75e0709e5b94bee18e3ce6ab9e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

19 files changed, 669 insertions, 669 deletions

diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index 5016abff4f..254428958e 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -194,9 +194,9 @@ void tst_QImage::create()
 #if !defined(Q_OS_WINCE)
     QT_TRY {
 #endif
-	//QImage image(7000000, 7000000, 8, 256, QImage::IgnoreEndian);
-    QImage image(7000000, 7000000, QImage::Format_Indexed8);
-    image.setColorCount(256);
+        //QImage image(7000000, 7000000, 8, 256, QImage::IgnoreEndian);
+        QImage image(7000000, 7000000, QImage::Format_Indexed8);
+        image.setColorCount(256);
         cr = !image.isNull();
 #if !defined(Q_OS_WINCE)
     } QT_CATCH (...) {
@@ -309,16 +309,16 @@ void tst_QImage::formatHandlersInput()
     bool formatSupported = false;
     for (QList<QByteArray>::Iterator it = formats.begin(); it != formats.end(); ++it) {
         if (*it == testFormat.toLower()) {
-	    formatSupported = true;
-	    break;
-	}
+            formatSupported = true;
+            break;
+        }
     }
     if (formatSupported) {
 //     qDebug(QImage::imageFormat(testFile));
-	QCOMPARE(testFormat.toLatin1().toLower(), QImageReader::imageFormat(testFile));
+        QCOMPARE(testFormat.toLatin1().toLower(), QImageReader::imageFormat(testFile));
     } else {
-	QString msg = "Format not supported : ";
-	QSKIP(QString(msg + testFormat).toLatin1());
+        QString msg = "Format not supported : ";
+        QSKIP(QString(msg + testFormat).toLatin1());
     }
 }
 
diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 085dfd0461..761f6371db 100644
--- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -1468,7 +1468,7 @@ static QModelIndex indexFromText(QStandardItemModel *model, const QString &text)
 struct FriendlyTreeView : public QTreeView
 {
     friend class tst_QStandardItemModel;
-	Q_DECLARE_PRIVATE(QTreeView)
+    Q_DECLARE_PRIVATE(QTreeView)
 };
 #endif
 
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index bd7bd3a464..161a1692ca 100644
--- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
@@ -528,7 +528,7 @@ void tst_QKeySequence::toStringFromKeycode()
 
 void tst_QKeySequence::streamOperators_data()
 {
-	operatorQString_data();
+    operatorQString_data();
 }
 
 void tst_QKeySequence::streamOperators()
@@ -536,21 +536,21 @@ void tst_QKeySequence::streamOperators()
     QFETCH( int, modifiers );
     QFETCH( int, keycode );
 
-	QByteArray data;
-	QKeySequence refK( modifiers | keycode );
-	QKeySequence orgK( "Ctrl+A" );
-	QKeySequence copyOrgK = orgK;
-	QVERIFY( copyOrgK == orgK );
+    QByteArray data;
+    QKeySequence refK( modifiers | keycode );
+    QKeySequence orgK( "Ctrl+A" );
+    QKeySequence copyOrgK = orgK;
+    QVERIFY( copyOrgK == orgK );
 
-	QDataStream in(&data, QIODevice::WriteOnly);
-	in << refK;
-        QDataStream out(&data, QIODevice::ReadOnly);
-        out >> orgK;
+    QDataStream in(&data, QIODevice::WriteOnly);
+    in << refK;
+    QDataStream out(&data, QIODevice::ReadOnly);
+    out >> orgK;
 
-	QVERIFY( orgK == refK );
+    QVERIFY( orgK == refK );
 
-	// check if detached
-	QVERIFY( orgK != copyOrgK );
+    // check if detached
+    QVERIFY( orgK != copyOrgK );
 }
 
 
diff --git a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
index 424b5fea3a..828c1fc41f 100644
--- a/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
+++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
@@ -61,21 +61,21 @@ public:
 protected:
     void mousePressEvent(QMouseEvent *e)
     {
-    QWindow::mousePressEvent(e);
-	mousePressButton = e->button();
-	mousePressButtons = e->buttons();
-	mousePressModifiers = e->modifiers();
-	mousePressEventRecieved = true;
-	e->accept();
+        QWindow::mousePressEvent(e);
+        mousePressButton = e->button();
+        mousePressButtons = e->buttons();
+        mousePressModifiers = e->modifiers();
+        mousePressEventRecieved = true;
+        e->accept();
     }
     void mouseReleaseEvent(QMouseEvent *e)
     {
-    QWindow::mouseReleaseEvent(e);
-	mouseReleaseButton = e->button();
-	mouseReleaseButtons = e->buttons();
-	mouseReleaseModifiers = e->modifiers();
-	mouseReleaseEventRecieved = true;
-	e->accept();
+        QWindow::mouseReleaseEvent(e);
+        mouseReleaseButton = e->button();
+        mouseReleaseButtons = e->buttons();
+        mouseReleaseModifiers = e->modifiers();
+        mouseReleaseEventRecieved = true;
+        e->accept();
     }
 };
 
diff --git a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
index ef800bd995..48f079a24e 100644
--- a/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
+++ b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
@@ -183,9 +183,9 @@ TstWidget::TstWidget()
 
     connect( pb, SIGNAL(pressed()), this, SLOT(buttonPressed()) );
 
-//	QScrollBar *sb = new QScrollBar( Qt::Horizontal,  this );
+//    QScrollBar *sb = new QScrollBar( Qt::Horizontal,  this );
 
-//	sb->setGeometry( 5, pb->geometry().bottom() + 5, 100, sb->sizeHint().height() );
+//    sb->setGeometry( 5, pb->geometry().bottom() + 5, 100, sb->sizeHint().height() );
 
     d = new TstDialog( pb, this , 0 );
 }
@@ -218,8 +218,8 @@ void TstDialog::releaseMouse()
 void TstDialog::closeDialog()
 {
     if ( isVisible() ) {
-	c++;
-	accept();
+        c++;
+        accept();
     }
 }
 
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index 27c0f6e66a..d288665c44 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -511,7 +511,7 @@ void tst_QPainter::drawPixmap_comp()
     bool different = false;
     for (int y=0; y<result.height(); ++y)
         for (int x=0; x<result.width(); ++x) {
-	    bool diff;
+            bool diff;
             if (qAlpha(expected) == 0) {
                 diff = qAlpha(result.pixel(x, y)) != 0;
             } else {
@@ -523,12 +523,12 @@ void tst_QPainter::drawPixmap_comp()
                              || (qAbs(qBlue(pix) - qBlue(expected)) > off)
                              || (qAbs(qAlpha(pix) - qAlpha(expected)) > off);
             }
-	    if (diff && !different)
-		qDebug( "Different at %d,%d pixel [%d,%d,%d,%d] expected [%d,%d,%d,%d]", x, y,
+            if (diff && !different)
+                qDebug( "Different at %d,%d pixel [%d,%d,%d,%d] expected [%d,%d,%d,%d]", x, y,
                         qRed(result.pixel(x, y)), qGreen(result.pixel(x, y)),
                         qBlue(result.pixel(x, y)), qAlpha(result.pixel(x, y)),
                         qRed(expected), qGreen(expected), qBlue(expected), qAlpha(expected));
-	    different |= diff;
+            different |= diff;
         }
 
     QVERIFY(!different);
@@ -560,24 +560,24 @@ void tst_QPainter::saveAndRestore_data()
     QRect viewport = p.viewport();
 
     QTest::newRow("Original") << font << pen << brush << backgroundColor << int(backgroundMode)
-	    << brushOrigin << clipRegion << window << viewport;
+            << brushOrigin << clipRegion << window << viewport;
 
     QFont font2 = font;
     font2.setPointSize( 24 );
     QTest::newRow("Modified font.pointSize, brush, backgroundColor, backgroundMode")
             << font2 << pen << QBrush(Qt::red) << QColor(Qt::blue) << int(Qt::TransparentMode)
-	    << brushOrigin << clipRegion << window << viewport;
+            << brushOrigin << clipRegion << window << viewport;
 
     font2 = font;
     font2.setPixelSize( 20 );
     QTest::newRow("Modified font.pixelSize, brushOrigin, pos")
             << font2 << pen << brush << backgroundColor << int(backgroundMode)
-	    << QPoint( 50, 32 ) << clipRegion << window << viewport;
+            << QPoint( 50, 32 ) << clipRegion << window << viewport;
 
     QTest::newRow("Modified clipRegion, window, viewport")
             << font << pen << brush << backgroundColor << int(backgroundMode)
-	    << brushOrigin << clipRegion.subtracted(QRect(10,10,50,30))
-	    << QRect(-500, -500, 500, 500 ) << QRect( 0, 0, 50, 50 );
+            << brushOrigin << clipRegion.subtracted(QRect(10,10,50,30))
+            << QRect(-500, -500, 500, 500 ) << QRect( 0, 0, 50, 50 );
 }
 
 void tst_QPainter::saveAndRestore()
@@ -662,13 +662,13 @@ QBitmap tst_QPainter::getBitmap( const QString &dir, const QString &filename, bo
         return QBitmap();
     }
     if ( mask ) {
-	QBitmap mask;
-	QString maskFilename = dir + QString( "/%1-mask.xbm" ).arg( filename );
-	if ( !mask.load( maskFilename ) ) {
-        QWARN(QString("Could not load mask '%1'").arg(maskFilename).toLatin1());
-        return QBitmap();
-	}
-	bm.setMask( mask );
+        QBitmap mask;
+        QString maskFilename = dir + QString( "/%1-mask.xbm" ).arg( filename );
+        if (!mask.load(maskFilename)) {
+            QWARN(QString("Could not load mask '%1'").arg(maskFilename).toLatin1());
+            return QBitmap();
+        }
+        bm.setMask( mask );
     }
     return bm;
 }
@@ -698,17 +698,17 @@ static QRect getPaintedSize(const QImage &image, const QColor &background)
     uint color = background.rgba();
 
     for ( int y = 0; y < image.height(); ++y ) {
-	for ( int x = 0; x < image.width(); ++x ) {
+        for (int x = 0; x < image.width(); ++x) {
             QRgb pixel = image.pixel( x, y );
-	    if ( pixel != color && x < xmin )
-		xmin = x;
-	    if ( pixel != color && x > xmax )
-		xmax = x;
-	    if ( pixel != color && y < ymin )
-		ymin = y;
-	    if ( pixel != color && y > ymax )
-		ymax = y;
-	}
+            if (pixel != color && x < xmin)
+                xmin = x;
+            if (pixel != color && x > xmax)
+                xmax = x;
+            if (pixel != color && y < ymin)
+                ymin = y;
+            if (pixel != color && y > ymax)
+                ymax = y;
+        }
     }
 
     return QRect(xmin, ymin, xmax - xmin + 1, ymax - ymin + 1);
diff --git a/tests/auto/gui/painting/qpainter/utils/createImages/main.cpp b/tests/auto/gui/painting/qpainter/utils/createImages/main.cpp
index 11ce8b947b..a6bf4eca8b 100644
--- a/tests/auto/gui/painting/qpainter/utils/createImages/main.cpp
+++ b/tests/auto/gui/painting/qpainter/utils/createImages/main.cpp
@@ -61,15 +61,15 @@ static QPixmap createDestPixmap()
     QPainter painter;
     painter.begin( &pm );
     for ( int i=0; i<colorbands; i++ ) {
-	for ( int j=0; j<intensities; j++ ) {
-	    int intensity = 255 * (j+1) / intensities; // 25%, 50%, 75% and 100%
-	    for ( int k=0; k<8; k++ ) {
-		QColor col = baseColor( k, intensity );
-		painter.setPen( QPen( col, 1 ) );
-		painter.setBrush( col );
-		painter.drawRect( k*4, j*4 + i*intensities*4, 4, 4 );
-	    }
-	}
+        for (int j = 0; j < intensities; j++) {
+            int intensity = 255 * (j+1) / intensities; // 25%, 50%, 75% and 100%
+            for (int k = 0; k < 8; k++) {
+                QColor col = baseColor(k, intensity);
+                painter.setPen(QPen(col, 1));
+                painter.setBrush(col);
+                painter.drawRect(k*4, j*4 + i*intensities*4, 4, 4);
+            }
+        }
     }
     painter.end();
     return pm;
@@ -127,14 +127,14 @@ static QBitmap createSrcBitmap( int size, int border )
     painter.drawRect( border, border, size, size2 );
     painter.end();
     if ( border > 0 ) {
-	QBitmap mask( totalSize, totalSize, true );
-	QPainter painter;
-	painter.begin( &mask );
-	painter.setPen( QPen( Qt::color1, 1 ) );
-	painter.setBrush( Qt::color1 );
-	painter.drawRect( border, border, size, size );
-	painter.end();
-	bm.setMask( mask );
+        QBitmap mask(totalSize, totalSize, true);
+        QPainter painter;
+        painter.begin(&mask);
+        painter.setPen(QPen(Qt::color1, 1));
+        painter.setBrush(Qt::color1);
+        painter.drawRect(border, border, size, size);
+        painter.end();
+        bm.setMask(mask);
     }
     return bm;
 }
@@ -146,49 +146,49 @@ int main( int argc, char **argv )
 
     // input for tst_QPainter::drawLine_rop_bitmap()
     {
-	QBitmap dst = createDestBitmap();
-	dst.save( "../../drawLine_rop_bitmap/dst.xbm", "XBM" );
+        QBitmap dst = createDestBitmap();
+        dst.save("../../drawLine_rop_bitmap/dst.xbm", "XBM");
     }
 
     // input for tst_QPainter::drawPixmap_rop_bitmap()
     {
-	QBitmap dst = createDestBitmap();
-	QBitmap src1 = createSrcBitmap( 4, 2 );
-	QBitmap src2 = createSrcBitmap( 4, 0 );
-	dst.save( "../../drawPixmap_rop_bitmap/dst.xbm", "XBM" );
-	src1.save( "../../drawPixmap_rop_bitmap/src1.xbm", "XBM" );
-	src1.mask()->save( "../../drawPixmap_rop_bitmap/src1-mask.xbm", "XBM" );
-	src2.save( "../../drawPixmap_rop_bitmap/src2.xbm", "XBM" );
+        QBitmap dst = createDestBitmap();
+        QBitmap src1 = createSrcBitmap(4, 2);
+        QBitmap src2 = createSrcBitmap(4, 0);
+        dst.save("../../drawPixmap_rop_bitmap/dst.xbm", "XBM");
+        src1.save("../../drawPixmap_rop_bitmap/src1.xbm", "XBM");
+        src1.mask()->save("../../drawPixmap_rop_bitmap/src1-mask.xbm", "XBM");
+        src2.save("../../drawPixmap_rop_bitmap/src2.xbm", "XBM");
     }
 
     // input for tst_QPainter::drawPixmap_rop()
     {
-	QPixmap dst1 = createDestPixmap();
-	QPixmap dst2 = createDestPixmap();
-	dst2.resize( 32, 32 );
-	QBitmap src1 = createSrcBitmap( 32, 0 );
+        QPixmap dst1 = createDestPixmap();
+        QPixmap dst2 = createDestPixmap();
+        dst2.resize(32, 32);
+        QBitmap src1 = createSrcBitmap(32, 0);
 
-	QBitmap src_tmp = createSrcBitmap( 32, 0 ).xForm( QWMatrix( 1, 0, 0, -1, 0, 0 ) );
-	src_tmp.resize( 32, 48 );
-	QBitmap src2 = src_tmp.xForm( QWMatrix( 1, 0, 0, -1, 0, 0 ) );
-	QBitmap mask( 32, 48, true );
-	{
-	    QPainter painter;
-	    painter.begin( &mask );
-	    painter.setPen( QPen( Qt::color1, 1 ) );
-	    painter.setBrush( Qt::color1 );
-	    painter.drawRect( 0, 16, 32, 32 );
-	    painter.end();
-	}
-	src2.setMask( mask );
+        QBitmap src_tmp = createSrcBitmap(32, 0).xForm(QWMatrix(1, 0, 0, -1, 0, 0));
+        src_tmp.resize(32, 48);
+        QBitmap src2 = src_tmp.xForm(QWMatrix(1, 0, 0, -1, 0, 0));
+        QBitmap mask(32, 48, true);
+        {
+            QPainter painter;
+            painter.begin(&mask);
+            painter.setPen(QPen(Qt::color1, 1));
+            painter.setBrush(Qt::color1);
+            painter.drawRect(0, 16, 32, 32);
+            painter.end();
+        }
+        src2.setMask(mask);
 
-	QBitmap src3 = createSrcBitmap( 32, 0 ).xForm( QWMatrix( 1, 0, 0, -1, 0, 0 ) );
+        QBitmap src3 = createSrcBitmap(32, 0).xForm(QWMatrix(1, 0, 0, -1, 0, 0));
 
-	dst1.save( "../../drawPixmap_rop/dst1.png", "PNG" );
-	dst2.save( "../../drawPixmap_rop/dst2.png", "PNG" );
-	src1.save( "../../drawPixmap_rop/src1.xbm", "XBM" );
-	src2.save( "../../drawPixmap_rop/src2.xbm", "XBM" );
-	src2.mask()->save( "../../drawPixmap_rop/src2-mask.xbm", "XBM" );
-	src3.save( "../../drawPixmap_rop/src3.xbm", "XBM" );
+        dst1.save("../../drawPixmap_rop/dst1.png", "PNG");
+        dst2.save("../../drawPixmap_rop/dst2.png", "PNG");
+        src1.save("../../drawPixmap_rop/src1.xbm", "XBM");
+        src2.save("../../drawPixmap_rop/src2.xbm", "XBM");
+        src2.mask()->save("../../drawPixmap_rop/src2-mask.xbm", "XBM");
+        src3.save("../../drawPixmap_rop/src3.xbm", "XBM");
     }
 }
diff --git a/tests/auto/gui/painting/qpen/tst_qpen.cpp b/tests/auto/gui/painting/qpen/tst_qpen.cpp
index 1444c4fc16..07c996d026 100644
--- a/tests/auto/gui/painting/qpen/tst_qpen.cpp
+++ b/tests/auto/gui/painting/qpen/tst_qpen.cpp
@@ -114,23 +114,23 @@ void tst_QPen::operator_eq_eq_data()
     QTest::addColumn<bool>("isEqual");
 
     QTest::newRow("differentColor") << QPen(Qt::red)
-				 << QPen(Qt::blue)
-				 << false;
+                                    << QPen(Qt::blue)
+                                    << false;
     QTest::newRow("differentWidth") << QPen(Qt::red, 2)
-				 << QPen(Qt::red, 3)
-				 << false;
+                                    << QPen(Qt::red, 3)
+                                    << false;
     QTest::newRow("differentPenStyle") << QPen(Qt::red, 2, Qt::DashLine)
-				    << QPen(Qt::red, 2, Qt::DotLine)
-				    << false;
+                                       << QPen(Qt::red, 2, Qt::DotLine)
+                                       << false;
     QTest::newRow("differentCapStyle") << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::BevelJoin)
-				    << QPen(Qt::red, 2, Qt::DashLine, Qt::SquareCap, Qt::BevelJoin)
-				    << false;
+                                       << QPen(Qt::red, 2, Qt::DashLine, Qt::SquareCap, Qt::BevelJoin)
+                                       << false;
     QTest::newRow("differentJoinStyle") << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::BevelJoin)
-				     << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::MiterJoin)
-				     << false;
+                                        << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::MiterJoin)
+                                        << false;
     QTest::newRow("same") << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::BevelJoin)
-		       << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::BevelJoin)
-		       << true;
+                          << QPen(Qt::red, 2, Qt::DashLine, Qt::RoundCap, Qt::BevelJoin)
+                          << true;
 
 }
 
diff --git a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
index 4a659a3159..07670b2ae2 100644
--- a/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
+++ b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
@@ -77,11 +77,11 @@ void tst_QPolygon::makeEllipse()
     // make sure that all points are R+-1 away from the center
     bool err = false;
     for (i = 1; i < pa.size(); i++) {
-	QPoint p = pa.at( i );
-	double r = sqrt( pow( double(p.x() - R), 2.0 ) + pow( double(p.y() - R), 2.0 ) );
-	// ### too strict ? at least from visual inspection it looks
-	// quite odd around the main axes. 2.0 passes easily.
-	err |= ( qAbs( r - double(R) ) > 2.0 );
+        QPoint p = pa.at(i);
+        double r = sqrt(pow(double(p.x() - R), 2.0) + pow(double(p.y() - R), 2.0));
+        // ### too strict ? at least from visual inspection it looks
+        // quite odd around the main axes. 2.0 passes easily.
+        err |= (qAbs(r - double(R)) > 2.0);
     }
     QVERIFY( !err );
 }
diff --git a/tests/auto/gui/painting/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp
index c099611755..121d98e653 100644
--- a/tests/auto/gui/painting/qregion/tst_qregion.cpp
+++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp
@@ -109,19 +109,19 @@ tst_QRegion::tst_QRegion()
 void tst_QRegion::boundingRect()
 {
     {
-	QRect rect;
-	QRegion region( rect );
-	QCOMPARE( region.boundingRect(), rect );
+        QRect rect;
+        QRegion region(rect);
+        QCOMPARE(region.boundingRect(), rect);
     }
     {
-	QRect rect( 10, -20, 30, 40 );
-	QRegion region( rect );
-	QCOMPARE( region.boundingRect(), rect );
+        QRect rect(10, -20, 30, 40);
+        QRegion region(rect);
+        QCOMPARE(region.boundingRect(), rect);
     }
     {
-	QRect rect(15,25,10,10);
-	QRegion region( rect );
-	QCOMPARE( region.boundingRect(), rect );
+        QRect rect(15,25,10,10);
+        QRegion region(rect);
+        QCOMPARE(region.boundingRect(), rect);
     }
 
 }
@@ -129,75 +129,75 @@ void tst_QRegion::boundingRect()
 void tst_QRegion::rects()
 {
     {
-	QRect rect;
-	QRegion region( rect );
-	QVERIFY( region.isEmpty() );
-	QVERIFY( region.rects().isEmpty() );
+        QRect rect;
+        QRegion region(rect);
+        QVERIFY(region.isEmpty());
+        QVERIFY(region.rects().isEmpty());
     }
     {
-	QRect rect( 10, -20, 30, 40 );
-	QRegion region( rect );
-	QCOMPARE( region.rects().count(), 1 );
-	QCOMPARE( region.rects()[0], rect );
+        QRect rect(10, -20, 30, 40);
+        QRegion region(rect);
+        QCOMPARE(region.rects().count(), 1);
+        QCOMPARE(region.rects()[0], rect);
     }
     {
-	QRect r( QPoint(10, 10), QPoint(40, 40) );
-	QRegion region( r );
-	QVERIFY( region.contains( QPoint(10,10) ) );
-	QVERIFY( region.contains( QPoint(20,40) ) );
-	QVERIFY( region.contains( QPoint(40,20) ) );
-	QVERIFY( !region.contains( QPoint(20,41) ) );
-	QVERIFY( !region.contains( QPoint(41,20) ) );
+        QRect r(QPoint(10, 10), QPoint(40, 40));
+        QRegion region(r);
+        QVERIFY(region.contains(QPoint(10,10)));
+        QVERIFY(region.contains(QPoint(20,40)));
+        QVERIFY(region.contains(QPoint(40,20)));
+        QVERIFY(!region.contains(QPoint(20,41)));
+        QVERIFY(!region.contains(QPoint(41,20)));
     }
     {
-	QRect r( 10, 10, 30, 30 );
-	QRegion region( r );
-	QVERIFY( region.contains( QPoint(10,10) ) );
-	QVERIFY( region.contains( QPoint(20,39) ) );
-	QVERIFY( region.contains( QPoint(39,20) ) );
-	QVERIFY( !region.contains( QPoint(20,40) ) );
-	QVERIFY( !region.contains( QPoint(40,20) ) );
+        QRect r(10, 10, 30, 30);
+        QRegion region(r);
+        QVERIFY(region.contains(QPoint(10,10)));
+        QVERIFY(region.contains(QPoint(20,39)));
+        QVERIFY(region.contains(QPoint(39,20)));
+        QVERIFY(!region.contains(QPoint(20,40)));
+        QVERIFY(!region.contains(QPoint(40,20)));
     }
 }
 
 void tst_QRegion::swap()
 {
-    QRegion r1(QRect( 0, 0,10,10));
+    QRegion r1(QRect(0, 0,10,10));
     QRegion r2(QRect(10,10,10,10));
     r1.swap(r2);
     QCOMPARE(r1.rects().front(), QRect(10,10,10,10));
-    QCOMPARE(r2.rects().front(), QRect( 0, 0,10,10));
+    QCOMPARE(r2.rects().front(), QRect(0, 0,10,10));
 }
 
 void tst_QRegion::setRects()
 {
     {
-	QRegion region;
-	region.setRects( 0, 0 );
-	QVERIFY( region.rects().isEmpty() );
+        QRegion region;
+        region.setRects(0, 0);
+        QVERIFY(region.rects().isEmpty());
     }
     {
-	QRegion region;
-	QRect rect;
-	region.setRects( &rect, 0 );
+        QRegion region;
+        QRect rect;
+        region.setRects(&rect, 0);
         QVERIFY(region.isEmpty());
         QVERIFY(region == QRegion());
-	QVERIFY(!region.boundingRect().isValid());
-	QVERIFY(region.rects().isEmpty());
+        QVERIFY(!region.boundingRect().isValid());
+        QVERIFY(region.rects().isEmpty());
     }
     {
-	QRegion region;
-	QRect rect;
-	region.setRects( &rect, 1 );
-	QVERIFY( !region.boundingRect().isValid() );
-	QVERIFY( region.rects().isEmpty() );
+        QRegion region;
+        QRect rect;
+        region.setRects(&rect, 1);
+        QVERIFY(!region.boundingRect().isValid());
+        QVERIFY(region.rects().isEmpty());
     }
     {
-	QRegion region;
-	QRect rect( 10, -20, 30, 40 );
-	region.setRects( &rect, 1 );
-	QCOMPARE( region.rects().count(), 1 );
-	QCOMPARE( region.rects()[0], rect );
+        QRegion region;
+        QRect rect(10, -20, 30, 40);
+        region.setRects(&rect, 1);
+        QCOMPARE(region.rects().count(), 1);
+        QCOMPARE(region.rects()[0], rect);
     }
 }
 
@@ -242,30 +242,30 @@ void tst_QRegion::polygonRegion()
 {
     QPolygon pa;
     {
-	QRegion region ( pa );
-	QVERIFY( region.isEmpty() );
+        QRegion region (pa);
+        QVERIFY(region.isEmpty());
     }
     {
-	pa.setPoints( 8, 10, 10, //  a____________b
-			 40, 10, //  |            |
-			 40, 20, //  |___      ___|
-			 30, 20, //      |    |
-			 30, 40, //      |    |
-			 20, 40, //      |    |
-			 20, 20, //      |____c
-			 10, 20 );
+        pa.setPoints(8, 10, 10, //  a____________b
+                        40, 10, //  |            |
+                        40, 20, //  |___      ___|
+                        30, 20, //      |    |
+                        30, 40, //      |    |
+                        20, 40, //      |    |
+                        20, 20, //      |____c
+                        10, 20);
 
-	QRegion region ( pa );
-	QVERIFY( !region.isEmpty() );
+        QRegion region (pa);
+        QVERIFY(!region.isEmpty());
 
-	// These should not be inside the circle
-	QVERIFY( !region.contains( QPoint(  9,  9 ) ) );
-	QVERIFY( !region.contains( QPoint( 30, 41 ) ) );
-	QVERIFY( !region.contains( QPoint( 41, 10 ) ) );
-	QVERIFY( !region.contains( QPoint( 31, 21 ) ) );
+        // These should not be inside the circle
+        QVERIFY(!region.contains(QPoint( 9,  9)));
+        QVERIFY(!region.contains(QPoint(30, 41)));
+        QVERIFY(!region.contains(QPoint(41, 10)));
+        QVERIFY(!region.contains(QPoint(31, 21)));
 
-	// These should be inside
-	QVERIFY( region.contains( QPoint( 10, 10 ) ) ); // Upper-left  (a)
+        // These should be inside
+        QVERIFY(region.contains(QPoint(10, 10))); // Upper-left  (a)
 
     }
 }
@@ -317,8 +317,8 @@ void tst_QRegion::emptyPolygonRegion()
 
 static const char *circle_xpm[] = {
     "20 20 2 1",
-    "	c #FFFFFF",
-    ".	c #000000",
+    "  c #FFFFFF",
+    ". c #000000",
     "       ......       ",
     "     ..........     ",
     "   ..............   ",
@@ -345,29 +345,29 @@ void tst_QRegion::bitmapRegion()
 {
     QBitmap circle;
     {
-	QRegion region( circle );
-	QVERIFY( region.isEmpty() );
+        QRegion region(circle);
+        QVERIFY(region.isEmpty());
     }
     {
-	circle = QPixmap( circle_xpm );
-	QRegion region( circle );
-
-	//// These should not be inside the circe
-	QVERIFY( !region.contains( QPoint( 2,   2 ) ) );
-	QVERIFY( !region.contains( QPoint( 2,  17 ) ) );
-	QVERIFY( !region.contains( QPoint( 17,  2 ) ) );
-	QVERIFY( !region.contains( QPoint( 17, 17 ) ) );
-
-	//// These should be inside
-	QVERIFY( region.contains( QPoint( 3,   3 ) ) );
-	QVERIFY( region.contains( QPoint( 3,  16 ) ) );
-	QVERIFY( region.contains( QPoint( 16,  3 ) ) );
-	QVERIFY( region.contains( QPoint( 16, 16 ) ) );
-
-	QVERIFY( region.contains( QPoint( 0, 10 ) ) );  // Mid-left
-	QVERIFY( region.contains( QPoint( 10, 0 ) ) );  // Mid-top
-	QVERIFY( region.contains( QPoint( 19, 10 ) ) ); // Mid-right
-	QVERIFY( region.contains( QPoint( 10, 19 ) ) ); // Mid-bottom
+        circle = QPixmap(circle_xpm);
+        QRegion region(circle);
+
+        //// These should not be inside the circe
+        QVERIFY(!region.contains(QPoint(2,   2)));
+        QVERIFY(!region.contains(QPoint(2,  17)));
+        QVERIFY(!region.contains(QPoint(17,  2)));
+        QVERIFY(!region.contains(QPoint(17, 17)));
+
+        //// These should be inside
+        QVERIFY(region.contains(QPoint(3,   3)));
+        QVERIFY(region.contains(QPoint(3,  16)));
+        QVERIFY(region.contains(QPoint(16,  3)));
+        QVERIFY(region.contains(QPoint(16, 16)));
+
+        QVERIFY(region.contains(QPoint(0, 10)));  // Mid-left
+        QVERIFY(region.contains(QPoint(10, 0)));  // Mid-top
+        QVERIFY(region.contains(QPoint(19, 10))); // Mid-right
+        QVERIFY(region.contains(QPoint(10, 19))); // Mid-bottom
     }
 }
 
diff --git a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
index 4c73676329..c62ca3fa38 100644
--- a/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
+++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
@@ -112,47 +112,47 @@ void tst_QWMatrix::mapping_data()
     //next we fill it with data
 
     // identity
-    QTest::newRow( "identity" )  << QMatrix( 1, 0, 0, 1, 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-			       << QPolygon( QRect( 10, 20, 30, 40 ) );
+    QTest::newRow( "identity" ) << QMatrix( 1, 0, 0, 1, 0, 0 )
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon( QRect( 10, 20, 30, 40 ) );
     // scaling
     QTest::newRow( "scale 0" )  << QMatrix( 2, 0, 0, 2, 0, 0 )
-			      << QRect( 10, 20, 30, 40 )
-			      << QPolygon( QRect( 20, 40, 60, 80 ) );
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon( QRect( 20, 40, 60, 80 ) );
     QTest::newRow( "scale 1" )  << QMatrix( 10, 0, 0, 10, 0, 0 )
-			      << QRect( 10, 20, 30, 40 )
-			      << QPolygon( QRect( 100, 200, 300, 400 ) );
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon( QRect( 100, 200, 300, 400 ) );
     // mirroring
-    QTest::newRow( "mirror 0" )  << QMatrix( -1, 0, 0, 1, 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-			       << QPolygon( QRect( -40, 20, 30, 40 ) );
-    QTest::newRow( "mirror 1" )  << QMatrix( 1, 0, 0, -1, 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-			       << QPolygon( QRect( 10, -60, 30, 40 ) );
-    QTest::newRow( "mirror 2" )  << QMatrix( -1, 0, 0, -1, 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-			       << QPolygon( QRect( -40, -60, 30, 40 ) );
-    QTest::newRow( "mirror 3" )  << QMatrix( -2, 0, 0, -2, 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-			       << QPolygon( QRect( -80, -120, 60, 80 ) );
-    QTest::newRow( "mirror 4" )  << QMatrix( -10, 0, 0, -10, 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-			       << QPolygon( QRect( -400, -600, 300, 400 ) );
-    QTest::newRow( "mirror 5" )  << QMatrix( -1, 0, 0, 1, 0, 0 )
-			       << QRect( 0, 0, 30, 40 )
-			       << QPolygon( QRect( -30, 0, 30, 40 ) );
-    QTest::newRow( "mirror 6" )  << QMatrix( 1, 0, 0, -1, 0, 0 )
-			       << QRect( 0, 0, 30, 40 )
-			       << QPolygon( QRect( 0, -40, 30, 40 ) );
-    QTest::newRow( "mirror 7" )  << QMatrix( -1, 0, 0, -1, 0, 0 )
-			       << QRect( 0, 0, 30, 40 )
-			       << QPolygon( QRect( -30, -40, 30, 40 ) );
-    QTest::newRow( "mirror 8" )  << QMatrix( -2, 0, 0, -2, 0, 0 )
-			       << QRect( 0, 0, 30, 40 )
-			       << QPolygon( QRect( -60, -80, 60, 80 ) );
-    QTest::newRow( "mirror 9" )  << QMatrix( -10, 0, 0, -10, 0, 0 )
-			       << QRect( 0, 0, 30, 40 )
-			       << QPolygon( QRect( -300, -400, 300, 400 ) );
+    QTest::newRow( "mirror 0" ) << QMatrix( -1, 0, 0, 1, 0, 0 )
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon( QRect( -40, 20, 30, 40 ) );
+    QTest::newRow( "mirror 1" ) << QMatrix( 1, 0, 0, -1, 0, 0 )
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon( QRect( 10, -60, 30, 40 ) );
+    QTest::newRow( "mirror 2" ) << QMatrix( -1, 0, 0, -1, 0, 0 )
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon( QRect( -40, -60, 30, 40 ) );
+    QTest::newRow( "mirror 3" ) << QMatrix( -2, 0, 0, -2, 0, 0 )
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon( QRect( -80, -120, 60, 80 ) );
+    QTest::newRow( "mirror 4" ) << QMatrix( -10, 0, 0, -10, 0, 0 )
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon( QRect( -400, -600, 300, 400 ) );
+    QTest::newRow( "mirror 5" ) << QMatrix( -1, 0, 0, 1, 0, 0 )
+                                << QRect( 0, 0, 30, 40 )
+                                << QPolygon( QRect( -30, 0, 30, 40 ) );
+    QTest::newRow( "mirror 6" ) << QMatrix( 1, 0, 0, -1, 0, 0 )
+                                << QRect( 0, 0, 30, 40 )
+                                << QPolygon( QRect( 0, -40, 30, 40 ) );
+    QTest::newRow( "mirror 7" ) << QMatrix( -1, 0, 0, -1, 0, 0 )
+                                << QRect( 0, 0, 30, 40 )
+                                << QPolygon( QRect( -30, -40, 30, 40 ) );
+    QTest::newRow( "mirror 8" ) << QMatrix( -2, 0, 0, -2, 0, 0 )
+                                << QRect( 0, 0, 30, 40 )
+                                << QPolygon( QRect( -60, -80, 60, 80 ) );
+    QTest::newRow( "mirror 9" ) << QMatrix( -10, 0, 0, -10, 0, 0 )
+                                << QRect( 0, 0, 30, 40 )
+                                << QPolygon( QRect( -300, -400, 300, 400 ) );
 
 #if (defined(Q_OS_WIN) || defined(Q_OS_WINCE)) && !defined(M_PI)
 #define M_PI 3.14159265897932384626433832795f
@@ -161,126 +161,126 @@ void tst_QWMatrix::mapping_data()
     // rotations
     float deg = 0.;
     QTest::newRow( "rot 0 a" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-						sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
-			      << QRect( 0, 0, 30, 40 )
-			      << QPolygon ( QRect( 0, 0, 30, 40 ) );
+                                            sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+                                << QRect( 0, 0, 30, 40 )
+                                << QPolygon ( QRect( 0, 0, 30, 40 ) );
     deg = 0.00001f;
     QTest::newRow( "rot 0 b" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-						sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
-			      << QRect( 0, 0, 30, 40 )
-			      << QPolygon ( QRect( 0, 0, 30, 40 ) );
+                                            sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+                                << QRect( 0, 0, 30, 40 )
+                                << QPolygon ( QRect( 0, 0, 30, 40 ) );
     deg = 0.;
     QTest::newRow( "rot 0 c" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-						sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-			      << QPolygon ( QRect( 10, 20, 30, 40 ) );
+                                            sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon ( QRect( 10, 20, 30, 40 ) );
     deg = 0.00001f;
     QTest::newRow( "rot 0 d" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-						sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-			      << QPolygon ( QRect( 10, 20, 30, 40 ) );
+                                            sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+                                << QRect( 10, 20, 30, 40 )
+                                << QPolygon ( QRect( 10, 20, 30, 40 ) );
 
 #if 0
     // rotations
     deg = 90.;
     QTest::newRow( "rotscale 90 a" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 0, 0, 30, 40 )
-			       << QPolygon( QRect( 0, -299, 400, 300 ) );
+                                                  10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                      << QRect( 0, 0, 30, 40 )
+                                      << QPolygon( QRect( 0, -299, 400, 300 ) );
     deg = 90.00001;
     QTest::newRow( "rotscale 90 b" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 0, 0, 30, 40 )
-			       << QPolygon( QRect( 0, -299, 400, 300 ) );
+                                                  10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                      << QRect( 0, 0, 30, 40 )
+                                      << QPolygon( QRect( 0, -299, 400, 300 ) );
     deg = 90.;
     QTest::newRow( "rotscale 90 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-				     << QPolygon( QRect( 200, -399, 400, 300 ) );
+                                                  10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                      << QRect( 10, 20, 30, 40 )
+                                      << QPolygon( QRect( 200, -399, 400, 300 ) );
     deg = 90.00001;
     QTest::newRow( "rotscale 90 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-				     << QPolygon( QRect( 200, -399, 400, 300 ) );
+                                                  10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                      << QRect( 10, 20, 30, 40 )
+                                      << QPolygon( QRect( 200, -399, 400, 300 ) );
 
     deg = 180.;
     QTest::newRow( "rotscale 180 a" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 0, 0, 30, 40 )
-				      << QPolygon( QRect( -299, -399, 300, 400 ) );
+                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                       << QRect( 0, 0, 30, 40 )
+                                       << QPolygon( QRect( -299, -399, 300, 400 ) );
     deg = 180.000001;
     QTest::newRow( "rotscale 180 b" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						       10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-				      << QRect( 0, 0, 30, 40 )
-				      << QPolygon( QRect( -299, -399, 300, 400 ) );
+                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                       << QRect( 0, 0, 30, 40 )
+                                       << QPolygon( QRect( -299, -399, 300, 400 ) );
     deg = 180.;
     QTest::newRow( "rotscale 180 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-				      << QRect( 10, 20, 30, 40 )
-				      << QPolygon( QRect( -399, -599, 300, 400 ) );
+                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                       << QRect( 10, 20, 30, 40 )
+                                       << QPolygon( QRect( -399, -599, 300, 400 ) );
     deg = 180.000001;
     QTest::newRow( "rotscale 180 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-				      << QRect( 10, 20, 30, 40 )
-				      << QPolygon( QRect( -399, -599, 300, 400 ) );
+                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                       << QRect( 10, 20, 30, 40 )
+                                       << QPolygon( QRect( -399, -599, 300, 400 ) );
 
     deg = 270.;
     QTest::newRow( "rotscale 270 a" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-				      << QRect( 0, 0, 30, 40 )
-				      << QPolygon( QRect( -399, 00, 400, 300 ) );
+                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                       << QRect( 0, 0, 30, 40 )
+                                       << QPolygon( QRect( -399, 00, 400, 300 ) );
     deg = 270.0000001;
     QTest::newRow( "rotscale 270 b" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-				      << QRect( 0, 0, 30, 40 )
-				      << QPolygon( QRect( -399, 00, 400, 300 ) );
+                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                       << QRect( 0, 0, 30, 40 )
+                                       << QPolygon( QRect( -399, 00, 400, 300 ) );
     deg = 270.;
     QTest::newRow( "rotscale 270 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-				      << QRect( 10, 20, 30, 40 )
-				      << QPolygon( QRect( -599, 100, 400, 300 ) );
+                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                       << QRect( 10, 20, 30, 40 )
+                                       << QPolygon( QRect( -599, 100, 400, 300 ) );
     deg = 270.000001;
     QTest::newRow( "rotscale 270 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 	0 )
-				      << QRect( 10, 20, 30, 40 )
-				      << QPolygon( QRect( -599, 100, 400, 300 ) );
+                                                   10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0,   0 )
+                                       << QRect( 10, 20, 30, 40 )
+                                       << QPolygon( QRect( -599, 100, 400, 300 ) );
 
     // rotations that are not multiples of 90 degrees. mapRect returns the bounding rect here.
     deg = 45;
     QTest::newRow( "rot 45 a" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-						sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
-				<< QRect( 0, 0, 10, 10 )
-				<< QPolygon( QRect( 0, -7, 14, 14 ) );
+                                             sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+                                 << QRect( 0, 0, 10, 10 )
+                                 << QPolygon( QRect( 0, -7, 14, 14 ) );
     QTest::newRow( "rot 45 b" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-						sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-				<< QPolygon( QRect( 21, -14, 49, 49 ) );
+                                             sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+                                 << QRect( 10, 20, 30, 40 )
+                                 << QPolygon( QRect( 21, -14, 49, 49 ) );
     QTest::newRow( "rot 45 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 0, 0, 10, 10 )
-				<< QPolygon( QRect( 0, -70, 141, 141 ) );
+                                             10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                 << QRect( 0, 0, 10, 10 )
+                                 << QPolygon( QRect( 0, -70, 141, 141 ) );
     QTest::newRow( "rot 45 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-				<< QPolygon( QRect( 212, -141, 495, 495 ) );
+                                             10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                 << QRect( 10, 20, 30, 40 )
+                                 << QPolygon( QRect( 212, -141, 495, 495 ) );
 
     deg = -45;
     QTest::newRow( "rot -45 a" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-						sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 0, 0, 10, 10 )
-				 << QPolygon( QRect( -7, 0, 14, 14 ) );
+                                              sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+                                  << QRect( 0, 0, 10, 10 )
+                                  << QPolygon( QRect( -7, 0, 14, 14 ) );
     QTest::newRow( "rot -45 b" )  << QMatrix( cos( M_PI*deg/180. ), -sin( M_PI*deg/180. ),
-						sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-				 << QPolygon( QRect( -35, 21, 49, 49 ) );
+                                              sin( M_PI*deg/180. ),  cos( M_PI*deg/180. ), 0, 0 )
+                                  << QRect( 10, 20, 30, 40 )
+                                  << QPolygon( QRect( -35, 21, 49, 49 ) );
     QTest::newRow( "rot -45 c" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 0, 0, 10, 10 )
-				 << QPolygon( QRect( -70, 0, 141, 141 ) );
+                                              10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                  << QRect( 0, 0, 10, 10 )
+                                  << QPolygon( QRect( -70, 0, 141, 141 ) );
     QTest::newRow( "rot -45 d" )  << QMatrix( 10*cos( M_PI*deg/180. ), -10*sin( M_PI*deg/180. ),
-						10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
-			       << QRect( 10, 20, 30, 40 )
-				 << QPolygon( QRect( -353, 212, 495, 495 ) );
+                                              10*sin( M_PI*deg/180. ),  10*cos( M_PI*deg/180. ), 0, 0 )
+                                  << QRect( 10, 20, 30, 40 )
+                                  << QPolygon( QRect( -353, 212, 495, 495 ) );
 #endif
 }
 
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index aa5fa10a33..a7248869ed 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -316,25 +316,25 @@ void tst_QFont::italicOblique()
     QStringList::ConstIterator f_it, f_end = families.end();
     for (f_it = families.begin(); f_it != f_end; ++f_it) {
 
-	QString family = *f_it;
-	QStringList styles = fdb.styles(family);
-	QVERIFY(!styles.isEmpty());
-	QStringList::ConstIterator s_it, s_end = styles.end();
-	for (s_it = styles.begin(); s_it != s_end; ++s_it) {
-	    QString style = *s_it;
-
-	    if (fdb.isSmoothlyScalable(family, style)) {
-		if (style.contains("Oblique")) {
-		    style.replace("Oblique", "Italic");
-		} else if (style.contains("Italic")) {
-		    style.replace("Italic", "Oblique");
-		} else {
-		    continue;
-		}
-		QFont f = fdb.font(family, style, 12);
-		QVERIFY(f.italic());
-	    }
-	}
+        QString family = *f_it;
+        QStringList styles = fdb.styles(family);
+        QVERIFY(!styles.isEmpty());
+        QStringList::ConstIterator s_it, s_end = styles.end();
+        for (s_it = styles.begin(); s_it != s_end; ++s_it) {
+            QString style = *s_it;
+
+            if (fdb.isSmoothlyScalable(family, style)) {
+                if (style.contains("Oblique")) {
+                    style.replace("Oblique", "Italic");
+                } else if (style.contains("Italic")) {
+                    style.replace("Italic", "Oblique");
+                } else {
+                    continue;
+                }
+                QFont f = fdb.font(family, style, 12);
+                QVERIFY(f.italic());
+            }
+        }
     }
 }
 
@@ -342,16 +342,16 @@ void tst_QFont::compare()
 {
     QFont font;
     {
-	QFont font2 = font;
-	font2.setPointSize( 24 );
-	QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
+        QFont font2 = font;
+        font2.setPointSize(24);
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
     }
     {
-	QFont font2 = font;
-	font2.setPixelSize( 24 );
-	QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
+        QFont font2 = font;
+        font2.setPixelSize(24);
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
     }
 
     font.setPointSize(12);
@@ -361,69 +361,69 @@ void tst_QFont::compare()
     font.setStrikeOut(false);
     font.setOverline(false);
     {
-	QFont font2 = font;
-	font2.setPointSize( 24 );
-	QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
+        QFont font2 = font;
+        font2.setPointSize(24);
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
     }
     {
-	QFont font2 = font;
-	font2.setPixelSize( 24 );
-	QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
+        QFont font2 = font;
+        font2.setPixelSize(24);
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
     }
     {
-	QFont font2 = font;
-
-	font2.setItalic(true);
-	QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
-	font2.setItalic(false);
-	QVERIFY( font == font2 );
-    QVERIFY(!(font < font2));
-
-	font2.setWeight(QFont::Bold);
-	QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
-	font2.setWeight(QFont::Normal);
-	QVERIFY( font == font2 );
-    QVERIFY(!(font < font2));
-
-	font.setUnderline(true);
-	QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
-	font.setUnderline(false);
-	QVERIFY( font == font2 );
-    QVERIFY(!(font < font2));
-
-	font.setStrikeOut(true);
-	QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
-	font.setStrikeOut(false);
-	QVERIFY( font == font2 );
-    QVERIFY(!(font < font2));
-
-	font.setOverline(true);
-	QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
-	font.setOverline(false);
-	QVERIFY( font == font2 );
-    QVERIFY(!(font < font2));
+        QFont font2 = font;
+
+        font2.setItalic(true);
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
+        font2.setItalic(false);
+        QVERIFY(font == font2);
+        QVERIFY(!(font < font2));
+
+        font2.setWeight(QFont::Bold);
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
+        font2.setWeight(QFont::Normal);
+        QVERIFY(font == font2);
+        QVERIFY(!(font < font2));
+
+        font.setUnderline(true);
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
+        font.setUnderline(false);
+        QVERIFY(font == font2);
+        QVERIFY(!(font < font2));
+
+        font.setStrikeOut(true);
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
+        font.setStrikeOut(false);
+        QVERIFY(font == font2);
+        QVERIFY(!(font < font2));
+
+        font.setOverline(true);
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
+        font.setOverline(false);
+        QVERIFY(font == font2);
+        QVERIFY(!(font < font2));
 
         font.setCapitalization(QFont::SmallCaps);
-        QVERIFY( font != font2 );
-    QCOMPARE(font < font2,!(font2 < font));
+        QVERIFY(font != font2);
+        QCOMPARE(font < font2,!(font2 < font));
         font.setCapitalization(QFont::MixedCase);
-        QVERIFY( font == font2 );
-    QVERIFY(!(font < font2));
+        QVERIFY(font == font2);
+        QVERIFY(!(font < font2));
     }
 
 #if defined(Q_WS_X11)
     {
-	QFont font1, font2;
-	font1.setRawName("-Adobe-Helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1");
-	font2.setRawName("-Adobe-Helvetica-medium-r-normal--24-240-75-75-p-130-iso8859-1");
-	QVERIFY(font1 != font2);
+        QFont font1, font2;
+        font1.setRawName("-Adobe-Helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1");
+        font2.setRawName("-Adobe-Helvetica-medium-r-normal--24-240-75-75-p-130-iso8859-1");
+        QVERIFY(font1 != font2);
     }
 #endif
 }
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 104d3465f2..fa5c81a2f0 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -124,11 +124,11 @@ void tst_QFontDatabase::styles()
     QStringList styles = fdb.styles( font );
     QStringList::Iterator it = styles.begin();
     while ( it != styles.end() ) {
-	QString style = *it;
-	QString trimmed = style.trimmed();
-	++it;
+        QString style = *it;
+        QString trimmed = style.trimmed();
+        ++it;
 
-	QCOMPARE( style, trimmed );
+        QCOMPARE(style, trimmed);
     }
 }
 
@@ -160,7 +160,7 @@ void tst_QFontDatabase::fixedPitch()
 
     QFontDatabase fdb;
     if (!fdb.families().contains(font))
-	QSKIP( "Font not installed");
+        QSKIP("Font not installed");
 
     QCOMPARE(fdb.isFixedPitch(font), fixedPitch);
 
diff --git a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
index cddec5b6e7..7adaac9fac 100644
--- a/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
+++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
@@ -163,7 +163,7 @@ void tst_QFontMetrics::metrics()
                             fontmetrics.lineSpacing());
                 }
             }
-	}
+        }
     }
 }
 
diff --git a/tests/auto/gui/text/qtextdocument/common.h b/tests/auto/gui/text/qtextdocument/common.h
index 8fb5fe2499..184b2f7ec7 100644
--- a/tests/auto/gui/text/qtextdocument/common.h
+++ b/tests/auto/gui/text/qtextdocument/common.h
@@ -79,11 +79,11 @@ public:
     int l;
 
     void expect(int from, int oldLength, int length) {
-	f = from;
-	o = oldLength;
-	l = length;
-	error = false;
-	called = false;
+        f = from;
+        o = oldLength;
+        l = length;
+        error = false;
+        called = false;
     }
     bool error;
     bool called;
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 9f9b6acb02..009b536d7e 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -360,8 +360,8 @@ void tst_QTextDocumentFragment::listCopying2()
     cursor.movePosition(QTextCursor::Start);
     int listItemCount = 0;
     do {
-	if (cursor.currentList())
-	    listItemCount++;
+        if (cursor.currentList())
+            listItemCount++;
     } while (cursor.movePosition(QTextCursor::NextBlock));
 
     QCOMPARE(listItemCount, 4);
@@ -378,35 +378,35 @@ void tst_QTextDocumentFragment::tableCopying()
     // as the pasiveness of the tablemanager.
     QTextDocumentFragment fragment;
     {
-	QTextDocument doc;
-	QTextCursor cursor(&doc);
+        QTextDocument doc;
+        QTextCursor cursor(&doc);
 
-	QTextTableFormat fmt;
-	QTextTable *table = cursor.insertTable(2, 2, fmt);
+        QTextTableFormat fmt;
+        QTextTable *table = cursor.insertTable(2, 2, fmt);
 
-	table->cellAt(0, 0).firstCursorPosition().insertText("First Cell");
-	table->cellAt(0, 1).firstCursorPosition().insertText("Second Cell");
-	table->cellAt(1, 0).firstCursorPosition().insertText("Third Cell");
-	table->cellAt(1, 1).firstCursorPosition().insertText("Fourth Cell");
+        table->cellAt(0, 0).firstCursorPosition().insertText("First Cell");
+        table->cellAt(0, 1).firstCursorPosition().insertText("Second Cell");
+        table->cellAt(1, 0).firstCursorPosition().insertText("Third Cell");
+        table->cellAt(1, 1).firstCursorPosition().insertText("Fourth Cell");
 
-	fragment = QTextDocumentFragment(&doc);
+        fragment = QTextDocumentFragment(&doc);
     }
     {
-	QTextDocument doc;
-	QTextCursor cursor(&doc);
+        QTextDocument doc;
+        QTextCursor cursor(&doc);
 
-	cursor.insertText("FooBar");
-	cursor.insertBlock();
-	cursor.movePosition(QTextCursor::Left);
+        cursor.insertText("FooBar");
+        cursor.insertBlock();
+        cursor.movePosition(QTextCursor::Left);
 
-	cursor.insertFragment(fragment);
-	cursor.movePosition(QTextCursor::Start);
-	cursor.movePosition(QTextCursor::NextBlock);
+        cursor.insertFragment(fragment);
+        cursor.movePosition(QTextCursor::Start);
+        cursor.movePosition(QTextCursor::NextBlock);
 
-	QTextTable *table = cursor.currentTable();
-	QVERIFY(table);
-	QCOMPARE(table->rows(), 2);
-	QCOMPARE(table->columns(), 2);
+        QTextTable *table = cursor.currentTable();
+        QVERIFY(table);
+        QCOMPARE(table->rows(), 2);
+        QCOMPARE(table->columns(), 2);
     }
 }
 
@@ -488,91 +488,91 @@ void tst_QTextDocumentFragment::tableImport()
 void tst_QTextDocumentFragment::tableImport2()
 {
     {
-	const char html[] = ""
-	    "<table>"
-	    "<tr><td>First Cell</td><td>Second Cell</td></tr>"
-	    "<tr><td>Third Cell</td><td>Fourth Cell</td></tr>"
-	    "</table>";
-
-	QTextDocument doc;
-	QTextCursor cursor(&doc);
-	cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(html, sizeof(html) / sizeof(html[0]))));
-
-	cursor.movePosition(QTextCursor::Start);
-	cursor.movePosition(QTextCursor::NextBlock);
-	QTextTable *table = cursor.currentTable();
-	QVERIFY(table);
-	QCOMPARE(table->columns(), 2);
-	QCOMPARE(table->rows(), 2);
+        const char html[] = ""
+            "<table>"
+            "<tr><td>First Cell</td><td>Second Cell</td></tr>"
+            "<tr><td>Third Cell</td><td>Fourth Cell</td></tr>"
+            "</table>";
+
+        QTextDocument doc;
+        QTextCursor cursor(&doc);
+        cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(html, sizeof(html) / sizeof(html[0]))));
+
+        cursor.movePosition(QTextCursor::Start);
+        cursor.movePosition(QTextCursor::NextBlock);
+        QTextTable *table = cursor.currentTable();
+        QVERIFY(table);
+        QCOMPARE(table->columns(), 2);
+        QCOMPARE(table->rows(), 2);
     }
     {
-	const char html[] = ""
-	    "<table>"
-	    "<tr><td>First Cell</td><td>Second Cell</td></tr>"
-	    "<tr><td>Third Cell</td><td>"
-	    "                           <table>"
-	    "                           <tr><td>First Nested Cell</td><td>Second Nested Cell</td></tr>"
-	    "                           <tr><td>Third Nested Cell</td><td>Fourth Nested Cell</td></tr>"
-	    "                           <tr><td>Fifth Nested Cell</td><td>Sixth Nested Cell</td></tr>"
-	    "                           </table></td></tr>"
-	    "</table>";
-
-	QTextDocument doc;
-	QTextCursor cursor(&doc);
-	cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(html, sizeof(html) / sizeof(html[0]))));
-
-	cursor.movePosition(QTextCursor::Start);
-	cursor.movePosition(QTextCursor::NextBlock);
-	QTextTable *table = cursor.currentTable();
-	QVERIFY(table);
-	QCOMPARE(table->columns(), 2);
-	QCOMPARE(table->rows(), 2);
+        const char html[] = ""
+            "<table>"
+            "<tr><td>First Cell</td><td>Second Cell</td></tr>"
+            "<tr><td>Third Cell</td><td>"
+            "                           <table>"
+            "                           <tr><td>First Nested Cell</td><td>Second Nested Cell</td></tr>"
+            "                           <tr><td>Third Nested Cell</td><td>Fourth Nested Cell</td></tr>"
+            "                           <tr><td>Fifth Nested Cell</td><td>Sixth Nested Cell</td></tr>"
+            "                           </table></td></tr>"
+            "</table>";
+
+        QTextDocument doc;
+        QTextCursor cursor(&doc);
+        cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(html, sizeof(html) / sizeof(html[0]))));
+
+        cursor.movePosition(QTextCursor::Start);
+        cursor.movePosition(QTextCursor::NextBlock);
+        QTextTable *table = cursor.currentTable();
+        QVERIFY(table);
+        QCOMPARE(table->columns(), 2);
+        QCOMPARE(table->rows(), 2);
 
         /*
-	QTextCursor fourthCell = table->cellAt(1, 1).firstCursorPosition();
-	fourthCell.movePosition(QTextCursor::NextBlock);
-	table = fourthCell.currentTable();
-	QVERIFY(table);
-	QVERIFY(table != cursor.currentTable());
-	QCOMPARE(table->columns(), 2);
-	QCOMPARE(table->rows(), 3);
+        QTextCursor fourthCell = table->cellAt(1, 1).firstCursorPosition();
+        fourthCell.movePosition(QTextCursor::NextBlock);
+        table = fourthCell.currentTable();
+        QVERIFY(table);
+        QVERIFY(table != cursor.currentTable());
+        QCOMPARE(table->columns(), 2);
+        QCOMPARE(table->rows(), 3);
         */
     }
     {
-	const char buggyHtml[] = ""
-	    "<table>"
-	    "<tr><td>First Cell<td>Second Cell"
-	    "<tr><td>Third Cell<td>Fourth Cell"
-	    "</table>";
-
-	QTextDocument doc;
-	QTextCursor cursor(&doc);
-	cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(buggyHtml, sizeof(buggyHtml) / sizeof(buggyHtml[0]))));
-
-	cursor.movePosition(QTextCursor::Start);
-	cursor.movePosition(QTextCursor::NextBlock);
-	QTextTable *table = cursor.currentTable();
-	QVERIFY(table);
-	QCOMPARE(table->columns(), 2);
-	QCOMPARE(table->rows(), 2);
+        const char buggyHtml[] = ""
+            "<table>"
+            "<tr><td>First Cell<td>Second Cell"
+            "<tr><td>Third Cell<td>Fourth Cell"
+            "</table>";
+
+        QTextDocument doc;
+        QTextCursor cursor(&doc);
+        cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(buggyHtml, sizeof(buggyHtml) / sizeof(buggyHtml[0]))));
+
+        cursor.movePosition(QTextCursor::Start);
+        cursor.movePosition(QTextCursor::NextBlock);
+        QTextTable *table = cursor.currentTable();
+        QVERIFY(table);
+        QCOMPARE(table->columns(), 2);
+        QCOMPARE(table->rows(), 2);
     }
     {
-	const char buggyHtml[] = ""
-	    "<table>"
-	    "<tr><th>First Cell<th>Second Cell"
-	    "<tr><td>Third Cell<td>Fourth Cell"
-	    "</table>";
-
-	QTextDocument doc;
-	QTextCursor cursor(&doc);
-	cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(buggyHtml, sizeof(buggyHtml) / sizeof(buggyHtml[0]))));
-
-	cursor.movePosition(QTextCursor::Start);
-	cursor.movePosition(QTextCursor::NextBlock);
-	QTextTable *table = cursor.currentTable();
-	QVERIFY(table);
-	QCOMPARE(table->columns(), 2);
-	QCOMPARE(table->rows(), 2);
+        const char buggyHtml[] = ""
+            "<table>"
+            "<tr><th>First Cell<th>Second Cell"
+            "<tr><td>Third Cell<td>Fourth Cell"
+            "</table>";
+
+        QTextDocument doc;
+        QTextCursor cursor(&doc);
+        cursor.insertFragment(QTextDocumentFragment::fromHtml(QByteArray::fromRawData(buggyHtml, sizeof(buggyHtml) / sizeof(buggyHtml[0]))));
+
+        cursor.movePosition(QTextCursor::Start);
+        cursor.movePosition(QTextCursor::NextBlock);
+        QTextTable *table = cursor.currentTable();
+        QVERIFY(table);
+        QCOMPARE(table->columns(), 2);
+        QCOMPARE(table->rows(), 2);
     }
 
 }
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index 90137079f3..56d6711dc6 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -212,63 +212,63 @@ void tst_QTextLayout::lineBreaking()
 {
 #if 0
     struct Breaks {
-	const char *utf8;
-	uchar breaks[32];
+        const char *utf8;
+        uchar breaks[32];
     };
     Breaks brks[] = {
-	{ "11", { false, 0xff } },
-	{ "aa", { false, 0xff } },
-	{ "++", { false, 0xff } },
-	{ "--", { false, 0xff } },
-	{ "((", { false, 0xff } },
-	{ "))", { false, 0xff } },
-	{ "..", { false, 0xff } },
-	{ "\"\"", { false, 0xff } },
-	{ "$$", { false, 0xff } },
-	{ "!!", { false, 0xff } },
-	{ "??", { false, 0xff } },
-	{ ",,", { false, 0xff } },
-
-	{ ")()", { true, false, 0xff } },
-	{ "?!?", { false, false, 0xff } },
-	{ ".,.", { false, false, 0xff } },
-	{ "+-+", { false, false, 0xff } },
-	{ "+=+", { false, false, 0xff } },
-	{ "+(+", { false, false, 0xff } },
-	{ "+)+", { false, false, 0xff } },
-
-	{ "a b", { false, true, 0xff } },
-	{ "a(b", { false, false, 0xff } },
-	{ "a)b", { false, false, 0xff } },
-	{ "a-b", { false, true, 0xff } },
-	{ "a.b", { false, false, 0xff } },
-	{ "a+b", { false, false, 0xff } },
-	{ "a?b", { false, false, 0xff } },
-	{ "a!b", { false, false, 0xff } },
-	{ "a$b", { false, false, 0xff } },
-	{ "a,b", { false, false, 0xff } },
-	{ "a/b", { false, false, 0xff } },
-	{ "1/2", { false, false, 0xff } },
-	{ "./.", { false, false, 0xff } },
-	{ ",/,", { false, false, 0xff } },
-	{ "!/!", { false, false, 0xff } },
-	{ "\\/\\", { false, false, 0xff } },
-	{ "1 2", { false, true, 0xff } },
-	{ "1(2", { false, false, 0xff } },
-	{ "1)2", { false, false, 0xff } },
-	{ "1-2", { false, false, 0xff } },
-	{ "1.2", { false, false, 0xff } },
-	{ "1+2", { false, false, 0xff } },
-	{ "1?2", { false, true, 0xff } },
-	{ "1!2", { false, true, 0xff } },
-	{ "1$2", { false, false, 0xff } },
-	{ "1,2", { false, false, 0xff } },
-	{ "1/2", { false, false, 0xff } },
-	{ "\330\260\331\216\331\204\331\220\331\203\331\216", { false, false, false, false, false, 0xff } },
-	{ "\330\247\331\204\331\205 \330\247\331\204\331\205", { false, false, false, true, false, false, 0xff } },
-	{ "1#2", { false, false, 0xff } },
-	{ "!#!", { false, false, 0xff } },
-	{ 0, {} }
+        { "11", { false, 0xff } },
+        { "aa", { false, 0xff } },
+        { "++", { false, 0xff } },
+        { "--", { false, 0xff } },
+        { "((", { false, 0xff } },
+        { "))", { false, 0xff } },
+        { "..", { false, 0xff } },
+        { "\"\"", { false, 0xff } },
+        { "$$", { false, 0xff } },
+        { "!!", { false, 0xff } },
+        { "??", { false, 0xff } },
+        { ",,", { false, 0xff } },
+
+        { ")()", { true, false, 0xff } },
+        { "?!?", { false, false, 0xff } },
+        { ".,.", { false, false, 0xff } },
+        { "+-+", { false, false, 0xff } },
+        { "+=+", { false, false, 0xff } },
+        { "+(+", { false, false, 0xff } },
+        { "+)+", { false, false, 0xff } },
+
+        { "a b", { false, true, 0xff } },
+        { "a(b", { false, false, 0xff } },
+        { "a)b", { false, false, 0xff } },
+        { "a-b", { false, true, 0xff } },
+        { "a.b", { false, false, 0xff } },
+        { "a+b", { false, false, 0xff } },
+        { "a?b", { false, false, 0xff } },
+        { "a!b", { false, false, 0xff } },
+        { "a$b", { false, false, 0xff } },
+        { "a,b", { false, false, 0xff } },
+        { "a/b", { false, false, 0xff } },
+        { "1/2", { false, false, 0xff } },
+        { "./.", { false, false, 0xff } },
+        { ",/,", { false, false, 0xff } },
+        { "!/!", { false, false, 0xff } },
+        { "\\/\\", { false, false, 0xff } },
+        { "1 2", { false, true, 0xff } },
+        { "1(2", { false, false, 0xff } },
+        { "1)2", { false, false, 0xff } },
+        { "1-2", { false, false, 0xff } },
+        { "1.2", { false, false, 0xff } },
+        { "1+2", { false, false, 0xff } },
+        { "1?2", { false, true, 0xff } },
+        { "1!2", { false, true, 0xff } },
+        { "1$2", { false, false, 0xff } },
+        { "1,2", { false, false, 0xff } },
+        { "1/2", { false, false, 0xff } },
+        { "\330\260\331\216\331\204\331\220\331\203\331\216", { false, false, false, false, false, 0xff } },
+        { "\330\247\331\204\331\205 \330\247\331\204\331\205", { false, false, false, true, false, false, 0xff } },
+        { "1#2", { false, false, 0xff } },
+        { "!#!", { false, false, 0xff } },
+        { 0, {} }
     };
     Breaks *b = brks;
     while (b->utf8) {
diff --git a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
index 10a25ba437..0628cc66d1 100644
--- a/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
+++ b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
@@ -119,7 +119,7 @@ void tst_QTextList::autoNumbering()
     QVERIFY(list);
 
     for (int i = 0; i < 27; ++i)
-	cursor.insertBlock();
+        cursor.insertBlock();
 
     QVERIFY(list->count() == 28);
 
diff --git a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
index 3359cc8d32..5efb532233 100644
--- a/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -158,12 +158,12 @@ void tst_QTextPieceTable::insertion3()
 {
     QString compare;
     for (int i = 0; i < 20000; ++i) {
-	int pos = rand() % (i+1);
-	QChar c((unsigned short)(i & 0xff) + 1);
-	QString str;
-	str += c;
-	table->insert(pos, str, charFormatIndex);
-	compare.insert(pos, str);
+        int pos = rand() % (i+1);
+        QChar c((unsigned short)(i & 0xff) + 1);
+        QString str;
+        str += c;
+        table->insert(pos, str, charFormatIndex);
+        compare.insert(pos, str);
     }
     QVERIFY(table->plainText() == compare);
 }
@@ -172,17 +172,17 @@ void tst_QTextPieceTable::insertion4()
 {
     QString compare;
     for (int i = 0; i < 20000; ++i) {
-	int pos = rand() % (i+1);
-	QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
-	QString str;
-	str += c;
-	str += c;
-	table->insert(pos, str, charFormatIndex);
-	compare.insert(pos, str);
-	// 	    if (table->text() != compare) {
-	// 		qDebug("compare failed: i=%d (current char=%c) insert at %d\nexpected '%s'\ngot      '%s'", i, (i % 26) + (i>25?'A':'a'), pos, compare.latin1(), table->text().latin1());
-	// 		exit(12);
-	// 	    }
+        int pos = rand() % (i+1);
+        QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
+        QString str;
+        str += c;
+        str += c;
+        table->insert(pos, str, charFormatIndex);
+        compare.insert(pos, str);
+//        if (table->text() != compare) {
+//            qDebug("compare failed: i=%d (current char=%c) insert at %d\nexpected '%s'\ngot      '%s'", i, (i % 26) + (i>25?'A':'a'), pos, compare.latin1(), table->text().latin1());
+//            exit(12);
+//        }
     }
     QVERIFY(table->plainText() == compare);
 }
@@ -191,23 +191,23 @@ void tst_QTextPieceTable::insertion5()
 {
     QString compare;
     for (int i = 0; i < 20000; ++i) {
-	int pos = rand() % (i+1);
-	QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
-	QString str;
-	str += c;
-	str += c;
-	if (c == 'a') {
-	    table->insertBlock(pos, blockFormatIndex, charFormatIndex);
-	    str = QChar(QChar::ParagraphSeparator);
-	} else {
-	    table->insert(pos, str, charFormatIndex);
-	}
-	compare.insert(pos, str);
+        int pos = rand() % (i+1);
+        QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
+        QString str;
+        str += c;
+        str += c;
+        if (c == 'a') {
+            table->insertBlock(pos, blockFormatIndex, charFormatIndex);
+            str = QChar(QChar::ParagraphSeparator);
+        } else {
+            table->insert(pos, str, charFormatIndex);
+        }
+        compare.insert(pos, str);
     }
     QVERIFY(table->plainText() == compare);
     for (QTextBlock it = table->blocksBegin(); it != table->blocksEnd(); it = it.next()) {
-	QTextDocumentPrivate::FragmentIterator fit = table->find(it.position());
-	QVERIFY(fit.position() == it.position());
+        QTextDocumentPrivate::FragmentIterator fit = table->find(it.position());
+        QVERIFY(fit.position() == it.position());
     }
 }
 
@@ -249,24 +249,24 @@ void tst_QTextPieceTable::removal3()
     QString compare;
     int l = 0;
     for (int i = 0; i < 20000; ++i) {
-	bool remove = l && (rand() % 2);
-	int pos = rand() % (remove ? l : (l+1));
-	QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
-	QString str;
-	str += c;
-	str += c;
-	if (remove && pos < table->length()) {
-	    compare.remove(pos, 1);
-	    table->remove(pos, 1);
-	} else {
-	    compare.insert(pos, str);
-	    table->insert(pos, str, charFormatIndex);
-	}
-	l += remove ? -1 : 2;
-	// 	    if (table->text() != compare) {
-	// 		qDebug("compare failed: i=%d (current char=%c) insert at %d\nexpected '%s'\ngot      '%s'", i, (i % 26) + (i>25?'A':'a'), pos, compare.latin1(), table->text().latin1());
-	// 		exit(12);
-	// 	    }
+        bool remove = l && (rand() % 2);
+        int pos = rand() % (remove ? l : (l+1));
+        QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
+        QString str;
+        str += c;
+        str += c;
+        if (remove && pos < table->length()) {
+            compare.remove(pos, 1);
+            table->remove(pos, 1);
+        } else {
+            compare.insert(pos, str);
+            table->insert(pos, str, charFormatIndex);
+        }
+        l += remove ? -1 : 2;
+//        if (table->text() != compare) {
+//            qDebug("compare failed: i=%d (current char=%c) insert at %d\nexpected '%s'\ngot      '%s'", i, (i % 26) + (i>25?'A':'a'), pos, compare.latin1(), table->text().latin1());
+//            exit(12);
+//        }
     }
     QVERIFY(table->plainText() == compare);
 }
@@ -276,31 +276,31 @@ void tst_QTextPieceTable::removal4()
     QString compare;
     int l = 0;
     for (int i = 0; i < 20000; ++i) {
-	bool remove = l && (rand() % 2);
-	int pos = (l > 1) ? rand() % (remove ? l-1 : l) : 0;
-	QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
-	QString str;
-	if (c != 'a') {
-	    str += c;
-	    str += c;
-	} else {
-	    str = QChar(QChar::ParagraphSeparator);
-	}
-	if (remove && pos < table->length() - 1) {
-	    compare.remove(pos, 1);
-	    table->remove(pos, 1);
-	} else {
-	    if (str[0] == QChar(QChar::ParagraphSeparator))
-		table->insertBlock(pos, blockFormatIndex, charFormatIndex);
-	    else
-		table->insert(pos, str, charFormatIndex);
-	    compare.insert(pos, str);
-	}
-	l += remove ? -1 : 2;
-// 	if (table->plainText() != compare) {
-// 	    qDebug("compare failed: i=%d (current char=%c) insert at %d\nexpected '%s'\ngot      '%s'", i, (i % 26) + (i>25?'A':'a'), pos, compare.latin1(), table->plainText().latin1());
-// 	    exit(12);
-// 	}
+        bool remove = l && (rand() % 2);
+        int pos = (l > 1) ? rand() % (remove ? l-1 : l) : 0;
+        QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
+        QString str;
+        if (c != 'a') {
+            str += c;
+            str += c;
+        } else {
+            str = QChar(QChar::ParagraphSeparator);
+        }
+        if (remove && pos < table->length() - 1) {
+            compare.remove(pos, 1);
+            table->remove(pos, 1);
+        } else {
+            if (str[0] == QChar(QChar::ParagraphSeparator))
+                table->insertBlock(pos, blockFormatIndex, charFormatIndex);
+            else
+                table->insert(pos, str, charFormatIndex);
+            compare.insert(pos, str);
+        }
+        l += remove ? -1 : 2;
+//        if (table->plainText() != compare) {
+//            qDebug("compare failed: i=%d (current char=%c) insert at %d\nexpected '%s'\ngot      '%s'", i, (i % 26) + (i>25?'A':'a'), pos, compare.latin1(), table->plainText().latin1());
+//            exit(12);
+//        }
     }
     QVERIFY(table->plainText() == compare);
 }
@@ -490,27 +490,27 @@ void tst_QTextPieceTable::undoRedo11()
     QString compare;
     int l = 0;
     for (int i = 0; i < loops; ++i) {
-	bool remove = l && (rand() % 2);
-	int pos = (l > 1) ? rand() % (remove ? l-1 : l) : 0;
-	QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
-	QString str;
-	str += c;
-	str += c;
-	if (remove) {
-	    compare.remove(pos, 1);
-	    table->remove(pos, 1);
-	} else {
-	    compare.insert(pos, str);
-	    table->insert(pos, str, charFormatIndex);
-	}
-	l += remove ? -1 : 2;
+        bool remove = l && (rand() % 2);
+        int pos = (l > 1) ? rand() % (remove ? l-1 : l) : 0;
+        QChar c((unsigned short)((i % 26) + (i>25?'A':'a')));
+        QString str;
+        str += c;
+        str += c;
+        if (remove) {
+            compare.remove(pos, 1);
+            table->remove(pos, 1);
+        } else {
+            compare.insert(pos, str);
+            table->insert(pos, str, charFormatIndex);
+        }
+        l += remove ? -1 : 2;
     }
     QVERIFY(table->plainText() == compare);
     for (int i = 0; i < loops; ++i)
-	table->undo();
+        table->undo();
     QVERIFY(table->plainText() == QString(""));
     for (int i = 0; i < loops; ++i)
-	table->redo();
+        table->redo();
     QVERIFY(table->plainText() == compare);
 }