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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

88 files changed, 865 insertions, 865 deletions

diff --git a/kpresenter/KPrAutoformObject.cpp b/kpresenter/KPrAutoformObject.cpp
index 90a1eeba..88245f6d 100644
--- a/kpresenter/KPrAutoformObject.cpp
+++ b/kpresenter/KPrAutoformObject.cpp
@@ -80,8 +80,8 @@ bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons
     kdDebug(33001) << "bool KPrAutoformObject::saveOasisObjectAttributes()" << endl;
     TQSize size( int( ext.width() * 100 ), int( ext.height() * 100 )  );
 
-    sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).arg( size.width() )
-                                                                    .arg( size.height() ) );
+    sc.xmlWriter.addAttribute( "svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( size.width() )
+                                                                    .tqarg( size.height() ) );
 
     TQPointArray points = const_cast<ATFInterpreter &>( atfInterp ).getPointArray( size.width(), size.height() );
 
@@ -93,14 +93,14 @@ bool KPrAutoformObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons
         --pointCount;
 
     TQString d;
-    d += TQString( "M%1 %2" ).arg( points.at(pos).x() )
-                            .arg( points.at(pos).y() );
+    d += TQString( "M%1 %2" ).tqarg( points.at(pos).x() )
+                            .tqarg( points.at(pos).y() );
     ++pos;
 
     while ( pos < pointCount )
     {
-        d += TQString( "L%1 %2" ).arg( points.at( pos ).x() )
-                                .arg( points.at( pos ).y() );
+        d += TQString( "L%1 %2" ).tqarg( points.at( pos ).x() )
+                                .tqarg( points.at( pos ).y() );
         ++pos;
     }
 
@@ -237,8 +237,8 @@ void KPrAutoformObject::paint( TQPainter* _painter, KoTextZoomHandler *_zoomHand
             {
                 if ( angle == 0 || angle==360 )
                 {
-                    //int ox = _painter->viewport().x() + static_cast<int>( _painter->worldMatrix().dx() );
-                    //int oy = _painter->viewport().y() + static_cast<int>( _painter->worldMatrix().dy() );
+                    //int ox = _painter->viewport().x() + static_cast<int>( _painter->tqworldMatrix().dx() );
+                    //int oy = _painter->viewport().y() + static_cast<int>( _painter->tqworldMatrix().dy() );
 
                     TQPointArray pntArray3 = pntArray2.copy();
                     _painter->save();
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp
index 0be957f0..b616f802 100644
--- a/kpresenter/KPrBackDia.cpp
+++ b/kpresenter/KPrBackDia.cpp
@@ -28,7 +28,7 @@
 #include <tqpainter.h>
 #include <tqcombobox.h>
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 #include <tqcheckbox.h>
@@ -89,10 +89,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name,
 
     TQWidget *page = new TQWidget( this );
     setMainWidget(page);
-    TQVBoxLayout *layout = new TQVBoxLayout( page, 0, spacingHint() );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, spacingHint() );
 
 
-    TQHBoxLayout *hbox = new TQHBoxLayout( layout );
+    TQHBoxLayout *hbox = new TQHBoxLayout( tqlayout );
     hbox->setSpacing( KDialog::spacingHint() );
     TQVBoxLayout *vbox = new TQVBoxLayout( hbox );
     vbox->setSpacing( KDialog::spacingHint() );
@@ -175,7 +175,7 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name,
     picTab->setMargin( 5 );
 
     TQLabel *l = new TQLabel( i18n( "View mode:" ), picTab );
-    l->setFixedHeight( l->sizeHint().height() );
+    l->setFixedHeight( l->tqsizeHint().height() );
 
     picView = new TQComboBox( false, picTab );
     picView->insertItem( i18n( "Scaled" ) );
@@ -186,10 +186,10 @@ KPrBackDialog::KPrBackDialog( TQWidget* parent, const char* name,
              this, TQT_SLOT( updateConfiguration() ) );
 
     picChooseLabel = new TQLabel( i18n("&Location:"), picTab );
-    picChooseLabel->setFixedHeight( picChooseLabel->sizeHint().height() );
+    picChooseLabel->setFixedHeight( picChooseLabel->tqsizeHint().height() );
 
     picChoose = new KURLRequester( picTab, "picChoose" );
-    picChoose->setFixedHeight( picChoose->sizeHint().height() );
+    picChoose->setFixedHeight( picChoose->tqsizeHint().height() );
     picChoose->setMode( KFile::ExistingOnly );
     connect( picChoose, TQT_SIGNAL( openFileDialog( KURLRequester * ) ),
              TQT_SLOT( aboutToSelectPic() ) );
@@ -313,7 +313,7 @@ void KPrBackDialog::updateConfiguration()
     {
         kdDebug(33001) << "set backgound to master" << endl;
         preview->backGround()->setBackGround( m_page->masterPage()->background()->getBackGround() );
-        preview->repaint( true );
+        preview->tqrepaint( true );
     }
     else
     {
@@ -331,7 +331,7 @@ void KPrBackDialog::updateConfiguration()
         preview->backGround()->setBackType( getBackType() );
         if ( preview->isVisible() && isVisible() ) {
             preview->backGround()->reload(); // ### TODO: instead of reloading, load or remove the picture correctly.
-            preview->repaint( true );
+            preview->tqrepaint( true );
         }
 
         picChanged  = false;
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index e8dcdc39..66102045 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -282,7 +282,7 @@ void KPrBackGround::loadOasis(KoOasisContext & context )
                     strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
                 }
                 TQString filename(href);
-                const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
+                const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
                 backPicture.setKey(key);
 
                 KoStore* store = context.store();
@@ -589,7 +589,7 @@ void KPrBackGround::drawBackPix( TQPainter *_painter, const TQSize& ext, const T
 
 void KPrBackGround::drawBorders( TQPainter *_painter, const TQSize& /*ext*/, const TQRect& /*crect*/ )
 {
-    _painter->setPen( TQApplication::palette().active().color( TQColorGroup::Dark ) );
+    _painter->setPen( TQApplication::tqpalette().active().color( TQColorGroup::Dark ) );
     _painter->setBrush( TQt::NoBrush );
 
      TQRect rect = m_page->getZoomPageRect();
diff --git a/kpresenter/KPrBezierCurveObject.cpp b/kpresenter/KPrBezierCurveObject.cpp
index a2e71ea0..0b12115e 100644
--- a/kpresenter/KPrBezierCurveObject.cpp
+++ b/kpresenter/KPrBezierCurveObject.cpp
@@ -60,31 +60,31 @@ KPrBezierCurveObject &KPrBezierCurveObject::operator=( const KPrBezierCurveObjec
 bool KPrBezierCurveObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const
 {
     KoRect rect( getRect() );
-    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) )
-                                                                   .arg( int( rect.height() * 100 ) ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) )
+                                                                   .tqarg( int( rect.height() * 100 ) ) );
 
     unsigned int pointCount = points.count();
     unsigned int pos = 0;
 
     TQString d;
-    d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) )
-                            .arg( int( points.at(pos).y() * 100 ) );
+    d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) )
+                            .tqarg( int( points.at(pos).y() * 100 ) );
 
     while ( pos + 4 <= pointCount )
     {
-        d += TQString( "C%1 %2 %3 %4 %5 %6" ).arg( int( points.at( pos + 2 ).x() * 100 ) )
-                                            .arg( int( points.at( pos + 2 ).y() * 100 ) )
-                                            .arg( int( points.at( pos + 3 ).x() * 100 ) )
-                                            .arg( int( points.at( pos + 3 ).y() * 100 ) )
-                                            .arg( int( points.at( pos + 1 ).x() * 100 ) )
-                                            .arg( int( points.at( pos + 1 ).y() * 100 ) );
+        d += TQString( "C%1 %2 %3 %4 %5 %6" ).tqarg( int( points.at( pos + 2 ).x() * 100 ) )
+                                            .tqarg( int( points.at( pos + 2 ).y() * 100 ) )
+                                            .tqarg( int( points.at( pos + 3 ).x() * 100 ) )
+                                            .tqarg( int( points.at( pos + 3 ).y() * 100 ) )
+                                            .tqarg( int( points.at( pos + 1 ).x() * 100 ) )
+                                            .tqarg( int( points.at( pos + 1 ).y() * 100 ) );
         pos += 4;
     }
 
     if ( pos < pointCount )
     {
-        d += TQString( "L%1 %2" ).arg( int( points.at( pos + 1 ).x() * 100 ) )
-                                .arg( int( points.at( pos + 1 ).y() * 100 ) );
+        d += TQString( "L%1 %2" ).tqarg( int( points.at( pos + 1 ).x() * 100 ) )
+                                .tqarg( int( points.at( pos + 1 ).y() * 100 ) );
     }
 
     sc.xmlWriter.addAttribute( "svg:d", d );
diff --git a/kpresenter/KPrBrush.cpp b/kpresenter/KPrBrush.cpp
index 71ea95fd..06954f7c 100644
--- a/kpresenter/KPrBrush.cpp
+++ b/kpresenter/KPrBrush.cpp
@@ -73,8 +73,8 @@ TQString KPrBrush::saveOasisGradientStyle( KoGenStyles& mainStyles ) const
 
     if ( getGUnbalanced() )
     {
-        unbalancedx = TQString( "%1%" ).arg( getGXFactor() / 4 + 50 );
-        unbalancedy = TQString( "%1%" ).arg( getGYFactor() / 4 + 50 );
+        unbalancedx = TQString( "%1%" ).tqarg( getGXFactor() / 4 + 50 );
+        unbalancedy = TQString( "%1%" ).tqarg( getGYFactor() / 4 + 50 );
     }
     gradientStyle.addAttribute( "draw:cx", unbalancedx );
     gradientStyle.addAttribute( "draw:cy", unbalancedy );
diff --git a/kpresenter/KPrBrush.h b/kpresenter/KPrBrush.h
index b7b55b16..e59f838a 100644
--- a/kpresenter/KPrBrush.h
+++ b/kpresenter/KPrBrush.h
@@ -21,7 +21,7 @@
 #ifndef KPRBRUSH_H
 #define KPRBRUSH_H
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <KoBrush.h>
 
 #include "global.h"
diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp
index 4dbd9f3f..6e550fe0 100644
--- a/kpresenter/KPrBrushProperty.cpp
+++ b/kpresenter/KPrBrushProperty.cpp
@@ -24,7 +24,7 @@
 
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqwhatsthis.h>
 #include <tqwidgetstack.h>
@@ -37,34 +37,34 @@ KPrBrushProperty::KPrBrushProperty( TQWidget *parent, const char *name, const KP
     : TQWidget( parent, name )
     , m_brush( brush )
 {
-    TQGridLayout *layout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, KDialog::marginHint(), KDialog::spacingHint() );
 
     m_typeCombo = new KComboBox( this );
-    layout->addWidget( m_typeCombo, 0, 1 );
+    tqlayout->addWidget( m_typeCombo, 0, 1 );
     m_typeCombo->insertItem( i18n( "Single Color" ) );
     m_typeCombo->insertItem( i18n( "Gradient" ) );
     m_typeCombo->insertItem( i18n( "Transparent" ) );
     TQWhatsThis::add(m_typeCombo, i18n( "You can choose between Single Color, Gradient or Transparent as the type." ) );
 
     TQLabel *typeLabel = new TQLabel( i18n( "&Type:" ), this );
-    layout->addWidget( typeLabel, 0, 0 );
+    tqlayout->addWidget( typeLabel, 0, 0 );
     typeLabel->setBuddy( m_typeCombo );
 
     m_stack = new TQWidgetStack( this );
-    layout->addMultiCellWidget( m_stack, 1, 1, 0, 1 );
+    tqlayout->addMultiCellWidget( m_stack, 1, 1, 0, 1 );
     connect( m_typeCombo, TQT_SIGNAL( activated( int ) ),
              this, TQT_SLOT( slotTypeChanged( int ) ) );
 
     m_brushUI = new BrushPropertyUI( m_stack );
 
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 100 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 94 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 88 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 63 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 50 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 37 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 12 ) );
-    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).arg( 6 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 100 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 94 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 88 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 63 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 50 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 37 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 12 ) );
+    m_brushUI->styleCombo->insertItem( i18n( "%1% Fill Pattern" ).tqarg( 6 ) );
     m_brushUI->styleCombo->insertItem( i18n( "Horizontal Lines" ) );
     m_brushUI->styleCombo->insertItem( i18n( "Vertical Lines" ) );
     m_brushUI->styleCombo->insertItem( i18n( "Crossing Lines" ) );
diff --git a/kpresenter/KPrBrushProperty.h b/kpresenter/KPrBrushProperty.h
index be0de908..ed9ca272 100644
--- a/kpresenter/KPrBrushProperty.h
+++ b/kpresenter/KPrBrushProperty.h
@@ -19,7 +19,7 @@
 #ifndef BRUSHSTYLEWIDGET_H
 #define BRUSHSTYLEWIDGET_H
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqwidget.h>
 
 #include "KPrCommand.h"
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index 66bc841a..c43faed3 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -24,7 +24,7 @@
 
 #include <tqprogressdialog.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqwmatrix.h>
@@ -36,7 +36,7 @@
 #include <tqrect.h>
 #include <tqsize.h>
 #include <tqpoint.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <kapplication.h>
 #include <kmimemagic.h>
@@ -291,7 +291,7 @@ void KPrCanvas::paintEvent( TQPaintEvent* paintEvent )
         {
             //kdDebug(33001) << "KPrCanvas::paintEvent" << endl;
             TQPainter bufPainter;
-            bufPainter.begin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget)
+            bufPainter.tqbegin( TQT_TQPAINTDEVICE(&buffer), this ); // double-buffering - (the buffer is as big as the widget)
             bufPainter.translate( -diffx(), -diffy() );
             bufPainter.setBrushOrigin( -diffx(), -diffy() );
 
@@ -481,7 +481,7 @@ void KPrCanvas::drawBackground( TQPainter *painter, const TQRect& rect, KPrPage
 
         // In edit mode we also want to draw the gray area out of the pages
         if ( !grayRegion.isEmpty() )
-            eraseEmptySpace( painter, grayRegion, TQApplication::palette().active().brush( TQColorGroup::Mid ) );
+            eraseEmptySpace( painter, grayRegion, TQApplication::tqpalette().active().brush( TQColorGroup::Mid ) );
     }
     else
     {
@@ -706,9 +706,9 @@ void KPrCanvas::mousePressEvent( TQMouseEvent *e )
             }
             else if( e->button() == Qt::MidButton )
             {
-                TQApplication::clipboard()->setSelectionMode( true );
+                TQApplication::tqclipboard()->setSelectionMode( true );
                 m_currentTextObjectView->paste();
-                TQApplication::clipboard()->setSelectionMode( false );
+                TQApplication::tqclipboard()->setSelectionMode( false );
             }
             return;
         }
@@ -1202,7 +1202,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
                 }
 
                 if ( mouseSelectedObject )
-                    _repaint( false );
+                    _tqrepaint( false );
                 emit objectSelectedChanged();
             }
         } break;
@@ -1379,7 +1379,7 @@ void KPrCanvas::mouseReleaseEvent( TQMouseEvent *e )
     emit objectSelectedChanged();
 
     if ( toolEditMode != TEM_MOUSE && editMode )
-        repaint( false );
+        tqrepaint( false );
 
     m_view->disableAutoScroll();
     mousePressed = false;
@@ -1542,7 +1542,7 @@ void KPrCanvas::mouseMoveEvent( TQMouseEvent *e )
                         angle -= 360;
 
                     m_rotateObject->rotate( angle );
-                    _repaint( m_rotateObject );
+                    _tqrepaint( m_rotateObject );
                 }
             }break;
             case INS_AUTOFORM:
@@ -2072,8 +2072,8 @@ void KPrCanvas::keyPressEvent( TQKeyEvent *e )
                         m_resizeObject->setOrig( m_rectBeforeResize.topLeft() );
                         m_resizeObject->setSize( m_rectBeforeResize.size() );
                         drawContour = false;
-                        m_view->kPresenterDoc()->repaint( oldBoundingRect );
-                        m_view->kPresenterDoc()->repaint( m_resizeObject );
+                        m_view->kPresenterDoc()->tqrepaint( oldBoundingRect );
+                        m_view->kPresenterDoc()->tqrepaint( m_resizeObject );
                         m_ratio = 0.0;
                         m_resizeObject = 0;
                         m_isResizing = false;
@@ -2243,7 +2243,7 @@ KPrObject * KPrCanvas::getObjectAt( const KoPoint &pos, bool withoutProtected )
 void KPrCanvas::selectObj( KPrObject *kpobject )
 {
     kpobject->setSelected( true );
-    _repaint( kpobject );
+    _tqrepaint( kpobject );
     emit objectSelectedChanged();
 
     mouseSelectedObject = true;
@@ -2252,7 +2252,7 @@ void KPrCanvas::selectObj( KPrObject *kpobject )
 void KPrCanvas::deSelectObj( KPrObject *kpobject )
 {
     kpobject->setSelected( false );
-    _repaint( kpobject );
+    _tqrepaint( kpobject );
 
     if ( !m_activePage->isOneObjectSelected() )
     {
@@ -2271,7 +2271,7 @@ void KPrCanvas::selectAllObj()
     }
 
     mouseSelectedObject = true;
-    _repaint( false );
+    _tqrepaint( false );
     emit objectSelectedChanged();
 }
 
@@ -2723,9 +2723,9 @@ void KPrCanvas::setTextDepthPlus()
         m_view->kPresenterDoc()->addCommand( macroCmd );
     if(!lst.isEmpty())
     {
-        const KoParagLayout *layout=lst.first()->currentParagLayoutFormat();
-        m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine],
-                                 layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
+        const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat();
+        m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine],
+                                 tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
     }
 }
 
@@ -2753,9 +2753,9 @@ void KPrCanvas::setTextDepthMinus()
         m_view->kPresenterDoc()->addCommand( macroCmd );
     if(!lst.isEmpty())
     {
-        const KoParagLayout *layout=lst.first()->currentParagLayoutFormat();
-        m_view->showRulerIndent( layout->margins[TQStyleSheetItem::MarginLeft], layout->margins[TQStyleSheetItem::MarginFirstLine],
-                                 layout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
+        const KoParagLayout *tqlayout=lst.first()->currentParagLayoutFormat();
+        m_view->showRulerIndent( tqlayout->margins[TQStyleSheetItem::MarginLeft], tqlayout->margins[TQStyleSheetItem::MarginFirstLine],
+                                 tqlayout->margins[TQStyleSheetItem::MarginRight], lst.first()->rtl());
     }
 }
 
@@ -2989,7 +2989,7 @@ void KPrCanvas::stopScreenPresentation()
     m_step.m_pageNumber = 0;
     editMode = true;
     m_drawMode = false;
-    repaint( false );
+    tqrepaint( false );
     setToolEditMode( toolEditMode );
     setWFlags( WResizeNoErase );
 }
@@ -3173,7 +3173,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage )
         m_step.m_step = *( --it );
         //hopefully there are never more than 1000 sub steps :-)
         m_step.m_subStep = 1000;
-        repaint( false );
+        tqrepaint( false );
         return false;
     } else {
         // when we go back on the first slide, thats like starting the presentation again
@@ -3201,7 +3201,7 @@ bool KPrCanvas::pPrev( bool gotoPreviousPage )
         else
         {
             m_step.m_step = *( --m_pageEffectSteps.end() );
-            repaint( false );
+            tqrepaint( false );
         }
 
         return true;
@@ -3544,7 +3544,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
     //deSelectAllObj(); // already done in KPrView::setupPrinter
     int i = 0;
 
-    repaint( false );
+    tqrepaint( false );
     kapp->processEvents();
 
     editMode = false;
@@ -3633,7 +3633,7 @@ void KPrCanvas::print( TQPainter *painter, KPrinter *printer, float /*left_margi
 
     fillBlack = true;
     editMode = true;
-    repaint( false );
+    tqrepaint( false );
 }
 
 
@@ -3872,7 +3872,7 @@ void KPrCanvas::endDrawPolyline()
 
     emit objectSelectedChanged();
     if ( toolEditMode != TEM_MOUSE && editMode )
-        repaint( false );
+        tqrepaint( false );
     m_view->disableAutoScroll();
     mousePressed = false;
     modType = MT_NONE;
@@ -3885,7 +3885,7 @@ void KPrCanvas::endDrawCubicBezierCurve()
     insertCubicBezierCurve( m_pointArray );
     emit objectSelectedChanged();
     if ( toolEditMode != TEM_MOUSE && editMode )
-        repaint( false );
+        tqrepaint( false );
     m_view->disableAutoScroll();
     mousePressed = false;
     modType = MT_NONE;
@@ -3908,7 +3908,7 @@ void KPrCanvas::selectNext()
         }
     }
     m_view->showObjectRect( m_activePage->getSelectedObj() );
-    _repaint( false );
+    _tqrepaint( false );
 }
 
 void KPrCanvas::selectPrev()
@@ -3927,7 +3927,7 @@ void KPrCanvas::selectPrev()
         }
     }
     m_view->showObjectRect( m_activePage->getSelectedObj() );
-    _repaint( false );
+    _tqrepaint( false );
 }
 
 void KPrCanvas::dragEnterEvent( TQDragEnterEvent *e )
@@ -4145,7 +4145,7 @@ void KPrCanvas::copyOasisObjs()
 
     delete store;
     kd->setEncodedData( arr );
-    TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard );
+    TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard );
 }
 
 void KPrCanvas::copyObjs()
@@ -4214,7 +4214,7 @@ void KPrCanvas::copyObjs()
 
     delete store;
     kd->setEncodedData( arr );
-    TQApplication::clipboard()->setData( dragObject, TQClipboard::Clipboard );
+    TQApplication::tqclipboard()->setData( dragObject, TQClipboard::Clipboard );
 }
 
 void KPrCanvas::deleteObjs()
@@ -4285,19 +4285,19 @@ unsigned int KPrCanvas::pageNums() const
     return m_view->kPresenterDoc()->getPageNums();
 }
 
-void KPrCanvas::_repaint( bool /*erase*/ )
+void KPrCanvas::_tqrepaint( bool /*erase*/ )
 {
-    m_view->kPresenterDoc()->repaint( false );
+    m_view->kPresenterDoc()->tqrepaint( false );
 }
 
-void KPrCanvas::_repaint( const TQRect &r )
+void KPrCanvas::_tqrepaint( const TQRect &r )
 {
-    m_view->kPresenterDoc()->repaint( r );
+    m_view->kPresenterDoc()->tqrepaint( r );
 }
 
-void KPrCanvas::_repaint( KPrObject *o )
+void KPrCanvas::_tqrepaint( KPrObject *o )
 {
-    m_view->kPresenterDoc()->repaint( o );
+    m_view->kPresenterDoc()->tqrepaint( o );
 }
 
 void KPrCanvas::slotExitPres()
@@ -4327,7 +4327,7 @@ void KPrCanvas::setSwitchingMode( bool continueTimer )
         m_view->continueAutoPresTimer();
 }
 
-void KPrCanvas::exitEditMode( bool repaint )
+void KPrCanvas::exitEditMode( bool tqrepaint )
 {
     if ( m_editObject )
     {
@@ -4337,7 +4337,7 @@ void KPrCanvas::exitEditMode( bool repaint )
             {
                 m_currentTextObjectView->clearSelection();
                 //hide cursor when we desactivate textObjectView
-                if ( repaint )
+                if ( tqrepaint )
                 {
                     m_currentTextObjectView->drawCursor( false );
                     m_currentTextObjectView->terminate();
@@ -4347,8 +4347,8 @@ void KPrCanvas::exitEditMode( bool repaint )
                 delete m_currentTextObjectView;
                 m_currentTextObjectView = 0;
 
-                if ( repaint )
-                    _repaint( static_cast<KPrObject*>( kpTextObj ) );
+                if ( tqrepaint )
+                    _tqrepaint( static_cast<KPrObject*>( kpTextObj ) );
             }
             // Title of slide may have changed
             m_view->kPresenterDoc()->updateSideBarItem( m_activePage );
@@ -4358,7 +4358,7 @@ void KPrCanvas::exitEditMode( bool repaint )
         else if (m_editObject->getType() == OT_PART )
         {
             static_cast<KPrPartObject *>(m_editObject)->deactivate();
-            _repaint( m_editObject );
+            _tqrepaint( m_editObject );
             m_editObject = 0;
             return;
         }
@@ -4602,8 +4602,8 @@ void KPrCanvas::moveObjectsByKey( int x, int y )
 
             m_moveSnapDiff = KoPoint( 0, 0 );
 
-            KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE;
-            m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snapStatus, m_moveSnapDiff );
+            KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE;
+            m_gl.snapToGuideLines( movedRect, KEY_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff );
 
             move += m_moveSnapDiff;
         }
@@ -4632,7 +4632,7 @@ void KPrCanvas::moveObjectsByKey( int x, int y )
         move.setY( pageRect.bottom() - rect.bottom() );
     }
 
-    // we only want a repaint if we have guide lines
+    // we only want a tqrepaint if we have guide lines
     if ( snapToGuideLines )
     {
         // redraw guidelines (intentionally always)
@@ -4672,7 +4672,7 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged )
     move -= m_moveSnapDiff;
 
     m_moveSnapDiff = KoPoint( 0, 0 ); // needed if all snapping is off
-    KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE;
+    KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE;
 
     if ( snapToGrid )
     {
@@ -4680,12 +4680,12 @@ void KPrCanvas::moveObjectsByMouse( KoPoint &pos, bool keepXorYunchanged )
                                                                                              - movedRect.topLeft().x() );
         m_moveSnapDiff.setY( tqRound( movedRect.topLeft().y() / doc->getGridY()) * doc->getGridY()
                                                                                              - movedRect.topLeft().y() );
-        snapStatus = KoGuides::SNAP_BOTH;
+        snaptqStatus = KoGuides::SNAP_BOTH;
     }
 
     if ( snapToGuideLines )
     {
-        m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snapStatus, m_moveSnapDiff );
+        m_gl.snapToGuideLines( movedRect, MOUSE_SNAP_DISTANCE, snaptqStatus, m_moveSnapDiff );
     }
 
     move += m_moveSnapDiff;
@@ -4745,7 +4745,7 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k
     TQRect oldBoundingRect( m_view->zoomHandler()->zoomRect( kpobject->getRepaintRect() ) );
 
     KoRect objRect = kpobject->getRealRect();
-    KoGuides::SnapStatus snapStatus( KoGuides::SNAP_NONE );
+    KoGuides::SnaptqStatus snaptqStatus( KoGuides::SNAP_NONE );
 
     bool left = false;
     bool right = false;
@@ -4754,22 +4754,22 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k
     if ( _modType == MT_RESIZE_UP || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_RU )
     {
         top = true;
-        snapStatus |= KoGuides::SNAP_HORIZ;
+        snaptqStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_DN || _modType == MT_RESIZE_LD || _modType == MT_RESIZE_RD )
     {
         bottom = true;
-        snapStatus |= KoGuides::SNAP_HORIZ;
+        snaptqStatus |= KoGuides::SNAP_HORIZ;
     }
     if ( _modType == MT_RESIZE_LF || _modType == MT_RESIZE_LU || _modType == MT_RESIZE_LD )
     {
         left = true;
-        snapStatus |= KoGuides::SNAP_VERT;
+        snaptqStatus |= KoGuides::SNAP_VERT;
     }
     if ( _modType == MT_RESIZE_RT || _modType == MT_RESIZE_RU || _modType == MT_RESIZE_RD )
     {
         right = true;
-        snapStatus |= KoGuides::SNAP_VERT;
+        snaptqStatus |= KoGuides::SNAP_VERT;
     }
     
     double newLeft = objRect.left();
@@ -4931,17 +4931,17 @@ void KPrCanvas::resizeObject( ModifyType _modType, const KoPoint & point, bool k
             {
                 sp.setY( rect.bottom() );
             }
-            m_gl.repaintSnapping( sp, snapStatus );
+            m_gl.repaintSnapping( sp, snaptqStatus );
         }
 
-        _repaint( oldBoundingRect );
-        _repaint( kpobject );
+        _tqrepaint( oldBoundingRect );
+        _tqrepaint( kpobject );
         emit objectSizeChanged();
     }
 }
 
 
-void KPrCanvas::finishResizeObject( const TQString &name, bool layout )
+void KPrCanvas::finishResizeObject( const TQString &name, bool tqlayout )
 {
     if ( m_resizeObject )
     {
@@ -4958,12 +4958,12 @@ void KPrCanvas::finishResizeObject( const TQString &name, bool layout )
             m_view->kPresenterDoc()->addCommand( resizeCmd );
         }
 
-        if ( layout )
-            m_view->kPresenterDoc()->layout( m_resizeObject );
+        if ( tqlayout )
+            m_view->kPresenterDoc()->tqlayout( m_resizeObject );
 
         m_ratio = 0.0;
         m_isResizing = false;
-        _repaint( m_resizeObject );
+        _tqrepaint( m_resizeObject );
         m_resizeObject = NULL;
     }
 }
@@ -5321,14 +5321,14 @@ void KPrCanvas::textContentsToHeight()
             if ( !macro )
                 macro = new KMacroCommand(i18n("Extend Text Contents to Height"));
             macro->addCommand( cmd);
-            _repaint( it.current() );
+            _tqrepaint( it.current() );
         }
     }
     if( macro )
     {
         macro->execute();
         m_view->kPresenterDoc()->addCommand( macro );
-        m_view->kPresenterDoc()->repaint(this);
+        m_view->kPresenterDoc()->tqrepaint(this);
     }
 }
 
@@ -5354,7 +5354,7 @@ void KPrCanvas::textObjectToContents()
     {
         macro->execute();
         m_view->kPresenterDoc()->addCommand( macro );
-        m_view->kPresenterDoc()->repaint(this);
+        m_view->kPresenterDoc()->tqrepaint(this);
     }
 
 }
@@ -5444,7 +5444,7 @@ bool KPrCanvas::checkCurrentTextEdit( KPrTextObject * textObj )
     if ( textObj && m_currentTextObjectView && m_currentTextObjectView->kpTextObject() != textObj )
     {
         m_currentTextObjectView->kpTextObject()->setEditingTextObj( false );
-        _repaint( m_currentTextObjectView->kpTextObject() );
+        _tqrepaint( m_currentTextObjectView->kpTextObject() );
         //don't remove selection otherwise break dnd.
         m_currentTextObjectView->terminate(false);
         delete m_currentTextObjectView;
@@ -5535,12 +5535,12 @@ void KPrCanvas::closeObject(bool /*close*/)
     m_view->kPresenterDoc()->addCommand( cmd );
 }
 
-void KPrCanvas::layout()
+void KPrCanvas::tqlayout()
 {
     TQPtrListIterator<KPrObject> it(getObjectList());
     for ( ; it.current(); ++it ) {
         if ( it.current()->getType() == OT_TEXT )
-            static_cast<KPrTextObject *>( it.current() )->layout();
+            static_cast<KPrTextObject *>( it.current() )->tqlayout();
     }
 }
 
@@ -5553,18 +5553,18 @@ KoPoint KPrCanvas::snapPoint( KoPoint &pos, bool repaintSnapping )
     bool snapToGuideLines = doc->showGuideLines() && !m_disableSnapping;
 
     KoPoint snapDiff = KoPoint( 0, 0 ); // needed if all snapping is off
-    KoGuides::SnapStatus snapStatus = KoGuides::SNAP_NONE;
+    KoGuides::SnaptqStatus snaptqStatus = KoGuides::SNAP_NONE;
 
     if ( snapToGrid )
     {
         snapDiff.setX( tqRound( sp.x() / doc->getGridX()) * doc->getGridX() - sp.x() );
         snapDiff.setY( tqRound( sp.y() / doc->getGridY()) * doc->getGridY() - sp.y() );
-        snapStatus = KoGuides::SNAP_BOTH;
+        snaptqStatus = KoGuides::SNAP_BOTH;
     }
 
     if ( snapToGuideLines )
     {
-        m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snapStatus, snapDiff );
+        m_gl.snapToGuideLines( sp, MOUSE_SNAP_DISTANCE, snaptqStatus, snapDiff );
     }
 
     sp += snapDiff;
diff --git a/kpresenter/KPrCanvas.h b/kpresenter/KPrCanvas.h
index 2d8c7f48..e2b373e1 100644
--- a/kpresenter/KPrCanvas.h
+++ b/kpresenter/KPrCanvas.h
@@ -360,7 +360,7 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 );
 
     TQPixmap getPicturePixmap() const;
     void closeObject(bool _close);
-    void layout();
+    void tqlayout();
     void alignVertical(VerticalAlignmentType _type );
     void savePicture();
 
@@ -376,8 +376,8 @@ exportPage( 0, s, 800, 600, "/home/khz/page0.png", "PNG", 100 );
     void objectPopup( KPrObject *object, const TQPoint &point );
 
 public slots:
-    // use repaint = false when the KPrCanvas is destroyed to avaid a possible crash
-    void exitEditMode( bool repaint = true );
+    // use tqrepaint = false when the KPrCanvas is destroyed to avaid a possible crash
+    void exitEditMode( bool tqrepaint = true );
 
     void clipCut();
     void clipCopy();
@@ -543,9 +543,9 @@ protected:
     TQRect getPageRect( bool decBorders = true ) const;
     unsigned int pageNums() const;
 
-    void _repaint( bool erase=true );
-    void _repaint( const TQRect &r );
-    void _repaint( KPrObject *o );
+    void _tqrepaint( bool erase=true );
+    void _tqrepaint( const TQRect &r );
+    void _tqrepaint( KPrObject *o );
 
     /**
      * Draw page defined in step to painter.
@@ -633,7 +633,7 @@ private:
     /// resize the m_resizeObject
     void resizeObject( ModifyType _modType, const KoPoint & point, bool keepRatio, bool scaleAroundCenter );
     /// create KPrResizeCmd
-    void finishResizeObject( const TQString &name, bool layout = true );
+    void finishResizeObject( const TQString &name, bool tqlayout = true );
 
     /**
      * @brief Display object above the other objects in editiong mode
@@ -692,7 +692,7 @@ private:
      * @param pos the point which should be snapped
      * @param repaintSnapping true if the guides should be repainted.
      * @param repaintSnapping false when the guides should not be repainted.
-     *        You have to call repaint by yourself.
+     *        You have to call tqrepaint by yourself.
      *
      * @return the position of the snapped point
      */
diff --git a/kpresenter/KPrClosedLineObject.cpp b/kpresenter/KPrClosedLineObject.cpp
index 208335f5..be409183 100644
--- a/kpresenter/KPrClosedLineObject.cpp
+++ b/kpresenter/KPrClosedLineObject.cpp
@@ -297,9 +297,9 @@ void KPrClosedLineObject::loadOasis( const TQDomElement &element, KoOasisContext
         points = parser.getPoints( d, true );
         loadOasisApplyViewBox( element, points );
     }
-    else if ( tag == "custom-shape" )
+    else if ( tag == "custom-tqshape" )
     {
-        TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-geometry" );
+        TQDomElement enhancedGeometry = KoDom::namedItemNS( element, KoXmlNS::draw, "enhanced-tqgeometry" );
 
         if ( !enhancedGeometry.isNull() )
         {
diff --git a/kpresenter/KPrCommand.cpp b/kpresenter/KPrCommand.cpp
index 5f88381d..5236aaf6 100644
--- a/kpresenter/KPrCommand.cpp
+++ b/kpresenter/KPrCommand.cpp
@@ -94,7 +94,7 @@ void KPrShadowCmd::execute()
         it.current()->setShadowParameter(newShadow.shadowDistance,
                                          newShadow.shadowDirection,
                                          newShadow.shadowColor);
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -105,7 +105,7 @@ void KPrShadowCmd::unexecute()
         objects.at( i )->setShadowParameter(oldShadow.at(i)->shadowDistance,
                                             oldShadow.at(i)->shadowDirection,
                                             oldShadow.at(i)->shadowColor);
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -145,7 +145,7 @@ void KPrSetOptionsCmd::execute()
     doc->setGridValue( gridX, gridY, false );
     doc->updateRuler();
     doc->setTxtBackCol( txtBackCol );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 void KPrSetOptionsCmd::unexecute()
@@ -155,7 +155,7 @@ void KPrSetOptionsCmd::unexecute()
     doc->setGridValue( oldGridX, oldGridY, false );
     doc->updateRuler();
     doc->setTxtBackCol( otxtBackCol );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 KPrSetBackCmd::KPrSetBackCmd( const TQString &name, const KPrBackGround::Settings &settings,
@@ -189,7 +189,7 @@ void KPrSetBackCmd::execute()
         }
 
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     if ( m_takeGlobal ) {
         TQPtrListIterator<KPrPage> it( m_doc->getPageList() );
@@ -217,7 +217,7 @@ void KPrSetBackCmd::unexecute()
             m_doc->restoreBackground(it.current());
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     if ( m_takeGlobal ) {
         TQPtrListIterator<KPrPage> it( m_doc->getPageList() );
@@ -272,7 +272,7 @@ void KPrRotateCmd::execute()
             it.current()->rotate( m_newAngle );
     }
     m_doc->updateRuler();
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -282,7 +282,7 @@ void KPrRotateCmd::unexecute()
     for ( unsigned int i = 0; i < m_objects.count(); i++ )
         m_objects.at(i)->rotate( m_oldAngles.at( i )->angle );
     m_doc->updateRuler();
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -311,7 +311,7 @@ KPrChgPixCmd::~KPrChgPixCmd()
 void KPrChgPixCmd::execute()
 {
     m_page->replaceObject( oldObject, newObject );
-    doc->repaint( newObject );
+    doc->tqrepaint( newObject );
 
     doc->updateSideBarItem( m_page );
 }
@@ -319,7 +319,7 @@ void KPrChgPixCmd::execute()
 void KPrChgPixCmd::unexecute()
 {
     m_page->replaceObject( newObject, oldObject );
-    doc->repaint( oldObject );
+    doc->tqrepaint( oldObject );
 
     doc->updateSideBarItem( m_page );
 }
@@ -378,7 +378,7 @@ void KPrDeleteCmd::execute()
     for ( itDelete.toFirst(); itDelete.current(); ++itDelete )
     {
         TQRect oldRect = m_doc->zoomHandler()->zoomRect( itDelete.current()->getRepaintRect() );
-        m_doc->repaint( oldRect );
+        m_doc->tqrepaint( oldRect );
     }
     if(textObj)
         m_doc->updateRuler();
@@ -393,7 +393,7 @@ void KPrDeleteCmd::unexecute()
     for ( ; it.current(); ++it )
     {
         it.current()->addToObjList();
-        m_doc->repaint( it.current() );
+        m_doc->tqrepaint( it.current() );
     }
 
     m_doc->updateSideBarItem( m_page );
@@ -501,7 +501,7 @@ void KPrGroupObjCmd::execute()
     m_groupObject->setSelected( true );
     m_doc->refreshGroupButton();
 
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -522,7 +522,7 @@ void KPrGroupObjCmd::unexecute()
 
     m_doc->refreshGroupButton();
 
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -561,7 +561,7 @@ void UnGroupObjCmd::execute()
 
     m_doc->refreshGroupButton();
 
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -587,7 +587,7 @@ void UnGroupObjCmd::unexecute()
     m_groupObject->setSelected( true );
     m_doc->refreshGroupButton();
 
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -641,7 +641,7 @@ void KPrInsertCmd::execute()
         m_object->addToObjList();
         if ( m_object->getType() == OT_TEXT )
             m_doc->updateRuler();
-        m_doc->repaint( m_object );
+        m_doc->tqrepaint( m_object );
     }
     else
     {
@@ -653,7 +653,7 @@ void KPrInsertCmd::execute()
             ( *it )->addToObjList();
             if ( ( *it )->getType() == OT_TEXT )
                 updateRuler = true;
-            m_doc->repaint( *it );
+            m_doc->tqrepaint( *it );
         }
         if ( updateRuler )
             m_doc->updateRuler();
@@ -678,7 +678,7 @@ void KPrInsertCmd::unexecute()
                 m_doc->updateRuler();
             }
         }
-        m_doc->repaint( oldRect );
+        m_doc->tqrepaint( oldRect );
     }
     else
     {
@@ -703,7 +703,7 @@ void KPrInsertCmd::unexecute()
         if ( updateRuler )
             m_doc->updateRuler();
 
-        m_doc->repaint( false );
+        m_doc->tqrepaint( false );
     }
 
     m_doc->updateSideBarItem( m_page );
@@ -736,7 +736,7 @@ KPrLowerRaiseCmd::~KPrLowerRaiseCmd()
 void KPrLowerRaiseCmd::execute()
 {
     m_page->setObjectList( newList );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -744,7 +744,7 @@ void KPrLowerRaiseCmd::execute()
 void KPrLowerRaiseCmd::unexecute()
 {
     m_page->setObjectList( oldList );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -783,8 +783,8 @@ void KPrMoveByCmd::execute()
             if(objects.at(i)->isSelected())
                 doc->updateRuler();
         }
-        doc->repaint( oldRect );
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( oldRect );
+        doc->tqrepaint( objects.at( i ) );
     }
 
     doc->updateSideBarItem( m_page );
@@ -803,8 +803,8 @@ void KPrMoveByCmd::unexecute()
             if(objects.at(i)->isSelected())
                 doc->updateRuler();
         }
-        doc->repaint( oldRect );
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( oldRect );
+        doc->tqrepaint( objects.at( i ) );
     }
 
     doc->updateSideBarItem( m_page );
@@ -888,8 +888,8 @@ void KPrAlignCmd::execute()
                 doc->updateRuler();
         }
 
-        doc->repaint( oldRect );
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( oldRect );
+        doc->tqrepaint( objects.at( i ) );
     }
 
     doc->updateSideBarItem( m_page );
@@ -907,8 +907,8 @@ void KPrAlignCmd::unexecute()
             if(objects.at(i)->isSelected())
                 doc->updateRuler();
         }
-        doc->repaint( oldRect );
-        doc->repaint( objects.at( i ) );
+        doc->tqrepaint( oldRect );
+        doc->tqrepaint( objects.at( i ) );
         doc->updateRuler();
     }
 
@@ -976,7 +976,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen )
                 //obj->setPen( tmpPen->pen );
                 obj->setLineBegin( tmpPen->lineBegin );
                 obj->setLineEnd( tmpPen->lineEnd );
-                //doc->repaint( obj );
+                //doc->tqrepaint( obj );
             }
         } break;
         case OT_FREEHAND:
@@ -990,7 +990,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen )
                 //obj->setPen( tmpPen->pen );
                 obj->setLineBegin( tmpPen->lineBegin );
                 obj->setLineEnd( tmpPen->lineEnd );
-                //doc->repaint( obj );
+                //doc->tqrepaint( obj );
             }
         } break;
         case OT_PIE:
@@ -1019,7 +1019,7 @@ void KoPenCmd::applyPen( KPrObject *object, Pen *tmpPen )
     if ( obj )
     {
         obj->setPen( tmpPen->pen );
-        doc->repaint( obj );
+        doc->tqrepaint( obj );
     }
 }
 
@@ -1220,7 +1220,7 @@ void KPrBrushCmd::applyBrush( KPr2DObject *object, Brush *tmpBrush )
     object->setGUnbalanced( tmpBrush->unbalanced );
     object->setGXFactor( tmpBrush->xfactor );
     object->setGYFactor( tmpBrush->yfactor );
-    doc->repaint( object );
+    doc->tqrepaint( object );
 }
 
 void KPrBrushCmd::unexecute()
@@ -1345,7 +1345,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP
     : KNamedCommand( _name )
 {
     m_doc=_doc;
-    layout = _layout;
+    tqlayout = _layout;
     oldLayout = _oldLayout;
     oldUnit = _oldUnit;
     unit = _unit;
@@ -1354,7 +1354,7 @@ KPrPgLayoutCmd::KPrPgLayoutCmd( const TQString &_name, KoPageLayout _layout, KoP
 void KPrPgLayoutCmd::execute()
 {
     m_doc->setUnit( unit );
-    m_doc->setPageLayout( layout );
+    m_doc->setPageLayout( tqlayout );
     m_doc->updateHeaderFooterPosition();
     m_doc->updateRuler();
     m_doc->updateRulerPageLayout();
@@ -1456,7 +1456,7 @@ void KPrPieValueCmd::execute()
                 obj->setPieLength( m_newValues.pieLength );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1473,7 +1473,7 @@ void KPrPieValueCmd::unexecute()
             obj->setPieLength( m_oldValues.at( i )->pieLength );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1553,7 +1553,7 @@ void KPrPolygonSettingCmd::execute()
                 obj->setSharpnessValue(m_newSettings.sharpnessValue );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1570,7 +1570,7 @@ void KPrPolygonSettingCmd::unexecute()
             obj->setSharpnessValue(m_oldSettings.at( i )->sharpnessValue);
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1670,7 +1670,7 @@ void KPrPictureSettingCmd::execute()
                 obj->setPictureBright( m_newSettings.bright );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1688,7 +1688,7 @@ void KPrPictureSettingCmd::unexecute()
             obj->setPictureBright( pictureSettings->bright );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1795,7 +1795,7 @@ void KPrRectValueCmd::execute()
             obj->setRnds( xtmp, ytmp );
         }
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1809,7 +1809,7 @@ void KPrRectValueCmd::unexecute()
         if( obj )
             obj->setRnds( m_oldValues.at( i )->xRnd, m_oldValues.at( i )->yRnd );
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -1842,12 +1842,12 @@ void KPrResizeCmd::execute()
     {
         if(object->isSelected())
             doc->updateRuler();
-        doc->layout( object );
+        doc->tqlayout( object );
     }
     if ( object->isSelected())
         doc->updateObjectStatusBarItem();
-    doc->repaint( oldRect );
-    doc->repaint( object );
+    doc->tqrepaint( oldRect );
+    doc->tqrepaint( object );
 
     doc->updateSideBarItem( m_page );
 }
@@ -1863,13 +1863,13 @@ void KPrResizeCmd::unexecute()
     {
         if(object->isSelected())
             doc->updateRuler();
-        doc->layout( object );
+        doc->tqlayout( object );
     }
     if ( object->isSelected())
         doc->updateObjectStatusBarItem();
 
-    doc->repaint( oldRect );
-    doc->repaint( object );
+    doc->tqrepaint( oldRect );
+    doc->tqrepaint( object );
 
     doc->updateSideBarItem( m_page );
 }
@@ -2368,7 +2368,7 @@ void KPrFlipObjectCommand::flipObjects()
     for ( ; it.current() ; ++it )
     {
         it.current()->flip( horizontal );
-        m_doc->repaint( it.current() );
+        m_doc->tqrepaint( it.current() );
     }
 
     m_doc->updateSideBarItem( m_page );
@@ -2425,7 +2425,7 @@ void KPrGeometryPropertiesCommand::execute()
         {
             it.current()->setProtect( m_newValue );
             if ( it.current()->isSelected() )
-                m_doc->repaint( it.current() );
+                m_doc->tqrepaint( it.current() );
         }
         else if ( m_type == KeepRatio)
             it.current()->setKeepRatio( m_newValue );
@@ -2441,7 +2441,7 @@ void KPrGeometryPropertiesCommand::unexecute()
         {
             obj->setProtect( *m_oldValue.at(i) );
             if ( obj->isSelected() )
-                m_doc->repaint( obj );
+                m_doc->tqrepaint( obj );
         }
         else if ( m_type == KeepRatio)
             obj->setKeepRatio( *m_oldValue.at(i) );
@@ -2568,7 +2568,7 @@ void KPrCloseObjectCommand::execute()
         ( *closeIt )->addToObjList();
         ( *openIt )->setSelected( false );
         ( *closeIt )->setSelected( selected );
-        m_doc->repaint( *closeIt );
+        m_doc->tqrepaint( *closeIt );
     }
     m_doc->updateSideBarItem( m_page );
 }
@@ -2585,7 +2585,7 @@ void KPrCloseObjectCommand::unexecute()
         ( *openIt )->addToObjList();
         ( *closeIt )->setSelected( false );
         ( *openIt )->setSelected( selected );
-        m_doc->repaint( *openIt );
+        m_doc->tqrepaint( *openIt );
     }
     m_doc->updateSideBarItem( m_page );
 }
@@ -2668,9 +2668,9 @@ void KPrChangeMarginCommand::execute()
         it.current()->setTextMargins( m_newMargins.leftMargin, m_newMargins.topMargin,
                                       m_newMargins.rightMargin, m_newMargins.bottomMargin);
         it.current()->resizeTextDocument();
-        it.current()->layout();
+        it.current()->tqlayout();
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2684,9 +2684,9 @@ void KPrChangeMarginCommand::unexecute()
         object->setTextMargins( marginsStruct->leftMargin, marginsStruct->topMargin,
                                 marginsStruct->rightMargin, marginsStruct->bottomMargin);
         object->resizeTextDocument();
-        object->layout();
+        object->tqlayout();
     }
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2708,8 +2708,8 @@ KPrChangeVerticalAlignmentCommand::KPrChangeVerticalAlignmentCommand( const TQSt
 void KPrChangeVerticalAlignmentCommand::execute()
 {
     m_obj->setVerticalAligment( m_newAlign );
-    m_obj->kPresenterDocument()->layout(m_obj);
-    m_obj->kPresenterDocument()->repaint(m_obj);
+    m_obj->kPresenterDocument()->tqlayout(m_obj);
+    m_obj->kPresenterDocument()->tqrepaint(m_obj);
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2717,8 +2717,8 @@ void KPrChangeVerticalAlignmentCommand::execute()
 void KPrChangeVerticalAlignmentCommand::unexecute()
 {
     m_obj->setVerticalAligment( m_oldAlign );
-    m_obj->kPresenterDocument()->layout(m_obj);
-    m_obj->kPresenterDocument()->repaint(m_obj);
+    m_obj->kPresenterDocument()->tqlayout(m_obj);
+    m_obj->kPresenterDocument()->tqrepaint(m_obj);
 
     m_doc->updateSideBarItem( m_page );
 }
@@ -2779,7 +2779,7 @@ void KPrImageEffectCmd::execute()
             obj->setIEParams(newSettings.param1, newSettings.param2, newSettings.param3);
         }
     }
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
@@ -2794,7 +2794,7 @@ void KPrImageEffectCmd::unexecute()
                              oldSettings.at( i )->param3);
         }
     }
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     doc->updateSideBarItem( m_page );
 }
diff --git a/kpresenter/KPrCommand.h b/kpresenter/KPrCommand.h
index 48e977ce..4a4cc0ec 100644
--- a/kpresenter/KPrCommand.h
+++ b/kpresenter/KPrCommand.h
@@ -31,7 +31,7 @@
 #include <KoPictureCollection.h>
 #include <tqvaluelist.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 #include <KoPageLayoutDia.h>
 #include <KoParagLayout.h>
 #include <KoTextCommand.h>
@@ -543,7 +543,7 @@ public:
 
 protected:
     KPrDocument *m_doc;
-    KoPageLayout layout, oldLayout;
+    KoPageLayout tqlayout, oldLayout;
     KoUnit::Unit unit, oldUnit;
 };
 
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index aea1d31c..42a701e9 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -40,7 +40,7 @@
 #include <tqgroupbox.h>
 #include <tqvgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbox.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
@@ -365,13 +365,13 @@ void KPrConfigureColorBackground::apply()
     if( oldGridColor != _col ) {
         config->setGroup( "KPresenter Color" );
         config->writeEntry( "GridColor", _col );
-        doc->repaint( false );
+        doc->tqrepaint( false );
         doc->setGridColor( _col );
         oldGridColor=_col;
         repaintNeeded = true;
     }
     if (repaintNeeded)
-        doc->repaint( false );
+        doc->tqrepaint( false );
 }
 
 void KPrConfigureColorBackground::slotDefault()
@@ -419,9 +419,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch
     config = KPrFactory::global()->config();
 
     TQGroupBox* tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Misc"), this, "GroupBox" );
-    tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
-    tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
-    TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 );
+    tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
+    tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
+    TQGridLayout *grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 );
 
     m_oldNbRedo=30;
     m_printNotes=true;
@@ -469,9 +469,9 @@ KPrConfigureMiscPage::KPrConfigureMiscPage( KPrView *_view, TQWidget *parent, ch
     box->addWidget(tmpTQGroupBox);
 
     tmpTQGroupBox = new TQGroupBox( 0, Qt::Vertical, i18n("Grid"), this, "GroupBox" );
-    tmpTQGroupBox->layout()->setSpacing(KDialog::spacingHint());
-    tmpTQGroupBox->layout()->setMargin(KDialog::marginHint());
-    grid = new TQGridLayout( tmpTQGroupBox->layout(), 8, 1 );
+    tmpTQGroupBox->tqlayout()->setSpacing(KDialog::spacingHint());
+    tmpTQGroupBox->tqlayout()->setMargin(KDialog::marginHint());
+    grid = new TQGridLayout( tmpTQGroupBox->tqlayout(), 8, 1 );
 
     KoRect rect = doc->masterPage()->getPageRect();
     TQLabel *lab=new TQLabel(i18n("Horizontal grid size:"), tmpTQGroupBox);
@@ -567,7 +567,7 @@ KCommand * KPrConfigureMiscPage::apply()
 
     doc->setGridValue( resolutionX->value(),
                        resolutionY->value(), true);
-    doc->repaint( false );
+    doc->tqrepaint( false );
 
     config->sync();
 
diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp
index 46c485cb..7c0fa1c9 100644
--- a/kpresenter/KPrCustomSlideShowDia.cpp
+++ b/kpresenter/KPrCustomSlideShowDia.cpp
@@ -18,13 +18,13 @@
 */
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqlistbox.h>
 #include <tqpushbutton.h>
 #include <tqtoolbutton.h>
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kdebug.h>
 #include <kmessagebox.h>
 #include <klocale.h>
@@ -214,7 +214,7 @@ void KPrCustomSlideShowDia::slotCopy()
         {
             if ( !uniqueName( i, str ) )
             {
-                str = str.arg( i );
+                str = str.tqarg( i );
                 m_customSlideShowMap.insert( str, m_customSlideShowMap[item->text()] );
                 list->insertItem( str );
                 break;
@@ -225,7 +225,7 @@ void KPrCustomSlideShowDia::slotCopy()
 
 bool KPrCustomSlideShowDia::uniqueName( int val, const TQString & name ) const
 {
-    TQString str = name.arg( val );
+    TQString str = name.tqarg( val );
     for ( int i= 0; i < ( int )list->count(); ++i )
     {
         if ( list->text ( i ) == str )
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 17a8f0c6..7a880406 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -43,7 +43,7 @@
 #include "KPrSVGPathParser.h"
 
 #include <tqpopupmenu.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqregexp.h>
 #include <tqfileinfo.h>
 #include <tqdom.h>
@@ -272,7 +272,7 @@ KPrDocument::KPrDocument( TQWidget *parentWidget, const char *widgetName, TQObje
     saveOnlyPage = -1;
     m_maxRecentFiles = 10;
 
-    connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
              this, TQT_SLOT( clipboardDataChanged() ) );
 
     m_commandHistory = new KoCommandHistory( actionCollection(),  true ) ;
@@ -444,9 +444,9 @@ bool KPrDocument::saveChildren( KoStore* _store )
 {
     int i = 0;
 
-    TQPtrListIterator<KoDocumentChild> it( children() );
+    TQPtrListIterator<KoDocumentChild> it( tqchildren() );
     for( ; it.current(); ++it ) {
-        // Don't save children that are only in the undo/redo history
+        // Don't save tqchildren that are only in the undo/redo history
         // but not anymore in the presentation
         TQPtrListIterator<KPrPage> pageIt( m_pageList );
         for ( int pagePos = 0; pageIt.current(); ++pageIt, ++pagePos )
@@ -490,7 +490,7 @@ TQDomDocument KPrDocument::saveXML()
         emit sigProgress( 0 );
     }
 
-    m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime());
+    m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime());
     recalcVariables( VT_DATE );
     recalcVariables( VT_TIME );
     recalcVariables( VT_STATISTIC );
@@ -669,9 +669,9 @@ TQDomDocument KPrDocument::saveXML()
     }
 
     // Write "OBJECT" tag for every child
-    TQPtrListIterator<KoDocumentChild> chl( children() );
+    TQPtrListIterator<KoDocumentChild> chl( tqchildren() );
     for( ; chl.current(); ++chl ) {
-        // Don't save children that are only in the undo/redo history
+        // Don't save tqchildren that are only in the undo/redo history
         // but not anymore in the presentation
         for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ ) {
             if ( saveOnlyPage != -1 && i != saveOnlyPage )
@@ -735,8 +735,8 @@ void KPrDocument::saveEmbeddedObject(KPrPage *page, KoDocumentChild *chl, TQDomD
             TQDomElement embedded=doc.createElement("EMBEDDED");
             KPrChild* curr = (KPrChild*)chl;
 
-            // geometry is no zoom value !
-            TQRect _rect = curr->geometry();
+            // tqgeometry is no zoom value !
+            TQRect _rect = curr->tqgeometry();
             int tmpX = (int)zoomHandler()->unzoomItX( _rect.x() );
             int tmpY = (int)zoomHandler()->unzoomItY( _rect.y() );
             int tmpWidth = (int)zoomHandler()->unzoomItX( _rect.width() );
@@ -909,7 +909,7 @@ TQDomElement KPrDocument::saveUsedSoundFileToXML( TQDomDocument &_doc, TQStringL
         TQString soundFileName = *it;
         int position = soundFileName.findRev( '.' );
         TQString format = soundFileName.right( soundFileName.length() - position - 1 );
-        TQString _name = TQString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() );
+        TQString _name = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() );
 
         TQDomElement fileElem = _doc.createElement( "FILE" );
         soundFiles.appendChild( fileElem );
@@ -955,7 +955,7 @@ void KPrDocument::saveUsedSoundFileToStore( KoStore *_store, TQStringList _list
         TQString soundFileName = *it;
         int position = soundFileName.findRev( '.' );
         TQString format = soundFileName.right( soundFileName.length() - position - 1 );
-        TQString _storeURL = TQString( "sounds/sound%1.%2" ).arg( ++i ).arg( format.lower() );
+        TQString _storeURL = TQString( "sounds/sound%1.%2" ).tqarg( ++i ).tqarg( format.lower() );
 
         if ( _store->open( _storeURL ) ) {
             KoStoreDevice dev( _store );
@@ -973,7 +973,7 @@ bool KPrDocument::loadChildren( KoStore* _store )
 {
     if ( objStartY == 0 && _clean) // Don't do this when inserting a template or a page...
     {
-        TQPtrListIterator<KoDocumentChild> it( children() );
+        TQPtrListIterator<KoDocumentChild> it( tqchildren() );
         for( ; it.current(); ++it ) {
             if ( !((KoDocumentChild*)it.current())->loadDocument( _store ) )
                 return false;
@@ -981,7 +981,7 @@ bool KPrDocument::loadChildren( KoStore* _store )
     }
     else // instead load form the correct child on, m_childCountBeforeInsert has the be set
     {
-        TQPtrListIterator<KoDocumentChild> it( children() );
+        TQPtrListIterator<KoDocumentChild> it( tqchildren() );
         for( int i = 0; it.current(); ++it, ++i ) {
             if ( i < m_childCountBeforeInsert )
                 continue;
@@ -1006,7 +1006,7 @@ bool KPrDocument::saveOasis( KoStore* store, KoXmlWriter* manifestWriter )
     KoXmlWriter* contentWriter = createOasisXmlWriter( &contentDev, "office:document-content" );
 
 
-    m_varColl->variableSetting()->setModificationDate(TQDateTime::currentDateTime());
+    m_varColl->variableSetting()->setModificationDate(TQDateTime::tqcurrentDateTime());
     recalcVariables( VT_DATE );
     recalcVariables( VT_TIME );
     recalcVariables( VT_STATISTIC );
@@ -1535,7 +1535,7 @@ void KPrDocument::saveOasisDocumentStyles( KoStore* store, KoGenStyles& mainStyl
         Q_ASSERT( styles.count() == 1 );
         it = styles.begin();
         for ( ; it != styles.end() ; ++it ) {
-            (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-layout", (*it).name, "style:page-layout-properties", false /*don't close*/ );
+            (*it).style->writeStyle( stylesWriter, mainStyles, "style:page-tqlayout", (*it).name, "style:page-tqlayout-properties", false /*don't close*/ );
             stylesWriter->endElement();
         }
 
@@ -1614,7 +1614,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles
         if ( localName.isEmpty() )
             setErrorMessage( i18n( "Invalid OASIS OpenDocument file. No tag found inside office:body." ) );
         else
-            setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).arg( KoDocument::tagNameToDocumentType( localName ) ) );
+            setErrorMessage( i18n( "This document is not a presentation, but a %1. Please try opening it with the appropriate application." ).tqarg( KoDocument::tagNameToDocumentType( localName ) ) );
         return false;
     }
 
@@ -1648,7 +1648,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles
         kdDebug()<<" masterPageName:"<<masterPageName<<endl;
         if ( ! master )
         {
-            masterPageName = "Standard"; // use default layout as fallback (default in kpresenter)
+            masterPageName = "Standard"; // use default tqlayout as fallback (default in kpresenter)
             master = oasisStyles.masterPages()[ masterPageName];
             if ( !master ) //last test...
                 master = oasisStyles.masterPages()["Default"];
@@ -1685,7 +1685,7 @@ bool KPrDocument::loadOasis( const TQDomDocument& doc, KoOasisStyles&oasisStyles
         kdDebug()<<" end load oasis master style \n";
 
         Q_ASSERT( master );
-        const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-layout-name", TQString() )) : 0;
+        const TQDomElement *style = master ? oasisStyles.findStyle(master->attributeNS( KoXmlNS::style, "page-tqlayout-name", TQString() )) : 0;
         const TQDomElement *backgroundStyle = oasisStyles.findStyle( "Standard-background", "presentation" );
         kdDebug()<<"Standard background "<<backgroundStyle<<endl;
         // parse all pages
@@ -1857,7 +1857,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                         TQRect r;
                         KPrPartObject *kppartobject = new KPrPartObject( ch );
                         kppartobject->loadOasis( o, context, m_loadingInfo );
-                        r = ch->geometry();
+                        r = ch->tqgeometry();
                         if ( groupObject )
                             groupObject->addObjects( kppartobject );
                         else
@@ -1993,11 +1993,11 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                         break;
                 }
             }
-            else if ( name == "custom-shape" && isDrawNS )
+            else if ( name == "custom-tqshape" && isDrawNS )
             {
                 fillStyleStack( o, context, "graphic" );
 
-                TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-geometry" );
+                TQDomElement enhancedGeometry = KoDom::namedItemNS( o, KoXmlNS::draw, "enhanced-tqgeometry" );
 
                 if ( !enhancedGeometry.isNull() )
                 {
@@ -2054,13 +2054,13 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                                         newpage->appendObject( kpClosedObject );
                                 } break;
                             default:
-                                kdDebug(33001) << "draw:custom-shape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl;
+                                kdDebug(33001) << "draw:custom-tqshape found unsupported object type " << objType << " in draw:enhanced-path " << d << endl;
                                 break;
                         }
                     }
                     else
                     {
-                        kdDebug(33001) << "draw:custom-shape not supported" << endl;
+                        kdDebug(33001) << "draw:custom-tqshape not supported" << endl;
                     }
                 }
             }
@@ -2089,7 +2089,7 @@ void KPrDocument::loadOasisObject( KPrPage * newpage, TQDomNode & drawPage, KoOa
                     if ( !note.isEmpty() )
                         note += "\n";
 
-                    //todo load layout for note.
+                    //todo load tqlayout for note.
                     TQDomNode textBox = KoDom::namedItemNS( frameBox, KoXmlNS::draw, "text-box" );
 
                     if ( !textBox.isNull() )
@@ -2136,10 +2136,10 @@ int KPrDocument::createPresentationAnimation(const TQDomElement& element, int or
         {
             const bool isPresentationNS = e.namespaceURI() == KoXmlNS::presentation;
             if ( isPresentationNS &&
-                 ( tagName == "show-shape" || tagName == "hide-shape" ) )
+                 ( tagName == "show-tqshape" || tagName == "hide-tqshape" ) )
             {
-                Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "shape-id" ) );
-                TQString name = e.attributeNS( KoXmlNS::draw, "shape-id", TQString() );
+                Q_ASSERT( e.hasAttributeNS( KoXmlNS::draw, "tqshape-id" ) );
+                TQString name = e.attributeNS( KoXmlNS::draw, "tqshape-id", TQString() );
                 kdDebug()<<" insert animation " << tagName << " name :" << name << endl;
 
                 if ( e.hasAttributeNS( KoXmlNS::koffice, "order-id" ) )
@@ -2150,7 +2150,7 @@ int KPrDocument::createPresentationAnimation(const TQDomElement& element, int or
                 lstAnimation *tmp = new lstAnimation;
                 tmp->element = new TQDomElement( e );
                 tmp->order = orderAnimation;
-                if ( tagName == "show-shape" )
+                if ( tagName == "show-tqshape" )
                 {
                     m_loadingInfo->storePresentationShowAnimation( tmp, name );
                 }
@@ -2246,7 +2246,7 @@ bool KPrDocument::loadXML( TQIODevice * dev, const TQDomDocument& doc )
                             << "  Line: " << errorLine << " Column: " << errorColumn << endl
                             << "  Message: " << errorMsg << endl;
             setErrorMessage( i18n( "parsing error in the main document (converted from an old KPresenter format) at line %1, column %2\nError message: %3" )
-                             .arg( errorLine ).arg( errorColumn ).arg( i18n ( errorMsg.utf8() ) ) );
+                             .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( errorMsg.utf8() ) ) );
             return false;
         }
         b = loadXML( newdoc );
@@ -2294,7 +2294,7 @@ void KPrDocument::insertEmbedded( KoStore *store, TQDomElement topElem, KMacroCo
             TQDomElement object=elem.namedItem("OBJECT").toElement();
             if(!object.isNull()) {
                 ch->load(object, true);  // true == uppercase
-                r = ch->geometry();
+                r = ch->tqgeometry();
                 ch->loadDocument( store );
                 insertChild( ch );
                 kppartobject = new KPrPartObject( ch );
@@ -2376,7 +2376,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc )
            document.attribute("mime")!="application/x-kpresenter" &&
            document.attribute("mime")!="application/vnd.kde.kpresenter" ) ) {
         kdError(33001) << "Unknown mime type " << document.attribute("mime") << endl;
-        setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").arg(document.attribute("mime")) );
+        setErrorMessage( i18n("Invalid document, expected mimetype application/x-kpresenter or application/vnd.kde.kpresenter, got %1").tqarg(document.attribute("mime")) );
         return false;
     }
     if(document.hasAttribute("url"))
@@ -2401,7 +2401,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc )
             TQDomElement object=elem.namedItem("OBJECT").toElement();
             if(!object.isNull()) {
                 ch->load(object, true);  // true == uppercase
-                r = ch->geometry();
+                r = ch->tqgeometry();
                 insertChild( ch );
                 kppartobject = new KPrPartObject( ch );
                 //emit sig_insertObject( ch, kppartobject );
@@ -2514,7 +2514,7 @@ bool KPrDocument::loadXML( const TQDomDocument &doc )
                 else if(borders.hasAttribute("mmBottom"))    //compatibility
                     __pgLayout.ptBottom = MM_TO_POINT( borders.attribute("inchBottom").toDouble() );
             }
-            // PAPER found and parsed -> apply page layout
+            // PAPER found and parsed -> apply page tqlayout
             // e.g. the text objects need it
             if ( _clean )
                 setPageLayout( __pgLayout );
@@ -3275,26 +3275,26 @@ void KPrDocument::setPageLayout( const KoPageLayout &pgLayout )
     //for ( int i = 0; i < static_cast<int>( m_pageList.count() ); i++ )
     //    m_pageList.at( i )->updateBackgroundSize();
 
-    repaint( false );
-    layout();
+    tqrepaint( false );
+    tqlayout();
     // don't setModified(true) here, since this is called on startup
 }
 
-//when we change pagelayout we must re-position header/footer
+//when we change pagetqlayout we must re-position header/footer
 void KPrDocument::updateHeaderFooterPosition( )
 {
     KoRect pageRect=m_masterPage->getPageRect();
     TQRect oldBoundingRect = zoomHandler()->zoomRect( _header->getRepaintRect() );
     _header->setOrig(pageRect.topLeft ());
     _header->setSize(pageRect.width(),_header->getSize().height());
-    repaint( oldBoundingRect );
-    repaint(_header);
+    tqrepaint( oldBoundingRect );
+    tqrepaint(_header);
 
     oldBoundingRect = zoomHandler()->zoomRect( _footer->getRepaintRect() );
     _footer->setOrig(pageRect.left(),pageRect.bottom()-_footer->getSize().height());
     _footer->setSize(pageRect.width(),_footer->getSize().height());
-    repaint(oldBoundingRect);
-    repaint(_footer);
+    tqrepaint(oldBoundingRect);
+    tqrepaint(_footer);
 }
 
 bool KPrDocument::initDoc(InitDocFlags flags, TQWidget* parentWidget)
@@ -3386,7 +3386,7 @@ void KPrDocument::setEmpty()
 {
     KoDocument::setEmpty();
     // Whether loaded from template or from empty doc: this is a new one -> set creation date
-    m_varColl->variableSetting()->setCreationDate(TQDateTime::currentDateTime());
+    m_varColl->variableSetting()->setCreationDate(TQDateTime::tqcurrentDateTime());
     recalcVariables( VT_DATE ); // , VST_CREATION_DATE ...
     // If we then load a document, it will override that date.
 }
@@ -3401,16 +3401,16 @@ void KPrDocument::setGridValue( double _x, double _y, bool _replace )
         replaceObjs();
 }
 
-void KPrDocument::repaint( bool erase )
+void KPrDocument::tqrepaint( bool erase )
 {
     TQPtrListIterator<KoView> it( views() );
     for( ; it.current(); ++it ) {
         KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas();
-        canvas->repaint( erase );
+        canvas->tqrepaint( erase );
     }
 }
 
-void KPrDocument::repaint( const TQRect& rect )
+void KPrDocument::tqrepaint( const TQRect& rect )
 {
     TQRect r;
     TQPtrListIterator<KoView> it( views() );
@@ -3423,25 +3423,25 @@ void KPrDocument::repaint( const TQRect& rect )
     }
 }
 
-void KPrDocument::layout(KPrObject *kpobject)
+void KPrDocument::tqlayout(KPrObject *kpobject)
 {
     KPrTextObject * obj = dynamic_cast<KPrTextObject *>( kpobject );
     if (obj)
-        obj->layout();
+        obj->tqlayout();
 }
 
-void KPrDocument::layout()
+void KPrDocument::tqlayout()
 {
     TQPtrListIterator<KoView> it( views() );
     for( ; it.current(); ++it ) {
         KPrCanvas* canvas = ((KPrView*)it.current())->getCanvas();
-        canvas->layout();
+        canvas->tqlayout();
     }
 }
 
-void KPrDocument::repaint( KPrObject *kpobject )
+void KPrDocument::tqrepaint( KPrObject *kpobject )
 {
-    repaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) );
+    tqrepaint( m_zoomHandler->zoomRect( kpobject->getRepaintRect() ) );
 }
 
 TQValueList<int> KPrDocument::getPageEffectSteps( unsigned int num )
@@ -3556,7 +3556,7 @@ void KPrDocument::takePage( KPrPage *page, int pageNum )
         }
     }
 
-    repaint( false );
+    tqrepaint( false );
 }
 
 void KPrDocument::pageOrderChanged()
@@ -3646,7 +3646,7 @@ int KPrDocument::insertNewPage( const TQString &cmdName, int _page, InsertPos _i
     KPrPage *newpage = new KPrPage( this, m_masterPage );
 
     m_pageWhereLoadObject=newpage;
-    m_childCountBeforeInsert = children().count();
+    m_childCountBeforeInsert = tqchildren().count();
 
     bool ok = loadNativeFormat( fileName );
     if ( !ok )
@@ -3726,7 +3726,7 @@ KCommand * KPrDocument::loadPastedObjs( const TQString &in, KPrPage* _page )
     KCommand *cmd = loadObjects(document,true);
     m_pageWhereLoadObject=0L;
 
-    repaint( false );
+    tqrepaint( false );
     setModified( true );
     return cmd;
 }
@@ -3750,7 +3750,7 @@ void KPrDocument::setDisplayObjectMasterPage( bool b )
     TQPtrListIterator<KoView> it( views() );
     for (; it.current(); ++it )
         ((KPrView*)it.current())->updateDisplayObjectMasterPageButton();
-    repaint(b);
+    tqrepaint(b);
 }
 
 void KPrDocument::setDisplayBackground( bool b )
@@ -3758,7 +3758,7 @@ void KPrDocument::setDisplayBackground( bool b )
     TQPtrListIterator<KoView> it( views() );
     for (; it.current(); ++it )
         ((KPrView*)it.current())->updateDisplayBackgroundButton();
-    repaint(b);
+    tqrepaint(b);
 }
 
 void KPrDocument::setHeader( bool b )
@@ -3772,7 +3772,7 @@ void KPrDocument::setHeader( bool b )
     }
     m_masterPage->setHeader( b, false );
     updateHeaderFooterButton();
-    repaint(b);
+    tqrepaint(b);
 }
 
 void KPrDocument::setFooter( bool b )
@@ -3786,7 +3786,7 @@ void KPrDocument::setFooter( bool b )
     }
     m_masterPage->setFooter( b, false );
     updateHeaderFooterButton();
-    repaint(b);
+    tqrepaint(b);
 }
 
 void KPrDocument::updateHeaderFooterButton()
@@ -3917,7 +3917,7 @@ void KPrDocument::movePage( int from, int to )
 void KPrDocument::copyPage( int from )
 {
     _clean = false;
-    m_childCountBeforeInsert = children().count();
+    m_childCountBeforeInsert = tqchildren().count();
 
     _duplicatePage=true; // ### now also set via savePage() parameter below
 
@@ -3963,7 +3963,7 @@ void KPrDocument::copyPageToClipboard( int pgnum )
     KURL url; url.setPath( tempFile.name() );
     KURL::List lst;
     lst.append( url );
-    TQApplication::clipboard()->setData( new KURLDrag( lst ) );
+    TQApplication::tqclipboard()->setData( new KURLDrag( lst ) );
     m_tempFileInClipboard = tempFile.name(); // do this last, the above calls clipboardDataChanged
 }
 
@@ -3987,7 +3987,7 @@ void KPrDocument::clipboardDataChanged()
     }
     // TODO enable paste as well, when a txtobject is activated
     // and there is plain text in the clipboard. Then enable this code.
-    //TQMimeSource *data = TQApplication::clipboard()->data();
+    //TQMimeSource *data = TQApplication::tqclipboard()->data();
     //bool canPaste = data->provides( "text/uri-list" ) || data->provides( "application/x-kpresenter-selection" );
     // emit enablePaste( canPaste );
 }
@@ -4145,7 +4145,7 @@ void KPrDocument::slotRepaintChanged( KPrTextObject *kptextobj )
 {
     //todo
     //use this function for the moment
-    repaint( kptextobj );
+    tqrepaint( kptextobj );
 }
 
 
@@ -4156,7 +4156,7 @@ void KPrDocument::recalcVariables( int type )
     if ( modifiedVariables.isEmpty() )
         return;
 
-    // TODO use the return value from recalcVariables to only repaint what has changed.
+    // TODO use the return value from recalcVariables to only tqrepaint what has changed.
     TQPtrListIterator<KPrPage> it( m_pageList );
     for ( ; it.current(); ++it )
         it.current()->slotRepaintVariable();
@@ -4295,7 +4295,7 @@ void KPrDocument::newZoomAndResolution( bool updateViews, bool /*forPrint*/ )
         for (; it.current(); ++it )
         {
             static_cast<KPrView *>( it.current() )->getCanvas()->update();
-            static_cast<KPrView *>( it.current() )->getCanvas()->layout();
+            static_cast<KPrView *>( it.current() )->getCanvas()->tqlayout();
         }
     }
 }
@@ -4665,7 +4665,7 @@ void KPrDocument::insertFile(const TQString & file )
 {
     m_insertFilePage = m_pageList.count();
 
-    m_childCountBeforeInsert = children().count();
+    m_childCountBeforeInsert = tqchildren().count();
     objStartY = 0;
     bool clean = _clean;
     _clean = false;
diff --git a/kpresenter/KPrDocument.h b/kpresenter/KPrDocument.h
index 3584e372..c51060a4 100644
--- a/kpresenter/KPrDocument.h
+++ b/kpresenter/KPrDocument.h
@@ -166,7 +166,7 @@ class KPrDocument : public KoDocument
     virtual void addView( KoView *_view );
     virtual void removeView( KoView *_view );
 
-    // page layout
+    // page tqlayout
     void setPageLayout( const KoPageLayout &);
 
     virtual TQPixmap generatePreview( const TQSize &size );
@@ -236,11 +236,11 @@ class KPrDocument : public KoDocument
     void deletePage( int _page );
     void copyPageToClipboard( int pgnum );
 
-    // repaint all views
-    void repaint( bool );
+    // tqrepaint all views
+    void tqrepaint( bool );
 
-    void repaint( const TQRect& );
-    void repaint( KPrObject* );
+    void tqrepaint( const TQRect& );
+    void tqrepaint( KPrObject* );
 
     // stuff for screen-presentations
     /**
@@ -461,8 +461,8 @@ class KPrDocument : public KoDocument
     KoCommandHistory * commandHistory()const { return m_commandHistory; }
     void updateObjectStatusBarItem();
     void updateObjectSelected();
-    void layout(KPrObject *kpobject);
-    void layout();
+    void tqlayout(KPrObject *kpobject);
+    void tqlayout();
     void changeBgSpellCheckingState( bool b );
 
     bool cursorInProtectedArea()const;
@@ -552,7 +552,7 @@ protected:
     void testAndCloseAllTextObjectProtectedContent();
     // ************ functions ************
     /**
-     * Overloaded function from @ref Document_impl. Saves all children.
+     * Overloaded function from @ref Document_impl. Saves all tqchildren.
      */
     virtual bool saveChildren( KoStore* _store );
 
@@ -707,8 +707,8 @@ private:
     KPrLoadingInfo *m_loadingInfo;
     TQValueList<int> *m_customListTest;
 
-    /// here the amount of existing children before inserting a page/file
-    /// is saved, so that we load the correct children
+    /// here the amount of existing tqchildren before inserting a page/file
+    /// is saved, so that we load the correct tqchildren
     int m_childCountBeforeInsert;
 };
 
diff --git a/kpresenter/KPrDocumentIface.cpp b/kpresenter/KPrDocumentIface.cpp
index aa4d154a..04235d73 100644
--- a/kpresenter/KPrDocumentIface.cpp
+++ b/kpresenter/KPrDocumentIface.cpp
@@ -432,13 +432,13 @@ void KPrDocumentIface::setShowGuideLines( bool b )
 {
     doc->setShowGuideLines( b );
     doc->updateGuideLineButton();
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 void KPrDocumentIface::addGuideLine( bool horizontal, double pos )
 {
     doc->addGuideLine( horizontal ? Qt::Horizontal: Qt::Vertical, pos );
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 unsigned int KPrDocumentIface::nbHorizontalHelpLine() const
@@ -460,7 +460,7 @@ void KPrDocumentIface::setShowGrid ( bool _grid )
 {
     doc->setShowGrid( _grid);
     doc->updateGridButton();
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 double KPrDocumentIface::gridX() const
@@ -472,7 +472,7 @@ void KPrDocumentIface::setGridX(double _x)
 {
     doc->setGridX( _x );
     if( showGrid() )
-        doc->repaint( false );
+        doc->tqrepaint( false );
 }
 
 double KPrDocumentIface::gridY() const
@@ -484,7 +484,7 @@ void KPrDocumentIface::setGridY(double _y)
 {
     doc->setGridY( _y );
     if( showGrid() )
-        doc->repaint( false );
+        doc->tqrepaint( false );
 }
 
 bool KPrDocumentIface::configAutoSuperScript() const
@@ -555,9 +555,9 @@ TQStringList KPrDocumentIface::presentationList()
     return doc->presentationList();
 }
 
-void KPrDocumentIface::repaint()
+void KPrDocumentIface::tqrepaint()
 {
-    doc->repaint( false );
+    doc->tqrepaint( false );
 }
 
 void KPrDocumentIface::setConfigToolTipCompletion( bool b )
diff --git a/kpresenter/KPrDocumentIface.h b/kpresenter/KPrDocumentIface.h
index 83429fb0..3dd061df 100644
--- a/kpresenter/KPrDocumentIface.h
+++ b/kpresenter/KPrDocumentIface.h
@@ -178,7 +178,7 @@ k_dcop:
 
     /// Repaint document. Call this after moving or resizing an object, for instance.
     /// @since 1.4
-    void repaint();
+    void tqrepaint();
 
 private:
     KPrDocument *doc;
diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp
index 6b4957f6..0b0c7646 100644
--- a/kpresenter/KPrDuplicateObjDia.cpp
+++ b/kpresenter/KPrDuplicateObjDia.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
 
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index 3834e0dc..a394e0a8 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -32,7 +32,7 @@
 #include <tqcheckbox.h>
 #include <tqlineedit.h>
 #include <tqvaluelist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 #include <tqstringlist.h>
 #include <tqdir.h>
@@ -62,13 +62,13 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     topLayout = new TQVBoxLayout( page, 0, spacingHint() );
 
     TQGroupBox *grp1 = new TQGroupBox(0, Qt::Vertical, i18n( "Appear" ), page );
-    grp1->layout()->setSpacing(KDialog::spacingHint());
-    grp1->layout()->setMargin(KDialog::marginHint());
+    grp1->tqlayout()->setSpacing(KDialog::spacingHint());
+    grp1->tqlayout()->setMargin(KDialog::marginHint());
     topLayout->addWidget(grp1);
-    TQGridLayout *upperRow = new TQGridLayout(grp1->layout(), 6, 4);
+    TQGridLayout *upperRow = new TQGridLayout(grp1->tqlayout(), 6, 4);
 
     lAppear = new TQLabel( i18n( "Order of appearance:" ), grp1 );
-    lAppear->setAlignment( AlignVCenter );
+    lAppear->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lAppear, 0, 0);
 
     eAppearStep = new TQSpinBox( 0, 100, 1, grp1 );
@@ -79,7 +79,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     //( void )new TQWidget( grp1 );
 
     lEffect = new TQLabel( i18n( "Effect (appearing):" ), grp1 );
-    lEffect->setAlignment( AlignVCenter );
+    lEffect->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lEffect, 1, 0);
 
     cEffect = new TQComboBox( false, grp1, "cEffect" );
@@ -102,7 +102,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( cEffect, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( appearEffectChanged( int ) ) );
 
     lAppearSpeed = new TQLabel( i18n( "Speed:" ), grp1 );
-    lAppearSpeed->setAlignment( AlignVCenter );
+    lAppearSpeed->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lAppearSpeed, 2, 0);
 
     cAppearSpeed = new TQComboBox( false, grp1, "cEffect" );
@@ -114,7 +114,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     appearEffectChanged( cEffect->currentItem() );
 
     lEffect2 = new TQLabel( i18n( "Effect (object specific):" ), grp1 );
-    lEffect2->setAlignment( AlignVCenter );
+    lEffect2->tqsetAlignment( AlignVCenter );
     upperRow->addWidget(lEffect2, 3, 0);
 
     cEffect2 = new TQComboBox( false, grp1, "cEffect2" );
@@ -144,7 +144,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     }
 
     TQLabel *lTimerOfAppear = new TQLabel( i18n( "Timer of the object:" ), grp1 );
-    lTimerOfAppear->setAlignment( AlignVCenter );
+    lTimerOfAppear->tqsetAlignment( AlignVCenter );
     upperRow->addWidget( lTimerOfAppear, 4, 0 );
 
     timerOfAppear = new KIntNumInput( obj->getAppearTimer(), grp1 );
@@ -164,7 +164,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( appearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( appearSoundEffectChanged() ) );
 
     lSoundEffect1 = new TQLabel( i18n( "File name:" ), grp1 );
-    lSoundEffect1->setAlignment( AlignVCenter );
+    lSoundEffect1->tqsetAlignment( AlignVCenter );
     upperRow->addWidget( lSoundEffect1, 6, 0 );
 
     requester1 = new KURLRequester( grp1 );
@@ -197,13 +197,13 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     topLayout->addWidget(disappear);
 
     TQGroupBox *grp2 = new TQGroupBox(0, Qt::Vertical, i18n( "Disappear" ), page);
-    grp2->layout()->setSpacing(KDialog::spacingHint());
-    grp2->layout()->setMargin(KDialog::marginHint());
+    grp2->tqlayout()->setSpacing(KDialog::spacingHint());
+    grp2->tqlayout()->setMargin(KDialog::marginHint());
     topLayout->addWidget(grp2);
-    TQGridLayout *lowerRow = new TQGridLayout(grp2->layout(), 5, 4);
+    TQGridLayout *lowerRow = new TQGridLayout(grp2->tqlayout(), 5, 4);
 
     lDisappear = new TQLabel( i18n( "Order of disappearance:" ), grp2 );
-    lDisappear->setAlignment( AlignVCenter );
+    lDisappear->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget(lDisappear, 0, 0);
 
     eDisappearStep = new TQSpinBox( 0, 100, 1, grp2 );
@@ -211,7 +211,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     lowerRow->addWidget(eDisappearStep, 0, 1);
 
     lDEffect = new TQLabel( i18n( "Effect (disappearing):" ), grp2 );
-    lDEffect->setAlignment( AlignVCenter );
+    lDEffect->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget(lDEffect, 1, 0);
 
     cDisappear = new TQComboBox( false, grp2, "cDisappear" );
@@ -234,7 +234,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( cDisappear, TQT_SIGNAL( activated( int ) ), this, TQT_SLOT( disappearEffectChanged( int ) ) );
 
     lDisappearSpeed = new TQLabel( i18n( "Speed:" ), grp2 );
-    lDisappearSpeed->setAlignment( AlignVCenter );
+    lDisappearSpeed->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget(lDisappearSpeed, 2, 0);
 
     cDisappearSpeed = new TQComboBox( false, grp2, "cEffect" );
@@ -247,7 +247,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     //appearEffectChanged( cEffect->currentItem() );
 
     TQLabel *lTimerOfDisappear = new TQLabel( i18n( "Timer of the object:" ), grp2 );
-    lTimerOfDisappear->setAlignment( AlignVCenter );
+    lTimerOfDisappear->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget( lTimerOfDisappear, 3, 0 );
 
     timerOfDisappear = new KIntNumInput( obj->getDisappearTimer(), grp2 );
@@ -268,7 +268,7 @@ KPrEffectDia::KPrEffectDia( TQWidget* parent, const char* name, const TQPtrList<
     connect( disappearSoundEffect, TQT_SIGNAL( clicked() ), this, TQT_SLOT( disappearSoundEffectChanged() ) );
 
     lSoundEffect2 = new TQLabel( i18n( "File name:" ), grp2 );
-    lSoundEffect2->setAlignment( AlignVCenter );
+    lSoundEffect2->tqsetAlignment( AlignVCenter );
     lowerRow->addWidget( lSoundEffect2, 5, 0 );
 
     requester2 = new KURLRequester( grp2 );
@@ -514,7 +514,7 @@ TQString KPrEffectDia::getSoundFileFilter() const
         if ( comma )
             str += '\n';
         comma = true;
-        str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }
diff --git a/kpresenter/KPrFindReplace.cpp b/kpresenter/KPrFindReplace.cpp
index 709a86d1..3836a8ad 100644
--- a/kpresenter/KPrFindReplace.cpp
+++ b/kpresenter/KPrFindReplace.cpp
@@ -55,10 +55,10 @@ void KPrFindReplace::emitNewCommand(KCommand *cmd)
 
 void KPrFindReplace::highlightPortion(KoTextParag * parag, int index, int length, KoTextDocument *_textdoc, KDialogBase* dialog)
 {
-    bool repaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
+    bool tqrepaint = isReplace() ? options() & KReplaceDialog::PromptOnReplace : true;
     KPrTextDocument *textdoc = static_cast<KPrTextDocument *>(_textdoc);
     KPrTextObject* textobj = textdoc->textObject();
-    textobj->highlightPortion( parag, index, length, m_canvas, repaint, dialog );
+    textobj->highlightPortion( parag, index, length, m_canvas, tqrepaint, dialog );
 }
 
 #include "KPrFindReplace.moc"
diff --git a/kpresenter/KPrFreehandObject.cpp b/kpresenter/KPrFreehandObject.cpp
index 273d6041..077b9eed 100644
--- a/kpresenter/KPrFreehandObject.cpp
+++ b/kpresenter/KPrFreehandObject.cpp
@@ -59,20 +59,20 @@ bool KPrFreehandObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) cons
 {
     // the rect for the view box have to be the rect and not the real rect
     KoRect rect( getRect() );
-    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( int( rect.width() * 100 ) )
-                                                                   .arg( int( rect.height() * 100 ) ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( int( rect.width() * 100 ) )
+                                                                   .tqarg( int( rect.height() * 100 ) ) );
     unsigned int pointCount = points.count();
     unsigned int pos = 0;
 
     TQString d;
-    d += TQString( "M%1 %2" ).arg( int( points.at(pos).x() * 100 ) )
-                            .arg( int( points.at(pos).y() * 100 ) );
+    d += TQString( "M%1 %2" ).tqarg( int( points.at(pos).x() * 100 ) )
+                            .tqarg( int( points.at(pos).y() * 100 ) );
     ++pos;
 
     while ( pos < pointCount )
     {
-        d += TQString( "L%1 %2" ).arg( int( points.at( pos ).x() * 100 ) )
-                                .arg( int( points.at( pos ).y() * 100 ) );
+        d += TQString( "L%1 %2" ).tqarg( int( points.at( pos ).x() * 100 ) )
+                                .tqarg( int( points.at( pos ).y() * 100 ) );
         ++pos;
     }
 
diff --git a/kpresenter/KPrFreehandObjectIface.cpp b/kpresenter/KPrFreehandObjectIface.cpp
index 25ff2963..19843a1b 100644
--- a/kpresenter/KPrFreehandObjectIface.cpp
+++ b/kpresenter/KPrFreehandObjectIface.cpp
@@ -56,12 +56,12 @@ TQString KPrFreehandObjectIface::lineEnd() const
 
 void KPrFreehandObjectIface::horizontalFlip()
 {
-    //todo repaint it
+    //todo tqrepaint it
     obj->flip(true );
 }
 
 void KPrFreehandObjectIface::verticalFlip()
 {
-    //todo repaint it
+    //todo tqrepaint it
     obj->flip( false );
 }
diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp
index e82defcc..89cf00ab 100644
--- a/kpresenter/KPrGeneralProperty.cpp
+++ b/kpresenter/KPrGeneralProperty.cpp
@@ -22,7 +22,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 
 #include <knuminput.h>
@@ -37,11 +37,11 @@ KPrGeneralProperty::KPrGeneralProperty( TQWidget *parent, const char *name, Gene
 , m_generalValue( generalValue )
 , m_unit( unit )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new KoGeneralPropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new KoGeneralPropertyUI( this ) );
 
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addItem( spacer );
+    tqlayout->addItem( spacer );
 
     if ( m_generalValue.m_name.isNull() )
     {
diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp
index db09be84..d5d0ed24 100644
--- a/kpresenter/KPrGotoPage.cpp
+++ b/kpresenter/KPrGotoPage.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqlistbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <klocale.h>
@@ -60,7 +60,7 @@ KPrGotoPage::KPrGotoPage( const KPrDocument *doc,
             t.truncate(30);
             t+="...";
         }
-        spinbox->insertItem( TQString( "%1 - %2" ).arg( *it ).arg( t ), -1 );
+        spinbox->insertItem( TQString( "%1 - %2" ).tqarg( *it ).tqarg( t ), -1 );
         if ( *it == start )
             spinbox->setCurrentItem( spinbox->count()-1 );
     }
diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp
index 078a3918..6a0162c1 100644
--- a/kpresenter/KPrImageEffectDia.cpp
+++ b/kpresenter/KPrImageEffectDia.cpp
@@ -217,7 +217,7 @@ void KPrImageEffectDia::setPixmap(TQPixmap pix)
 void KPrImageEffectDia::updatePreview()
 {
     base->m_previewLabel->setPixmap(m_pix);
-    base->m_previewLabel->repaint(false);
+    base->m_previewLabel->tqrepaint(false);
 }
 
 void KPrImageEffectDia::setEffect(ImageEffect eff, TQVariant p1, TQVariant p2, TQVariant p3)
diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp
index 45a6f7cc..c2db00b4 100644
--- a/kpresenter/KPrImportStyleDia.cpp
+++ b/kpresenter/KPrImportStyleDia.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include "KPrDocument.h"
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index 8d696369..f9a87fd5 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -38,7 +38,7 @@
 #include <tqfileinfo.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <tqpushbutton.h>
@@ -91,7 +91,7 @@ void KPrMSPresentation::initCreation( KProgress *progressBar )
     kapp->processEvents();
 
     for (int dirNum = 101; dirNum < 999; dirNum++) {
-        slidePath = TQString("/DCIM/%1MSPJP").arg(dirNum);
+        slidePath = TQString("/DCIM/%1MSPJP").tqarg(dirNum);
         if (! KIO::NetAccess::exists(( path + slidePath), true, ( TQWidget* )0L) )
             break;
     }
@@ -198,7 +198,7 @@ void KPrMSPresentation::createIndexFile( KProgress *progressBar )
 
     // DCIM path 1, 68 bytes null padded
     char buff[68];
-    strncpy( buff, TQString("%1").arg(slidePath).ascii(), 67 );
+    strncpy( buff, TQString("%1").tqarg(slidePath).ascii(), 67 );
     buff[67] = 0x00;
     sppStream.writeRawBytes( buff, 68 );
     sppStream << (TQ_UINT32)0x00000001; // fixed value
@@ -298,13 +298,13 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie
 
 
     TQLabel *helptext = new TQLabel( this );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
     helptext->setText( i18n( "Please enter the directory where the memory stick "
                              "presentation should be saved. Please also enter a "
                              "title for the slideshow presentation. " ) );
 
     TQLabel *lable2 = new TQLabel( i18n("Path:"), this );
-    lable2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lable2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     path=new KURLRequester( this );
     path->setMode( KFile::Directory);
     path->lineEdit()->setText(msPres.getPath());
@@ -320,7 +320,7 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie
 
 
     TQLabel *lable1 = new TQLabel( i18n("Title:"), this, "lable1" );
-    lable1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lable1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     // TODO - check if there is already a presentation with this title, and
     // add a number after it until there isn't.
     title = new KLineEdit( msPres.getTitle(), this );
@@ -351,13 +351,13 @@ KPrMSPresentationSetup::KPrMSPresentationSetup( KPrDocument *_doc, KPrView *_vie
                            "leave these set to the default.") );
     TQHBox *textColourLayout = new TQHBox( colourGroup );
     TQLabel *lable3 = new TQLabel( i18n("Text color:"), textColourLayout );
-    lable3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lable3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     textColour = new KColorButton( msPres.getTextColour(), textColourLayout );
     lable3->setBuddy( textColour );
 
     TQHBox *backgroundColourLayout = new TQHBox( colourGroup );
     TQLabel *lable4 = new TQLabel( i18n("Background color:"), backgroundColourLayout );
-    lable4->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    lable4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     backColour = new KColorButton( msPres.getBackColour(), backgroundColourLayout );
     lable4->setBuddy( backColour );
     colourGroup->setHidden( true );
@@ -444,7 +444,7 @@ void KPrMSPresentationSetup::finish()
     if ( !KIO::NetAccess::exists(pathname, false, this) ) {
         TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>"
                             "Do you want create it?</qt>" );
-        if( KMessageBox::questionYesNo( this, msg.arg( pathname ),
+        if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ),
                                         i18n( "Directory Not Found" ) )
             == KMessageBox::Yes)
             {
@@ -471,7 +471,7 @@ void KPrMSPresentationSetup::finish()
         if ( KMessageBox::warningYesNo( 0,
                                    i18n( "You are about to overwrite an existing index "
                                          "file : %1.\n "
-                                         "Do you want to proceed?" ).arg( sppFile ),
+                                         "Do you want to proceed?" ).tqarg( sppFile ),
                                    i18n( "Overwrite Presentation" ) )
              == KMessageBox::No) {
             path->setFocus();
diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp
index 52d474ba..48074143 100644
--- a/kpresenter/KPrMarginWidget.cpp
+++ b/kpresenter/KPrMarginWidget.cpp
@@ -24,7 +24,7 @@
 
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <knuminput.h>
@@ -38,13 +38,13 @@ KPrMarginWidget::KPrMarginWidget( TQWidget *parent, const char *name, const KoUn
 , m_changed( false )
 , m_noSignal( false )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
 
     m_ui = new MarginUI( this );
-    layout->addWidget( m_ui );
+    tqlayout->addWidget( m_ui );
 
     TQSpacerItem *spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Expanding, TQSizePolicy::Expanding );
-    layout->addItem( spacer );
+    tqlayout->addItem( spacer );
 
     m_ui->margins->setTitle( i18n( "Margins" ) );
 
diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp
index 63832f35..ea050f41 100644
--- a/kpresenter/KPrMoveHelpLineDia.cpp
+++ b/kpresenter/KPrMoveHelpLineDia.cpp
@@ -20,7 +20,7 @@
 
 #include <klocale.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <knuminput.h>
 #include <tqbuttongroup.h>
@@ -74,7 +74,7 @@ KPrInsertHelpLineDia::KPrInsertHelpLineDia( TQWidget *parent, const KoRect & _pa
     TQVBox *page = makeVBoxMainWidget();
     TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal,i18n("Orientation"), page );
     group->setRadioButtonExclusive( TRUE );
-    group->layout();
+    group->tqlayout();
     m_rbHoriz = new TQRadioButton( i18n("Horizontal"), group );
     m_rbVert = new TQRadioButton( i18n("Vertical"), group );
 
diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp
index ef795d2d..10048537 100644
--- a/kpresenter/KPrNoteBar.cpp
+++ b/kpresenter/KPrNoteBar.cpp
@@ -19,7 +19,7 @@
 */
 
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqsimplerichtext.h>
@@ -145,7 +145,7 @@ void KPrNoteBar::printNotes( TQPainter *_painter, KPrinter *_printer, TQValueLis
 
     TQRect viewRect( body );
     do {
-        richText.draw( _painter, body.left(), body.top(), viewRect, colorGroup() );
+        richText.draw( _painter, body.left(), body.top(), viewRect, tqcolorGroup() );
         viewRect.moveBy( 0, body.height() );
         _painter->translate( 0, -body.height() );
         _painter->setFont( font );
@@ -174,7 +174,7 @@ TQString KPrNoteBar::getNotesTextForPrinting(TQValueList<int> _list) const
         if ( !firstText )
             allText += TQString("\n\n");
 
-        allText += i18n( "Slide Note %1:\n" ).arg( pageCount );
+        allText += i18n( "Slide Note %1:\n" ).tqarg( pageCount );
         if(noteIsEmpty && !doc->pageList().at(i)->noteText().isEmpty())
             noteIsEmpty = false;
         allText += doc->pageList().at(i)->noteText();
diff --git a/kpresenter/KPrObject.cpp b/kpresenter/KPrObject.cpp
index 8bc6089d..5a03896a 100644
--- a/kpresenter/KPrObject.cpp
+++ b/kpresenter/KPrObject.cpp
@@ -357,7 +357,7 @@ void KPrObject::saveOasisPosObject( KoXmlWriter &xmlWriter, int indexObj ) const
         transX.setNum( trans.x(), 'g', DBL_DIG );
         TQCString transY;
         transY.setNum( trans.y(), 'g', DBL_DIG );
-        TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).arg( angInRad ).arg( transX.data() ).arg( transY.data() );
+        TQString str = TQString( "rotate(%1) translate(%2pt %3pt)" ).tqarg( angInRad ).tqarg( transX.data() ).tqarg( transY.data() );
         xmlWriter.addAttribute( "draw:transform", str );
     }
     else
@@ -422,8 +422,8 @@ bool KPrObject::saveOasisObjectStyleShowAnimation( KoXmlWriter &animation, int o
 {
     if ( effect != EF_NONE || appearStep != 0 || !a_fileName.isEmpty() )
     {
-        animation.startElement( "presentation:show-shape" );
-        animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) );
+        animation.startElement( "presentation:show-tqshape" );
+        animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) );
         animation.addAttribute( "koffice:order-id", appearStep );
 
         switch( effect )
@@ -522,8 +522,8 @@ bool KPrObject::saveOasisObjectStyleHideAnimation( KoXmlWriter &animation, int o
     //FIXME oo doesn't support hide animation object
     if ( effect3 != EF3_NONE || disappearStep != 0 || !d_fileName.isEmpty())
     {
-        animation.startElement( "presentation:hide-shape" );
-        animation.addAttribute( "draw:shape-id", "object" + TQString::number( objectId ) );
+        animation.startElement( "presentation:hide-tqshape" );
+        animation.addAttribute( "draw:tqshape-id", "object" + TQString::number( objectId ) );
         animation.addAttribute( "koffice:order-id", disappearStep );
         switch( effect3 )
         {
@@ -1743,14 +1743,14 @@ bool KPrShadowObject::saveOasisDrawPoints( const KoPointArray &points, KPOasisSa
         int tmpY = int( ( *it ).y() * 10000 );
         // no space allows before first element
         if ( !listOfPoint.isEmpty() )
-            listOfPoint += TQString( " %1,%2" ).arg( tmpX ).arg( tmpY );
+            listOfPoint += TQString( " %1,%2" ).tqarg( tmpX ).tqarg( tmpY );
         else
-            listOfPoint = TQString( "%1,%2" ).arg( tmpX ).arg( tmpY );
+            listOfPoint = TQString( "%1,%2" ).tqarg( tmpX ).tqarg( tmpY );
         maxX = TQMAX( maxX, tmpX );
         maxY = TQMAX( maxY, tmpY );
     }
     sc.xmlWriter.addAttribute("draw:points", listOfPoint );
-    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).arg( maxX ).arg( maxY ) );
+    sc.xmlWriter.addAttribute("svg:viewBox", TQString( "0 0 %1 %2" ).tqarg( maxX ).tqarg( maxY ) );
     return true;
 }
 
diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h
index 8850e2d0..7b39be50 100644
--- a/kpresenter/KPrObject.h
+++ b/kpresenter/KPrObject.h
@@ -22,7 +22,7 @@
 #ifndef kpobject_h
 #define kpobject_h
 
-#include <brush.h>
+#include <tqbrush.h>
 #include <tqcursor.h>
 
 #include "global.h"
diff --git a/kpresenter/KPrPBPreview.cpp b/kpresenter/KPrPBPreview.cpp
index a6938d82..1afef977 100644
--- a/kpresenter/KPrPBPreview.cpp
+++ b/kpresenter/KPrPBPreview.cpp
@@ -55,7 +55,7 @@ void KPrPBPreview::resizeEvent( TQResizeEvent *e )
     {
 #if 1
         gradient->setSize( contentsRect().size() );
-        repaint();
+        tqrepaint();
 #endif
     }
 }
@@ -67,7 +67,7 @@ void KPrPBPreview::drawContents( TQPainter *painter )
 
     if ( paintType == Pen ) {
         painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(),
-                           colorGroup().base() );
+                           tqcolorGroup().base() );
         KoSize diff1( 0, 0 ), diff2( 0, 0 );
         int _w = int( pen.pointWidth() );
 
@@ -94,7 +94,7 @@ void KPrPBPreview::drawContents( TQPainter *painter )
 
     } else if ( paintType == Brush ) {
         painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(),
-                           colorGroup().base() );
+                           tqcolorGroup().base() );
         painter->fillRect( 0, 0, contentsRect().width(), contentsRect().height(), brush );
     } else if ( paintType == Gradient )
         painter->drawPixmap( 0, 0, gradient->pixmap());
@@ -118,7 +118,7 @@ void KPrPBPreview::setGradient( const TQColor &_c1, const TQColor &_c2, BCType _
     gradient->setUnbalanced( _unbalanced );
     gradient->setXFactor( _xfactor );
     gradient->setYFactor( _yfactor );
-    repaint( false );
+    tqrepaint( false );
 }
 
 
diff --git a/kpresenter/KPrPBPreview.h b/kpresenter/KPrPBPreview.h
index a3f1b283..c3ba061e 100644
--- a/kpresenter/KPrPBPreview.h
+++ b/kpresenter/KPrPBPreview.h
@@ -49,21 +49,21 @@ public:
 
     KPrPBPreview( TQWidget* parent, const char* name, PaintType _paintType = Pen );
     ~KPrPBPreview();
-    void setPen( const KoPen &_pen ) { pen = _pen; repaint( true ); }
-    void setBrush( const TQBrush &_brush ) { brush = _brush; repaint( true ); }
-    void setLineBegin( LineEnd lb ) { lineBegin = lb; repaint( true ); }
-    void setLineEnd( LineEnd le ) { lineEnd = le; repaint( true ); }
-    void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } repaint( true ); }
-    void setPaintType( PaintType pt ) { paintType = pt; repaint(true); }
+    void setPen( const KoPen &_pen ) { pen = _pen; tqrepaint( true ); }
+    void setBrush( const TQBrush &_brush ) { brush = _brush; tqrepaint( true ); }
+    void setLineBegin( LineEnd lb ) { lineBegin = lb; tqrepaint( true ); }
+    void setLineEnd( LineEnd le ) { lineEnd = le; tqrepaint( true ); }
+    void setGradient( KPrGradient *g ) { if ( g ) { gradient = g; } tqrepaint( true ); }
+    void setPaintType( PaintType pt ) { paintType = pt; tqrepaint(true); }
 
     void setGradient( const TQColor &_c1, const TQColor &_c2, BCType _t,
                       bool _unbalanced, int _xfactor, int _yfactor );
-    void setColor1( const TQColor &_color ) { gradient->setColor1( _color ); repaint( false ); }
-    void setColor2( const TQColor &_color ) { gradient->setColor2( _color ); repaint( false ); }
-    void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); repaint( false ); }
-    void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); repaint( false ); }
-    void setXFactor( int i ) { gradient->setXFactor( i ); repaint( false ); }
-    void setYFactor( int i ) { gradient->setYFactor( i ); repaint( false ); }
+    void setColor1( const TQColor &_color ) { gradient->setColor1( _color ); tqrepaint( false ); }
+    void setColor2( const TQColor &_color ) { gradient->setColor2( _color ); tqrepaint( false ); }
+    void setBackColorType( BCType _type ) { gradient->setBackColorType( _type ); tqrepaint( false ); }
+    void setUnbalanced( bool b ) { gradient->setUnbalanced( b ); tqrepaint( false ); }
+    void setXFactor( int i ) { gradient->setXFactor( i ); tqrepaint( false ); }
+    void setYFactor( int i ) { gradient->setYFactor( i ); tqrepaint( false ); }
 
 protected:
     void drawContents( TQPainter *p );
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index 656b48e2..d8e65bac 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -524,7 +524,7 @@ TQDomElement KPrPage::save( TQDomDocument &doc )
 
 TQString KPrPage::oasisNamePage( int posPage ) const
 {
-    return  ( m_manualTitle.isEmpty() ?  TQString( "page%1" ).arg( posPage ) : m_manualTitle );
+    return  ( m_manualTitle.isEmpty() ?  TQString( "page%1" ).tqarg( posPage ) : m_manualTitle );
 }
 
 bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage, KoSavingContext& context,
@@ -538,7 +538,7 @@ bool KPrPage::saveOasisPage( KoStore *store, KoXmlWriter &xmlWriter, int posPage
 
         xmlWriter.startElement( "style:master-page" );
         xmlWriter.addAttribute( "style:name", "Standard" );
-        xmlWriter.addAttribute( "style:page-layout-name", pageLayoutName );
+        xmlWriter.addAttribute( "style:page-tqlayout-name", pageLayoutName );
 
         TQString styleName = saveOasisPageStyle( store, context.mainStyles() );
         if ( !styleName.isEmpty() )
@@ -655,7 +655,7 @@ bool KPrPage::saveOasisNote( KoXmlWriter &xmlWriter ) const
         return true;
 
     //todo : add size for draw:text-box otherwise we can't import into oo
-    //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="layout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes">
+    //<draw:text-box presentation:style-name="pr1" draw:text-style-name="P1" draw:layer="tqlayout" svg:width="14.5cm" svg:height="11.408cm" svg:x="3.247cm" svg:y="14.126cm" presentation:class="notes">
     xmlWriter.startElement( "presentation:notes" );
     xmlWriter.startElement( "draw:frame" );
     //todo save style
@@ -881,7 +881,7 @@ void KPrPage::unifyObjectName( KPrObject *object ) {
         if ( rx.search( objectName ) != -1 ) {
             objectName.remove( rx );
         }
-        objectName += TQString(" (%1)").arg( count );
+        objectName += TQString(" (%1)").tqarg( count );
         object->setObjectName( objectName );
     }
 }
@@ -930,7 +930,7 @@ void KPrPage::appendObjects( const TQValueList<KPrObject *> &objects )
         if ( usedPageNames.contains( objectName ) )
         {
             usedPageNames[objectName]++;
-            objectName += TQString(" (%1)").arg( usedPageNames[objectName] );
+            objectName += TQString(" (%1)").tqarg( usedPageNames[objectName] );
             ( *oIt )->setObjectName( objectName );
         }
         m_objectList.append( *oIt );
@@ -1065,7 +1065,7 @@ void KPrPage::pasteObjs( const TQByteArray & data,int nbCopy, double angle,
         _tempObj->moveBy( moveX*(double)mod,moveY*(double)mod);
         _tempObj->setSelected( true );
         if ( angle == 0.0 || (increaseY == 0.0 && increaseX == 0.0))
-            m_doc->repaint(_tempObj);
+            m_doc->tqrepaint(_tempObj);
     }
 
     if ( angle != 0.0)
@@ -1344,14 +1344,14 @@ KPrTextObject* KPrPage::insertTextObject( const KoRect& r, const TQString&  text
     KPrTextObject *kptextobject = new KPrTextObject( m_doc );
     insertObject( i18n( "Insert Textbox" ), kptextobject, r );
     //TODO create macro command : now insertObject can return KCommand
-    //TODO fix repaint object
+    //TODO fix tqrepaint object
     if (  !text.isEmpty() )
     {
         KPrTextView *view =  kptextobject->createKPTextView( _view ? _view->getCanvas() : 0L );
         view->insertText( text );
         view->terminate();
         delete view;
-        m_doc->repaint( kptextobject );
+        m_doc->tqrepaint( kptextobject );
     }
     return kptextobject;
 }
@@ -1461,7 +1461,7 @@ KPrPartObject* KPrPage::insertObject( const KoRect& _rect, KoDocumentEntry& _e )
     insertObject( i18n( "Embed Object" ), kppartobject, _rect );
 
     //emit sig_insertObject( ch, kppartobject );
-    m_doc->repaint( false );
+    m_doc->tqrepaint( false );
 
     return kppartobject;
 }
@@ -1534,7 +1534,7 @@ void KPrPage::slotRepaintVariable()
     for ( ; it.current() ; ++it )
     {
         if ( it.current()->getType() == OT_TEXT )
-            m_doc->repaint( it.current() );
+            m_doc->tqrepaint( it.current() );
     }
 }
 
@@ -1545,7 +1545,7 @@ void KPrPage::recalcPageNum()
     {
         if ( it.current()->getType() == OT_TEXT ) {
             ( (KPrTextObject*)it.current() )->recalcPageNum( this );
-            m_doc->repaint( it.current() ); // TODO only if something changed
+            m_doc->tqrepaint( it.current() ); // TODO only if something changed
         }
     }
 }
@@ -1605,7 +1605,7 @@ void KPrPage::insertPicture( const TQString &filename, const KoPoint &pos )
         //kdDebug(33001) << k_funcinfo << "Size: " << w << ", " << h << endl;
         kppixmapobject->setOrig(0,0);
         kppixmapobject->setSize(w, h);
-        m_doc->repaint( false );
+        m_doc->tqrepaint( false );
     }
 }
 
@@ -1883,7 +1883,7 @@ TQString KPrPage::pageTitle( const TQString &_title ) const
     {
         // MASTERPAGE
         if ( m_masterPage )
-            title = i18n( "Slide %1" ).arg( m_doc->pageList().findRef( this ) + 1 );
+            title = i18n( "Slide %1" ).tqarg( m_doc->pageList().findRef( this ) + 1 );
         else
             title = i18n( "Slide Master" );
     }
@@ -1990,7 +1990,7 @@ void KPrPage::deSelectAllObj()
 void KPrPage::deSelectObj( KPrObject *kpobject )
 {
     kpobject->setSelected( false );
-    m_doc->repaint( kpobject );
+    m_doc->tqrepaint( kpobject );
 }
 
 TQDomElement KPrPage::saveObjects( TQDomDocument &doc, TQDomElement &objects, double yoffset,
@@ -2158,8 +2158,8 @@ KCommand *KPrPage::moveObject(KPrView *_view, double diffx, double diffy)
             _objects.append( it.current() );
             TQRect br = _view->zoomHandler()->zoomRect( it.current()->getRepaintRect() );
             br.moveBy( _view->zoomHandler()->zoomItX( diffx ), _view->zoomHandler()->zoomItY( diffy ) );
-            m_doc->repaint( br ); // Previous position
-            m_doc->repaint( it.current() ); // New position
+            m_doc->tqrepaint( br ); // Previous position
+            m_doc->tqrepaint( it.current() ); // New position
             createCommand=true;
         }
     }
@@ -2189,8 +2189,8 @@ KCommand *KPrPage::moveObject(KPrView *m_view,const KoPoint &_move,bool key)
 
             it.current()->moveBy( _move );
             _objects.append( it.current() );
-            m_doc->repaint( oldBoundingRect );
-            m_doc->repaint( it.current() );
+            m_doc->tqrepaint( oldBoundingRect );
+            m_doc->tqrepaint( it.current() );
         }
     }
 
@@ -2208,7 +2208,7 @@ void KPrPage::repaintObj()
     for ( ; it.current() ; ++it )
     {
         if(it.current()->isSelected())
-            m_doc->repaint(it.current() );
+            m_doc->tqrepaint(it.current() );
     }
 }
 
@@ -2388,7 +2388,7 @@ void KPrPage::reactivateBgSpellChecking(bool refreshTextObj)
         {
             static_cast<KPrTextObject*>( oIt.current() )->textObject()->setNeedSpellCheck(true);
             if(refreshTextObj)
-                m_doc->repaint( oIt.current() );
+                m_doc->tqrepaint( oIt.current() );
         }
     }
 }
@@ -2445,8 +2445,8 @@ void KPrPage::changeTabStopValue ( double _tabStop )
             if ( obj )
             {
                 obj->textDocument()->setTabStops( m_doc->zoomHandler()->ptToLayoutUnitPixX( _tabStop ));
-                obj->layout();
-                m_doc->repaint( obj );
+                obj->tqlayout();
+                m_doc->tqrepaint( obj );
             }
         }
     }
diff --git a/kpresenter/KPrPageEffects.cpp b/kpresenter/KPrPageEffects.cpp
index b358fd55..a7c3093b 100644
--- a/kpresenter/KPrPageEffects.cpp
+++ b/kpresenter/KPrPageEffects.cpp
@@ -440,7 +440,7 @@ bool KPrPageEffects::effectSurround1() const
     int repaint_w = w;
 
     bool finished = false;
-    bool repaint= false;
+    bool tqrepaint= false;
     int rh = 0;
     int rw = 0;
     int repaint_rh = 0;
@@ -454,7 +454,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= m_height )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - repaint_h;
             repaint_rw = step - m_height + repaint_w;
@@ -469,7 +469,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= m_height + m_width - repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - ( step - m_height + repaint_h - m_width + repaint_w + stepSize );
             repaint_rw = m_width - repaint_w;
@@ -484,7 +484,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >=  2 * m_height - repaint_h + m_width - repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = 0;
             repaint_rw = m_width - ( step - 2 * m_height + repaint_h - m_width + 2 * repaint_w + stepSize );
@@ -499,7 +499,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 2 * m_height - repaint_h + 2 * m_width - 3 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = step - 2 * m_height + 2 * repaint_h - 2 * m_width + 3 * repaint_w;
             repaint_rw = repaint_w;
@@ -514,7 +514,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >=  3 * m_height - 3 * repaint_h + 2 * m_width - 3 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - 2 * repaint_h;
             repaint_rw = step - 3 * m_height + 3 * repaint_h - 2 * m_width + 5 * repaint_w;
@@ -529,7 +529,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 3 * m_height - 3 * repaint_h + 3 * m_width - 6 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - ( step - 3 * m_height + 5 * repaint_h - 3 * m_width + 6 * repaint_w + stepSize );
             repaint_rw = m_width - 2 * repaint_w;
@@ -544,7 +544,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 3 * m_width - 6 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = repaint_h;
             repaint_rw = m_width - ( step - 4 * m_height + 6 * repaint_h - 3 * m_width + 8 * repaint_w + stepSize );
@@ -559,7 +559,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 4 * m_height - 6 * repaint_h + 4 * m_width - 10 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = step - 4 * m_height + 8 * repaint_h - 4 * m_width + 10 * repaint_w;
             repaint_rw = 2 * repaint_w;
@@ -574,7 +574,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 4 * m_width - 10 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - 3 * repaint_h;
             repaint_rw = step - 5 * m_height + 10 * repaint_h - 4 * m_width + 13 * repaint_w;
@@ -589,7 +589,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 5 * m_height - 10 * repaint_h + 5 * m_width - 15 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - ( step - 5 * m_height + 13 * repaint_h - 5 * m_width + 15 * repaint_w + stepSize );
             repaint_rw = m_width - 3 * repaint_w;
@@ -604,7 +604,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 5 * m_width - 15 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = 2 * repaint_h;
             repaint_rw = m_width - ( step - 6 * m_height + 15 * repaint_h - 5 * m_width + 18 * repaint_w + stepSize );
@@ -619,7 +619,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 6 * m_height - 15 * repaint_h + 6 * m_width - 21 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = step - 6 * m_height + 18 * repaint_h - 6 * m_width + 21 * repaint_w;
             repaint_rw = 3 * repaint_w;
@@ -634,7 +634,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 6 * m_width - 21 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - 4 * repaint_h;
             repaint_rw = step - 7 * m_height + 21 * repaint_h - 6 * m_width + 25 * repaint_w;
@@ -649,7 +649,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 7 * m_height - 21 * repaint_h + 7 * m_width - 28 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - ( step - 7 * m_height + 25 * repaint_h - 7 * m_width + 28 * repaint_w + stepSize );
             repaint_rw = m_width - 4 * repaint_w;
@@ -664,7 +664,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 7 * m_width - 28 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = 3 * repaint_h;
             repaint_rw = m_width - ( step - 8 * m_height + 28 * repaint_h - 7 * m_width + 32 * repaint_w + stepSize );
@@ -679,7 +679,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 8 * m_height - 28 * repaint_h + 8 * m_width - 36 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = step - 8 * m_height + 32 * repaint_h - 8 * m_width + 36 * repaint_w;
             repaint_rw = 4 * repaint_w;
@@ -694,7 +694,7 @@ bool KPrPageEffects::effectSurround1() const
         h = stepSize;
         if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 8 * m_width - 36 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - 5 * repaint_h;
             repaint_rw = step - 9 * m_height + 36 * repaint_h - 8 * m_width + 41 * repaint_w;
@@ -709,7 +709,7 @@ bool KPrPageEffects::effectSurround1() const
         w = stepSize;
         if ( step + stepSize >= 9 * m_height - 36 * repaint_h + 9 * m_width - 45 * repaint_w )
         {
-            repaint = true;
+            tqrepaint = true;
 
             repaint_rh = m_height - ( step - 9 * m_height + 41 * repaint_h - 9 * m_width + 45 * repaint_w + stepSize );
             repaint_rw = m_width - 5 * repaint_w;
@@ -737,7 +737,7 @@ bool KPrPageEffects::effectSurround1() const
 
     bitBlt( m_dst, rw, rh, &m_pageTo, rw, rh, w, h );
 
-    if ( repaint )
+    if ( tqrepaint )
     {
         bitBlt( m_dst, repaint_rw, repaint_rh, &m_pageTo, repaint_rw, repaint_rh, repaint_w, repaint_h );
     }
diff --git a/kpresenter/KPrPartObject.cpp b/kpresenter/KPrPartObject.cpp
index 42054ded..9f903608 100644
--- a/kpresenter/KPrPartObject.cpp
+++ b/kpresenter/KPrPartObject.cpp
@@ -68,7 +68,7 @@ bool KPrPartObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const
     kdDebug() << "KPrPartObject::saveOasisPart " << sc.partIndexObj << endl;
 
     sc.xmlWriter.startElement( "draw:object" );
-    const TQString name = TQString( "Object_%1" ).arg( sc.partIndexObj + 1 );
+    const TQString name = TQString( "Object_%1" ).tqarg( sc.partIndexObj + 1 );
     ++sc.partIndexObj;
     child->saveOasisAttributes( sc.xmlWriter, name );
 
@@ -152,7 +152,7 @@ void KPrPartObject::draw( TQPainter *_painter, KoTextZoomHandler *_zoomhandler,
 void KPrPartObject::slot_changed( KoChild *_koChild )
 {
     KoTextZoomHandler* zh = child->parent()->zoomHandler();
-    KoRect g = zh->unzoomRect( _koChild->geometry() );
+    KoRect g = zh->unzoomRect( _koChild->tqgeometry() );
     KPrObject::setOrig( g.x(), g.y() );
     KPrObject::setSize( g.width(), g.height() );
 }
diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp
index 553cf3c1..d6790084 100644
--- a/kpresenter/KPrPenStyleWidget.cpp
+++ b/kpresenter/KPrPenStyleWidget.cpp
@@ -23,7 +23,7 @@
 #include "penstyle.h"
 #include "KPrPBPreview.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqvbox.h>
 
@@ -37,11 +37,11 @@ KPrPenStyleWidget::KPrPenStyleWidget( TQWidget *parent, const char *name, const
 : TQWidget( parent, name )
 , m_pen( pen )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new PenStyleUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new PenStyleUI( this ) );
 
     TQSpacerItem* spacer = new TQSpacerItem( 20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addItem( spacer );
+    tqlayout->addItem( spacer );
 
     connect( m_ui->colorChooser, TQT_SIGNAL( changed( const TQColor& ) ),
              this, TQT_SLOT( slotPenChanged() ) );
diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp
index a8219a7f..a7df156f 100644
--- a/kpresenter/KPrPgConfDia.cpp
+++ b/kpresenter/KPrPgConfDia.cpp
@@ -32,7 +32,7 @@
 #include <tqvgroupbox.h>
 #include <tqheader.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistview.h>
 #include <tqpen.h>
 #include <tqpushbutton.h>
@@ -135,9 +135,9 @@ void KPrPgConfDia::setupPageGeneral()
 				    "using the mouse.</p>"
 				    "<p>You can configure the color of the drawing pen and the "
 				    "width of the pen.</p>" ) );
-    penGroup->layout()->setSpacing(KDialog::marginHint());
-    penGroup->layout()->setMargin(KDialog::spacingHint());
-    //TQGridLayout *grid = new TQGridLayout(penGroup->layout(), 3, 2 );
+    penGroup->tqlayout()->setSpacing(KDialog::marginHint());
+    penGroup->tqlayout()->setMargin(KDialog::spacingHint());
+    //TQGridLayout *grid = new TQGridLayout(penGroup->tqlayout(), 3, 2 );
 
     TQLabel* label = new TQLabel( i18n( "Color:" ), penGroup );
     //grid->addWidget( label, 0, 0 );
@@ -209,7 +209,7 @@ void KPrPgConfDia::setupPageSlides()
 
     TQWidget* spacer = new TQWidget( buttonGroup );
 
-    spacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+    spacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
     slidesLayout->addMultiCellWidget( buttonGroup, 4, 4, 0, 1 );
 
     if ( !m_doc->presentationName().isEmpty() )
diff --git a/kpresenter/KPrPicturePreview.cpp b/kpresenter/KPrPicturePreview.cpp
index ba0c8b33..a2eafde8 100644
--- a/kpresenter/KPrPicturePreview.cpp
+++ b/kpresenter/KPrPicturePreview.cpp
@@ -162,7 +162,7 @@ void KPrPicturePreview::slotNormalPicture()
     if ( mirrorType != PM_NORMAL )
     {
         mirrorType = PM_NORMAL;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -172,7 +172,7 @@ void KPrPicturePreview::slotHorizontalMirrorPicture()
     if ( mirrorType != PM_HORIZONTAL )
     {
         mirrorType = PM_HORIZONTAL;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -182,7 +182,7 @@ void KPrPicturePreview::slotVerticalMirrorPicture()
     if ( mirrorType != PM_VERTICAL )
     {
         mirrorType = PM_VERTICAL;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -192,7 +192,7 @@ void KPrPicturePreview::slotHorizontalAndVerticalMirrorPicture()
     if ( mirrorType != PM_HORIZONTALANDVERTICAL )
     {
         mirrorType = PM_HORIZONTALANDVERTICAL;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -202,7 +202,7 @@ void KPrPicturePreview::slotPictureDepth0()
     if ( depth !=0 )
     {
         depth = 0;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -212,7 +212,7 @@ void KPrPicturePreview::slotPictureDepth1()
     if ( depth != 1 )
     {
         depth = 1;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -222,7 +222,7 @@ void KPrPicturePreview::slotPictureDepth8()
     if ( depth != 8)
     {
         depth = 8;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -232,7 +232,7 @@ void KPrPicturePreview::slotPictureDepth16()
     if ( depth != 16 )
     {
         depth = 16;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -242,7 +242,7 @@ void KPrPicturePreview::slotPictureDepth32()
     if ( depth !=32 )
     {
         depth = 32;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -252,7 +252,7 @@ void KPrPicturePreview::slotSwapRGBPicture( bool _on )
     if ( swapRGB != _on )
     {
         swapRGB = _on;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -262,7 +262,7 @@ void KPrPicturePreview::slotGrayscalPicture( bool _on )
     if ( grayscal != _on )
     {
         grayscal = _on;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -272,7 +272,7 @@ void KPrPicturePreview::slotBrightValue( int _value )
     if ( bright != _value )
     {
         bright = _value;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -282,7 +282,7 @@ void KPrPicturePreview::setDepth( int _depth)
     if ( _depth != depth )
     {
         depth = _depth;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -292,7 +292,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t)
     if ( mirrorType != _t )
     {
         mirrorType = _t;
-        repaint( false );
+        tqrepaint( false );
     }
 }
 
@@ -300,7 +300,7 @@ void KPrPicturePreview::setMirrorType (PictureMirrorType _t)
 void KPrPicturePreview::setPicturePixmap(const TQPixmap &_pixmap)
 {
     origPixmap = _pixmap;
-    repaint( false );
+    tqrepaint( false );
 }
 
 
diff --git a/kpresenter/KPrPictureProperty.cpp b/kpresenter/KPrPictureProperty.cpp
index 336f63c6..5e0e6db8 100644
--- a/kpresenter/KPrPictureProperty.cpp
+++ b/kpresenter/KPrPictureProperty.cpp
@@ -26,15 +26,15 @@
 #include <knuminput.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KPrPictureProperty::KPrPictureProperty( TQWidget *parent, const char *name, const TQPixmap &pixmap,
                                   KPrPictureSettingCmd::PictureSettings pictureSettings )
 : TQWidget( parent, name )
 , m_pictureSettings( pictureSettings )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new PicturePropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new PicturePropertyUI( this ) );
 
     connect( m_ui->depth0, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth0() ) );
     connect( m_ui->depth1, TQT_SIGNAL( clicked() ), m_ui->picturePreview, TQT_SLOT( slotPictureDepth1() ) );
diff --git a/kpresenter/KPrPiePreview.h b/kpresenter/KPrPiePreview.h
index c483f95a..1f3ca45f 100644
--- a/kpresenter/KPrPiePreview.h
+++ b/kpresenter/KPrPiePreview.h
@@ -25,7 +25,7 @@
 
 #include <tqframe.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 #include "global.h"
 
@@ -39,13 +39,13 @@ public:
     ~KPrPiePreview() {}
 
     void setAngle( int _angle )
-        { angle = _angle; repaint( true ); }
+        { angle = _angle; tqrepaint( true ); }
     void setLength( int _len )
-        { len = _len; repaint( true ); }
+        { len = _len; tqrepaint( true ); }
     void setType( PieType _type )
-        { type = _type; repaint( true ); }
+        { type = _type; tqrepaint( true ); }
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
-        { pen = _pen; brush = _brush; repaint( true ); }
+        { pen = _pen; brush = _brush; tqrepaint( true ); }
 
 protected:
     void drawContents( TQPainter* );
diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp
index 3dda3079..694a9653 100644
--- a/kpresenter/KPrPieProperty.cpp
+++ b/kpresenter/KPrPieProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "KPrPieProperty.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kcombobox.h>
 #include <klocale.h>
@@ -35,8 +35,8 @@ KPrPieProperty::KPrPieProperty( TQWidget *parent, const char *name, KPrPieValueC
 : TQWidget( parent, name )
 , m_pieValues( pieValues )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new PiePropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new PiePropertyUI( this ) );
 
     m_ui->typeCombo->insertItem( i18n( "Pie" ) );
     m_ui->typeCombo->insertItem( i18n( "Arc" ) );
diff --git a/kpresenter/KPrPixmapObject.cpp b/kpresenter/KPrPixmapObject.cpp
index 9e4320e3..0a4c8921 100644
--- a/kpresenter/KPrPixmapObject.cpp
+++ b/kpresenter/KPrPixmapObject.cpp
@@ -365,7 +365,7 @@ void KPrPixmapObject::loadOasis(const TQDomElement &element, KoOasisContext & co
             strExtension=href.mid(result+1); // As we are using KoPicture, the extension should be without the dot.
         }
         TQString filename(href/*.mid(1)*/);
-        const KoPictureKey key(filename, TQDateTime::currentDateTime(Qt::UTC));
+        const KoPictureKey key(filename, TQDateTime::tqcurrentDateTime(Qt::UTC));
         image.setKey(key);
 
         KoStore* store = context.store();
diff --git a/kpresenter/KPrPointObject.cpp b/kpresenter/KPrPointObject.cpp
index 86fc4641..a1fb0564 100644
--- a/kpresenter/KPrPointObject.cpp
+++ b/kpresenter/KPrPointObject.cpp
@@ -100,7 +100,7 @@ TQDomDocumentFragment KPrPointObject::save( TQDomDocument& doc, double offset )
 
 const char * KPrPointObject::getOasisElementName() const
 {
-    return "draw:custom-shape";
+    return "draw:custom-tqshape";
 }
 
 void KPrPointObject::loadOasisMarker( KoOasisContext & context )
diff --git a/kpresenter/KPrPolyLineObjectIface.cpp b/kpresenter/KPrPolyLineObjectIface.cpp
index 8283a4c5..cd419aec 100644
--- a/kpresenter/KPrPolyLineObjectIface.cpp
+++ b/kpresenter/KPrPolyLineObjectIface.cpp
@@ -34,12 +34,12 @@ KPrPolyLineObjectIface::KPrPolyLineObjectIface( KPrPolylineObject *_obj )
 
 void KPrPolyLineObjectIface::horizontalFlip()
 {
-    //todo repaint it
+    //todo tqrepaint it
     obj->flip(true );
 }
 
 void KPrPolyLineObjectIface::verticalFlip()
 {
-    //todo repaint it
+    //todo tqrepaint it
     obj->flip( false );
 }
diff --git a/kpresenter/KPrPolygonObject.cpp b/kpresenter/KPrPolygonObject.cpp
index 2f621df9..451b1a48 100644
--- a/kpresenter/KPrPolygonObject.cpp
+++ b/kpresenter/KPrPolygonObject.cpp
@@ -75,7 +75,7 @@ bool KPrPolygonObject::saveOasisObjectAttributes( KPOasisSaveContext &sc ) const
     sc.xmlWriter.addAttribute( "draw:concave", checkConcavePolygon ? "true" : "false" );
     if ( checkConcavePolygon )
     {
-        sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").arg( sharpnessValue ) );
+        sc.xmlWriter.addAttribute( "draw:sharpness", TQString( "%1%").tqarg( sharpnessValue ) );
     }
 
     return true;
diff --git a/kpresenter/KPrPolygonPreview.cpp b/kpresenter/KPrPolygonPreview.cpp
index 545472a3..e41e9c6f 100644
--- a/kpresenter/KPrPolygonPreview.cpp
+++ b/kpresenter/KPrPolygonPreview.cpp
@@ -85,35 +85,35 @@ void KPrPolygonPreview::drawContents( TQPainter *painter )
 void KPrPolygonPreview::slotConvexConcave( bool convexConcave )
 {
     isConcave = convexConcave;
-    repaint();
+    tqrepaint();
 }
 
 
 void KPrPolygonPreview::slotConvexPolygon()
 {
     isConcave = false;
-    repaint();
+    tqrepaint();
 }
 
 
 void KPrPolygonPreview::slotConcavePolygon()
 {
     isConcave = true;
-    repaint();
+    tqrepaint();
 }
 
 
 void KPrPolygonPreview::slotCornersValue( int value )
 {
     nCorners = value;
-    repaint();
+    tqrepaint();
 }
 
 
 void KPrPolygonPreview::slotSharpnessValue( int value )
 {
     sharpness = value;
-    repaint();
+    tqrepaint();
 }
 
 
diff --git a/kpresenter/KPrPolygonPreview.h b/kpresenter/KPrPolygonPreview.h
index 8fdcb26a..4d6cc248 100644
--- a/kpresenter/KPrPolygonPreview.h
+++ b/kpresenter/KPrPolygonPreview.h
@@ -26,7 +26,7 @@
 
 #include <tqframe.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 class TQPainter;
 
@@ -40,7 +40,7 @@ public:
     ~KPrPolygonPreview() {}
 
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
-        { pen = _pen; brush = _brush; repaint( true ); }
+        { pen = _pen; brush = _brush; tqrepaint( true ); }
 
 public slots:
     void slotConvexConcave( bool convexConcave );
diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp
index 69405b99..fe303a0b 100644
--- a/kpresenter/KPrPolygonProperty.cpp
+++ b/kpresenter/KPrPolygonProperty.cpp
@@ -20,7 +20,7 @@
 
 #include "KPrPolygonProperty.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kcombobox.h>
 #include <klocale.h>
@@ -33,8 +33,8 @@ KPrPolygonProperty::KPrPolygonProperty( TQWidget *parent, const char *name, KPrP
 : TQWidget( parent, name )
 , m_polygonSettings( polygonSettings )
 {
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new PolygonPropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new PolygonPropertyUI( this ) );
 
     m_ui->typeCombo->insertItem( i18n( "Polygon" ) );
     m_ui->typeCombo->insertItem( i18n( "Convex/Concave" ) );
diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp
index 8306dec3..88163c62 100644
--- a/kpresenter/KPrPresDurationDia.cpp
+++ b/kpresenter/KPrPresDurationDia.cpp
@@ -25,7 +25,7 @@
 #include <tqlabel.h>
 #include <tqheader.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klistview.h>
 #include <kdebug.h>
 #include <klocale.h>
@@ -48,7 +48,7 @@ KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name,
     slides->setSelected( slides->firstChild(), true );
 
     label = new TQLabel( i18n( "Presentation duration: " ) + _durationString, page );
-    label->setAlignment( AlignVCenter );
+    label->tqsetAlignment( AlignVCenter );
     topLayout->addWidget( label );
 
     setMinimumSize( 600, 400 );
@@ -71,7 +71,7 @@ void KPrPresDurationDia::setupSlideList( TQWidget *_page )
         if ( doc->pageList().at( i )->isSlideSelected() ) {
             KListViewItem *item = new KListViewItem( slides );
             item->setPixmap( 0, KPBarIcon( "slide" ) );
-            item->setText( 0, TQString( "%1" ).arg( i + 1 ) );
+            item->setText( 0, TQString( "%1" ).tqarg( i + 1 ) );
             item->setText( 1, *m_durationListString.at( i ) );
             item->setText( 2, doc->pageList().at( i )->pageTitle() );
         }
diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp
index 7fc553cf..3dce55a3 100644
--- a/kpresenter/KPrPrinterDlg.cpp
+++ b/kpresenter/KPrPrinterDlg.cpp
@@ -21,7 +21,7 @@
 */
 
 // TQt includes
-#include <layout.h>
+#include <tqlayout.h>
 
 // KDE includes
 #include <kdebug.h>
@@ -36,7 +36,7 @@
   : KPrintDialogPage( parent, name )
 {
   setTitle( i18n( "KPresenter Options" ) );
-  TQGridLayout *layout = new TQGridLayout( this, 2, 1, 11, 6 );
+  TQGridLayout *tqlayout = new TQGridLayout( this, 2, 1, 11, 6 );
   txtRows = new KIntNumInput(this );
   txtRows->setMinValue(1);
   txtRows->setMaxValue(5);
@@ -50,21 +50,21 @@
 
   TQLabel *caption = new TQLabel(i18n("Slides in the pages:"), this );
   TQToolTip::add( caption, i18n("Choose how many rows and columns with slides you want to have on all pages") );
-  layout->addMultiCellWidget( caption, 0, 0, 0, 1 );
+  tqlayout->addMultiCellWidget( caption, 0, 0, 0, 1 );
   TQVBoxLayout *l2 = new TQVBoxLayout( 0, 0, 6 );
   l2->addWidget( new TQLabel(i18n("Rows: "), this) );
   l2->addWidget( new TQLabel(i18n("Columns: "), this) );
-  layout->addLayout( l2, 1, 0 );
+  tqlayout->addLayout( l2, 1, 0 );
 
   TQVBoxLayout *l3 = new TQVBoxLayout( 0, 0, 6 );
   l3->addWidget( txtRows );
   l3->addWidget( txtColumns );
-  layout->addLayout( l3, 1, 1 );
+  tqlayout->addLayout( l3, 1, 1 );
 
   drawBorder = new TQCheckBox(i18n("Draw border around the slides"), this );
   drawBorder->setChecked( true );
   drawBorder->setEnabled( false );
-  layout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 );
+  tqlayout->addMultiCellWidget( drawBorder, 2, 2, 0, 1 );
 }
 
 void KPrPrinterDlg::getOptions( TQMap<TQString, TQString>& opts, bool )
diff --git a/kpresenter/KPrRectPreview.h b/kpresenter/KPrRectPreview.h
index 7e09a913..bf539132 100644
--- a/kpresenter/KPrRectPreview.h
+++ b/kpresenter/KPrRectPreview.h
@@ -25,7 +25,7 @@
 
 #include <tqframe.h>
 #include <tqpen.h>
-#include <brush.h>
+#include <tqbrush.h>
 
 class KPrRectPreview : public TQFrame
 {
@@ -37,9 +37,9 @@ public:
     ~KPrRectPreview() {}
 
     void setRnds( int _rx, int _ry )
-        { xRnd = _rx; yRnd = _ry; repaint( contentsRect(), true ); }
+        { xRnd = _rx; yRnd = _ry; tqrepaint( contentsRect(), true ); }
     void setPenBrush( const TQPen &_pen, const TQBrush &_brush )
-        { pen = _pen; brush = _brush; repaint( true ); }
+        { pen = _pen; brush = _brush; tqrepaint( true ); }
 
 protected:
     void drawContents( TQPainter* );
diff --git a/kpresenter/KPrRectProperty.cpp b/kpresenter/KPrRectProperty.cpp
index e3251e58..2174755b 100644
--- a/kpresenter/KPrRectProperty.cpp
+++ b/kpresenter/KPrRectProperty.cpp
@@ -27,15 +27,15 @@
 
 #include <tqspinbox.h>
 #include <tqtoolbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 KPrRectProperty::KPrRectProperty( TQWidget *parent, const char *name, KPrRectValueCmd::RectValues &rectValue )
 : TQWidget( parent, name )
 , m_rectValue( rectValue )
 {
     formerVerticalValue = 0;
-    TQVBoxLayout *layout = new TQVBoxLayout( this );
-    layout->addWidget( m_ui = new RectPropertyUI( this ) );
+    TQVBoxLayout *tqlayout = new TQVBoxLayout( this );
+    tqlayout->addWidget( m_ui = new RectPropertyUI( this ) );
     KoImageResource kir;
     m_ui->combineButton->setPixmap(kir.chain());
 
diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp
index a5977b4e..4f2d59ca 100644
--- a/kpresenter/KPrRotationDialogImpl.cpp
+++ b/kpresenter/KPrRotationDialogImpl.cpp
@@ -19,7 +19,7 @@
 #include <tqtoolbutton.h>
 #include <tqslider.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 #include <tqobject.h>
 #include <tqevent.h>
diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp
index 61aced10..e46e80fd 100644
--- a/kpresenter/KPrShadowDialogImpl.cpp
+++ b/kpresenter/KPrShadowDialogImpl.cpp
@@ -1,7 +1,7 @@
 // -*- Mode: c++; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 4; -*-
 #include <tqspinbox.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbuttongroup.h>
 
 #include <kcolorbutton.h>
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index be2e4079..b39ab5b0 100644
--- a/kpresenter/KPrSideBar.cpp
+++ b/kpresenter/KPrSideBar.cpp
@@ -672,7 +672,7 @@ void OutlineSlideItem::updateTitle()
 {
     TQString title = m_page->pageTitle();
     if ( ! m_page->isSlideSelected() )
-        title = i18n( "(%1)" ).arg( title );
+        title = i18n( "(%1)" ).tqarg( title );
     setText( 0, title );
 }
 
@@ -762,7 +762,7 @@ KPrOutline::KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v )
     setSorting( -1 );
     header()->hide();
     addColumn( i18n( "Slide" ) );
-    setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+    tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     connect( this, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), this, TQT_SLOT( itemClicked( TQListViewItem * ) ) );
     connect( this, TQT_SIGNAL( rightButtonPressed( TQListViewItem *, const TQPoint &, int ) ),
@@ -935,7 +935,7 @@ void KPrOutline::itemClicked( TQListViewItem *item )
         m_doc->deSelectAllObj();
         m_view->getCanvas()->selectObj( object );
         m_view->showObjectRect( object );
-        m_doc->repaint( false );
+        m_doc->tqrepaint( false );
     }
 }
 
diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h
index 8f23225f..b6450f11 100644
--- a/kpresenter/KPrSideBar.h
+++ b/kpresenter/KPrSideBar.h
@@ -109,7 +109,7 @@ public:
     KPrOutline( TQWidget *parent, KPrDocument *d, KPrView *v );
     ~KPrOutline();
     void setCurrentPage( int pg );
-    TQSize sizeHint() const { return TQSize( 145, KListView::sizeHint().height() ); }
+    TQSize tqsizeHint() const { return TQSize( 145, KListView::tqsizeHint().height() ); }
     void updateItem( int pagenr, bool sticky = false);
     void addItem( int pos );
     void moveItem( int oldPos, int newPos );
@@ -154,7 +154,7 @@ public:
         m_thb->setCurrentPage(pg);
     };
     void setOn( int , bool ) { };
-    //TQSize sizeHint() const { return TQSize( 120, TQTabWidget::sizeHint().height() ); };
+    //TQSize tqsizeHint() const { return TQSize( 120, TQTabWidget::tqsizeHint().height() ); };
     void updateItem( KPrPage *page );
     void addItem( int pos );
     void moveItem( int oldPos, int newPos );
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 9afecb25..f0b3a05b 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -198,7 +198,7 @@ void KPrSlideTransitionDia::preview()
 
         delete m_pageEffect;
         m_pageEffect = 0;
-        m_dialog->previewPixmap->repaint();
+        m_dialog->previewPixmap->tqrepaint();
     }
 
     m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(m_dialog->previewPixmap), m_target, effect, effectSpeed );
@@ -271,7 +271,7 @@ TQString KPrSlideTransitionDia::getSoundFileFilter()
         if ( comma )
             str += '\n';
         comma = true;
-        str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 0194e1fe..6cec5fc2 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -58,7 +58,7 @@
 #include <tqapplication.h>
 #include <tqfontdatabase.h>
 #include <tqpopupmenu.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 
 #include <KoParagCounter.h>
 #include <kaction.h>
@@ -239,7 +239,7 @@ void KPrTextObject::saveOasisMarginElement( KoGenStyle &styleobjectauto ) const
     if ( bright != 0.0 )
         styleobjectauto.addPropertyPt("fo:padding-right", bright );
 
-    //add vertical alignment
+    //add vertical tqalignment
     switch( m_textVertAlign )
     {
     case KP_TOP:
@@ -272,15 +272,15 @@ void KPrTextObject::loadOasis(const TQDomElement &element, KoOasisContext& conte
     if( styleStack.hasAttributeNS( KoXmlNS::fo, "padding-right" ) )
         bright = KoUnit::parseValue( styleStack.attributeNS( KoXmlNS::fo, "padding-right" ) );
     kdDebug()<<" KPrTextObject::loadOasis : btp :"<<btop<<" bbottom :"<<bbottom<<" bleft :"<<bleft<<" bright :"<<bright<<endl;
-    // vertical alignment
+    // vertical tqalignment
     if ( styleStack.hasAttributeNS( KoXmlNS::draw, "textarea-vertical-align" ) )
     {
-        TQString alignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" );
-        if ( alignment == "top" )
+        TQString tqalignment = styleStack.attributeNS( KoXmlNS::draw, "textarea-vertical-align" );
+        if ( tqalignment == "top" )
             m_textVertAlign= KP_TOP;
-        else if ( alignment == "middle" )
+        else if ( tqalignment == "middle" )
             m_textVertAlign= KP_CENTER;
-        else if ( alignment == "bottom" )
+        else if ( tqalignment == "bottom" )
             m_textVertAlign= KP_BOTTOM;
     }
     kdDebug()<<" vertical Alignment :"<< ( ( m_textVertAlign== KP_TOP ) ? "top" : ( m_textVertAlign==  KP_CENTER ) ? "center": "bottom" )<<endl;
@@ -473,7 +473,7 @@ void KPrTextObject::drawText( TQPainter* _painter, KoTextZoomHandler *zoomHandle
 {
     //kdDebug(33001) << "KPrTextObject::drawText onlyChanged=" << onlyChanged << " cursor=" << cursor << " resetChanged=" << resetChanged << endl;
     recalcVerticalAlignment();
-    TQColorGroup cg = TQApplication::palette().active();
+    TQColorGroup cg = TQApplication::tqpalette().active();
     _painter->save();
     _painter->translate( m_doc->zoomHandler()->zoomItX( bLeft()), m_doc->zoomHandler()->zoomItY( bTop()+alignVertical));
     if ( !editingTextObj || (_painter->device() && _painter->device()->devType() == TQInternal::Printer))
@@ -871,7 +871,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma
     if ( !n.isNull() )
     {
         TQFontDatabase fdb;
-        TQStringList families = fdb.families();
+        TQStringList families = fdb.tqfamilies();
         if ( families.findIndex( n.attribute( attrFamily ) ) != -1 )
             fn.setFamily( n.attribute( attrFamily ) );
         else
@@ -972,7 +972,7 @@ KoTextFormat KPrTextObject::loadFormat( TQDomElement &n, KoTextFormat * refForma
 
 KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocument *doc, bool findStyle)
 {
-    KoParagLayout layout;
+    KoParagLayout tqlayout;
 
     // Only when loading paragraphs, not when loading styles
     if ( findStyle )
@@ -998,7 +998,7 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
             style = doc->styleCollection()->findStyle( "Standard" );
         }
         Q_ASSERT(style);
-        layout.style = style;
+        tqlayout.style = style;
     }
 
     TQDomElement element = parentElem.namedItem( "INDENTS" ).toElement();
@@ -1007,17 +1007,17 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
         double val=0.0;
         if(element.hasAttribute("first"))
             val=element.attribute("first").toDouble();
-        layout.margins[TQStyleSheetItem::MarginFirstLine] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginFirstLine] = val;
         val=0.0;
         if(element.hasAttribute( "left"))
             // The GUI prevents a negative indent, so let's fixup broken docs too
             val=TQMAX(0, element.attribute( "left").toDouble());
-        layout.margins[TQStyleSheetItem::MarginLeft] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginLeft] = val;
         val=0.0;
         if(element.hasAttribute("right"))
             // The GUI prevents a negative indent, so let's fixup broken docs too
             val=TQMAX(0, element.attribute("right").toDouble());
-        layout.margins[TQStyleSheetItem::MarginRight] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginRight] = val;
     }
     element = parentElem.namedItem( "LINESPACING" ).toElement();
     if ( !element.isNull() )
@@ -1028,18 +1028,18 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
             TQString value = element.attribute( "value" );
             if ( value == "oneandhalf" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
-                layout.setLineSpacingValue(0);
+                tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
+                tqlayout.setLineSpacingValue(0);
             }
             else if ( value == "double" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_DOUBLE;
-                layout.setLineSpacingValue(0);
+                tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE;
+                tqlayout.setLineSpacingValue(0);
             }
             else
             {
-                layout.lineSpacingType = KoParagLayout::LS_CUSTOM;
-                layout.setLineSpacingValue(value.toDouble());
+                tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
+                tqlayout.setLineSpacingValue(value.toDouble());
             }
         }
         else
@@ -1047,28 +1047,28 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
             TQString type = element.attribute( "type" );
             if ( type == "oneandhalf" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
-                layout.setLineSpacingValue(0);
+                tqlayout.lineSpacingType = KoParagLayout::LS_ONEANDHALF;
+                tqlayout.setLineSpacingValue(0);
             }
             else if ( type == "double" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_DOUBLE;
-                layout.setLineSpacingValue(0);
+                tqlayout.lineSpacingType = KoParagLayout::LS_DOUBLE;
+                tqlayout.setLineSpacingValue(0);
             }
             else if ( type == "custom" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_CUSTOM;
-                layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
+                tqlayout.lineSpacingType = KoParagLayout::LS_CUSTOM;
+                tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
             }
             else if ( type == "atleast" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_AT_LEAST;
-                layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
+                tqlayout.lineSpacingType = KoParagLayout::LS_AT_LEAST;
+                tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
             }
             else if ( type == "multiple" )
             {
-                layout.lineSpacingType = KoParagLayout::LS_MULTIPLE;
-                layout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
+                tqlayout.lineSpacingType = KoParagLayout::LS_MULTIPLE;
+                tqlayout.setLineSpacingValue(element.attribute( "spacingvalue" ).toDouble());
             }
         }
     }
@@ -1079,43 +1079,43 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
         double val =0.0;
         if(element.hasAttribute("before"))
             val=TQMAX(0, element.attribute("before").toDouble());
-        layout.margins[TQStyleSheetItem::MarginTop] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginTop] = val;
         val = 0.0;
         if(element.hasAttribute("after"))
             val=TQMAX(0, element.attribute("after").toDouble());
-        layout.margins[TQStyleSheetItem::MarginBottom] = val;
+        tqlayout.margins[TQStyleSheetItem::MarginBottom] = val;
     }
 
 
     element = parentElem.namedItem( "LEFTBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.leftBorder = KoBorder::loadBorder( element );
+        tqlayout.leftBorder = KoBorder::loadBorder( element );
     else
-        layout.leftBorder.setPenWidth( 0);
+        tqlayout.leftBorder.setPenWidth( 0);
 
     element = parentElem.namedItem( "RIGHTBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.rightBorder = KoBorder::loadBorder( element );
+        tqlayout.rightBorder = KoBorder::loadBorder( element );
     else
-        layout.rightBorder.setPenWidth( 0);
+        tqlayout.rightBorder.setPenWidth( 0);
 
     element = parentElem.namedItem( "TOPBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.topBorder = KoBorder::loadBorder( element );
+        tqlayout.topBorder = KoBorder::loadBorder( element );
     else
-        layout.topBorder.setPenWidth(0);
+        tqlayout.topBorder.setPenWidth(0);
 
     element = parentElem.namedItem( "BOTTOMBORDER" ).toElement();
     if ( !element.isNull() )
-        layout.bottomBorder = KoBorder::loadBorder( element );
+        tqlayout.bottomBorder = KoBorder::loadBorder( element );
     else
-        layout.bottomBorder.setPenWidth(0);
+        tqlayout.bottomBorder.setPenWidth(0);
 
     element = parentElem.namedItem( "COUNTER" ).toElement();
     if ( !element.isNull() )
     {
-        layout.counter = new KoParagCounter;
-        layout.counter->load( element );
+        tqlayout.counter = new KoParagCounter;
+        tqlayout.counter->load( element );
     }
 
     KoTabulatorList tabList;
@@ -1140,110 +1140,110 @@ KoParagLayout KPrTextObject::loadParagLayout( TQDomElement & parentElem, KPrDocu
             tabList.append( tab );
         }
     }
-    layout.setTabList( tabList );
+    tqlayout.setTabList( tabList );
 
 
-    return layout;
+    return tqlayout;
 }
 
-void KPrTextObject::saveParagLayout( const KoParagLayout& layout, TQDomElement & parentElem )
+void KPrTextObject::saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem )
 {
     TQDomDocument doc = parentElem.ownerDocument();
     TQDomElement element = doc.createElement( "NAME" );
     parentElem.appendChild( element );
-    if ( layout.style )
-        element.setAttribute( "value", layout.style->name() );
+    if ( tqlayout.style )
+        element.setAttribute( "value", tqlayout.style->name() );
     else
         kdWarning() << "KWTextParag::saveParagLayout: style==0L!" << endl;
 
 
-    if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ||
-         layout.margins[TQStyleSheetItem::MarginLeft] != 0 ||
-         layout.margins[TQStyleSheetItem::MarginRight] != 0 )
+    if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 ||
+         tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 ||
+         tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 )
     {
         element = doc.createElement( "INDENTS" );
         parentElem.appendChild( element );
-        if ( layout.margins[TQStyleSheetItem::MarginFirstLine] != 0 )
-            element.setAttribute( "first", layout.margins[TQStyleSheetItem::MarginFirstLine] );
-        if ( layout.margins[TQStyleSheetItem::MarginLeft] != 0 )
-            element.setAttribute( "left", layout.margins[TQStyleSheetItem::MarginLeft] );
-        if ( layout.margins[TQStyleSheetItem::MarginRight] != 0 )
-            element.setAttribute( "right", layout.margins[TQStyleSheetItem::MarginRight] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginFirstLine] != 0 )
+            element.setAttribute( "first", tqlayout.margins[TQStyleSheetItem::MarginFirstLine] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginLeft] != 0 )
+            element.setAttribute( "left", tqlayout.margins[TQStyleSheetItem::MarginLeft] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginRight] != 0 )
+            element.setAttribute( "right", tqlayout.margins[TQStyleSheetItem::MarginRight] );
     }
 
 
-    if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 ||
-         layout.margins[TQStyleSheetItem::MarginBottom] != 0 )
+    if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 ||
+         tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
     {
         element = doc.createElement( "OFFSETS" );
         parentElem.appendChild( element );
-        if ( layout.margins[TQStyleSheetItem::MarginTop] != 0 )
-            element.setAttribute( "before", layout.margins[TQStyleSheetItem::MarginTop] );
-        if ( layout.margins[TQStyleSheetItem::MarginBottom] != 0 )
-            element.setAttribute( "after", layout.margins[TQStyleSheetItem::MarginBottom] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginTop] != 0 )
+            element.setAttribute( "before", tqlayout.margins[TQStyleSheetItem::MarginTop] );
+        if ( tqlayout.margins[TQStyleSheetItem::MarginBottom] != 0 )
+            element.setAttribute( "after", tqlayout.margins[TQStyleSheetItem::MarginBottom] );
     }
 
-    if ( layout.lineSpacingType != KoParagLayout::LS_SINGLE )
+    if ( tqlayout.lineSpacingType != KoParagLayout::LS_SINGLE )
     {
         element = doc.createElement( "LINESPACING" );
         parentElem.appendChild( element );
-        if ( layout.lineSpacingType == KoParagLayout::LS_ONEANDHALF )
+        if ( tqlayout.lineSpacingType == KoParagLayout::LS_ONEANDHALF )
             element.setAttribute( "type", "oneandhalf" );
-        else if ( layout.lineSpacingType == KoParagLayout::LS_DOUBLE )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_DOUBLE )
             element.setAttribute( "type", "double" );
-        else if ( layout.lineSpacingType == KoParagLayout::LS_CUSTOM )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_CUSTOM )
         {
             element.setAttribute( "type", "custom" );
-            element.setAttribute( "spacingvalue", layout.lineSpacingValue());
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue());
         }
-        else if ( layout.lineSpacingType == KoParagLayout::LS_AT_LEAST )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_AT_LEAST )
         {
             element.setAttribute( "type", "atleast" );
-            element.setAttribute( "spacingvalue", layout.lineSpacingValue());
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue());
         }
-        else if ( layout.lineSpacingType == KoParagLayout::LS_MULTIPLE )
+        else if ( tqlayout.lineSpacingType == KoParagLayout::LS_MULTIPLE )
         {
             element.setAttribute( "type", "multiple" );
-            element.setAttribute( "spacingvalue", layout.lineSpacingValue());
+            element.setAttribute( "spacingvalue", tqlayout.lineSpacingValue());
         }
         else
             kdDebug(33001) << " error in lineSpacing Type" << endl;
     }
 
-    if ( layout.leftBorder.penWidth() > 0 )
+    if ( tqlayout.leftBorder.penWidth() > 0 )
     {
         element = doc.createElement( "LEFTBORDER" );
         parentElem.appendChild( element );
-        layout.leftBorder.save( element );
+        tqlayout.leftBorder.save( element );
     }
-    if ( layout.rightBorder.penWidth() > 0 )
+    if ( tqlayout.rightBorder.penWidth() > 0 )
     {
         element = doc.createElement( "RIGHTBORDER" );
         parentElem.appendChild( element );
-        layout.rightBorder.save( element );
+        tqlayout.rightBorder.save( element );
     }
-    if ( layout.topBorder.penWidth() > 0 )
+    if ( tqlayout.topBorder.penWidth() > 0 )
     {
         element = doc.createElement( "TOPBORDER" );
         parentElem.appendChild( element );
-        layout.topBorder.save( element );
+        tqlayout.topBorder.save( element );
     }
-    if ( layout.bottomBorder.penWidth() > 0 )
+    if ( tqlayout.bottomBorder.penWidth() > 0 )
     {
         element = doc.createElement( "BOTTOMBORDER" );
         parentElem.appendChild( element );
-        layout.bottomBorder.save( element );
+        tqlayout.bottomBorder.save( element );
     }
 
-    if ( layout.counter && layout.counter->numbering() != KoParagCounter::NUM_NONE )
+    if ( tqlayout.counter && tqlayout.counter->numbering() != KoParagCounter::NUM_NONE )
     {
         element = doc.createElement( "COUNTER" );
         parentElem.appendChild( element );
-        if (layout.counter )
-            layout.counter->save( element );
+        if (tqlayout.counter )
+            tqlayout.counter->save( element );
     }
 
-    KoTabulatorList tabList = layout.tabList();
+    KoTabulatorList tabList = tqlayout.tabList();
     KoTabulatorList::ConstIterator it = tabList.begin();
     for ( ; it != tabList.end() ; it++ )
     {
@@ -1287,25 +1287,25 @@ void KPrTextObject::recalcPageNum( KPrPage *page )
             }
 
             var->resize();
-            var->paragraph()->invalidate( 0 ); // size may have changed -> need reformatting !
+            var->paragraph()->tqinvalidate( 0 ); // size may have changed -> need reformatting !
             var->paragraph()->setChanged( true );
         }
     }
 }
 
-void KPrTextObject::layout()
+void KPrTextObject::tqlayout()
 {
-    invalidate();
+    tqinvalidate();
     // Get the thing going though, repainting doesn't call formatMore
     m_textobj->formatMore( 2 );
 }
 
-void KPrTextObject::invalidate()
+void KPrTextObject::tqinvalidate()
 {
-    //kdDebug(33001) << "KWTextFrameSet::invalidate " << getName() << endl;
+    //kdDebug(33001) << "KWTextFrameSet::tqinvalidate " << getName() << endl;
     m_textobj->setLastFormattedParag( textDocument()->firstParag() );
     textDocument()->formatter()->setViewFormattingChars( m_doc->viewFormattingChars() );
-    textDocument()->invalidate(); // lazy layout, real update follows upon next repaint
+    textDocument()->tqinvalidate(); // lazy tqlayout, real update follows upon next tqrepaint
 }
 
 // For the "paragraph after paragraph" effect
@@ -1380,7 +1380,7 @@ void KPrTextObject::drawCursor( TQPainter *p, KoTextCursor *cursor, bool cursorV
     //p->fillRect( clip, TQt::blue );
 
     TQPixmap *pix = 0;
-    TQColorGroup cg = TQApplication::palette().active();
+    TQColorGroup cg = TQApplication::tqpalette().active();
     cg.setColor( TQColorGroup::Base, m_doc->txtBackCol() );
 
     uint drawingFlags = KoTextDocument::DrawSelections;
@@ -1451,13 +1451,13 @@ KPrTextView * KPrTextObject::createKPTextView( KPrCanvas * _canvas, bool temp )
 
 void KPrTextObject::removeHighlight ()
 {
-    m_textobj->removeHighlight( true /*repaint*/ );
+    m_textobj->removeHighlight( true /*tqrepaint*/ );
 }
 
-void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool repaint, KDialogBase* dialog )
+void KPrTextObject::highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas* canvas, bool tqrepaint, KDialogBase* dialog )
 {
-    m_textobj->highlightPortion( parag, index, length, repaint );
-    if ( repaint )
+    m_textobj->highlightPortion( parag, index, length, tqrepaint );
+    if ( tqrepaint )
     {
         KPrDocument* doc = canvas->getView()->kPresenterDoc();
 
@@ -1582,7 +1582,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted,
     if ( ( bottom > availHeight ) ||   // this parag is already below the avail height
          ( lastFormatted && (bottom + lastFormatted->rect().height() > availHeight) ) ) // or next parag will be below it
     {
-        int difference = ( bottom + 2 ) - availHeight; // in layout unit pixels
+        int difference = ( bottom + 2 ) - availHeight; // in tqlayout unit pixels
         if( lastFormatted && bottom + lastFormatted->rect().height() > availHeight )
         {
             difference += lastFormatted->rect().height();
@@ -1616,7 +1616,7 @@ void KPrTextObject::slotAfterFormatting( int bottom, KoTextParag* lastFormatted,
                 // Do recalculate the new available height though
                 slotAvailableHeightNeeded();
                 m_doc->updateRuler();
-                m_doc->repaint( true );
+                m_doc->tqrepaint( true );
                 *abort = false;
             }
         }
@@ -1822,7 +1822,7 @@ void KPrTextView::copy()
     //kdDebug(33001)<<"void KPrTextView::copy() "<<endl;
     if ( textDocument()->hasSelection( KoTextDocument::Standard ) ) {
         TQDragObject *drag = newDrag( 0 );
-        TQApplication::clipboard()->setData( drag );
+        TQApplication::tqclipboard()->setData( drag );
     }
 }
 
@@ -1830,11 +1830,11 @@ void KPrTextView::paste()
 {
     //kdDebug(33001) << "KPrTextView::paste()" << endl;
 
-    TQMimeSource *data = TQApplication::clipboard()->data();
+    TQMimeSource *data = TQApplication::tqclipboard()->data();
     TQCString returnedMimeType = KoTextObject::providesOasis( data );
     if ( !returnedMimeType.isEmpty() )
     {
-        TQByteArray arr = data->encodedData( returnedMimeType );
+        TQByteArray arr = data->tqencodedData( returnedMimeType );
         if ( arr.size() )
         {
 #if 0
@@ -1850,13 +1850,13 @@ void KPrTextView::paste()
     }
     else
     {
-        // Note: TQClipboard::text() seems to do a better job than encodedData( "text/plain" )
+        // Note: TQClipboard::text() seems to do a better job than tqencodedData( "text/plain" )
         // In particular it handles charsets (in the mimetype).
-        TQString text = TQApplication::clipboard()->text();
+        TQString text = TQApplication::tqclipboard()->text();
         if ( !text.isEmpty() )
             textObject()->pasteText( cursor(), text, currentFormat(), true /*removeSelected*/ );
     }
-    kpTextObject()->layout();
+    kpTextObject()->tqlayout();
 }
 
 void KPrTextView::updateUI( bool updateFormat, bool force  )
@@ -1864,9 +1864,9 @@ void KPrTextView::updateUI( bool updateFormat, bool force  )
     KoTextView::updateUI( updateFormat, force  );
     // Paragraph settings
     KoTextParag * parag = static_cast<KoTextParag*>( cursor()->parag());
-    if ( m_paragLayout.alignment != parag->resolveAlignment() || force ) {
-        m_paragLayout.alignment = parag->resolveAlignment();
-        m_canvas->getView()->alignChanged(  m_paragLayout.alignment );
+    if ( m_paragLayout.tqalignment != parag->resolveAlignment() || force ) {
+        m_paragLayout.tqalignment = parag->resolveAlignment();
+        m_canvas->getView()->alignChanged(  m_paragLayout.tqalignment );
     }
 
     // Counter
@@ -2356,7 +2356,7 @@ void KPrTextView::insertVariable( KoVariable *var, KoTextFormat *format, bool re
                               customItemsMap );
         if ( refreshCustomMenu && var->type() == VT_CUSTOM )
             kpTextObject()->kPresenterDocument()->refreshMenuCustomVariable();
-        kpTextObject()->kPresenterDocument()->repaint( kpTextObject() );
+        kpTextObject()->kPresenterDocument()->tqrepaint( kpTextObject() );
     }
 }
 
@@ -2379,7 +2379,7 @@ TQDragObject * KPrTextView::newDrag( TQWidget * parent )
     
     KPrDocument * doc = kpTextObject()->kPresenterDocument();
     
-    doc->getVariableCollection()->variableSetting()->setModificationDate( TQDateTime::currentDateTime() );
+    doc->getVariableCollection()->variableSetting()->setModificationDate( TQDateTime::tqcurrentDateTime() );
     doc->recalcVariables( VT_DATE );
     doc->recalcVariables( VT_TIME );
     doc->recalcVariables( VT_STATISTIC );
@@ -2472,7 +2472,7 @@ void KPrTextView::dropEvent( TQDropEvent * e )
             KCommand *cmd = textView()->prepareDropMove( dropCursor );
             if(cmd)
             {
-                kpTextObject()->layout();
+                kpTextObject()->tqlayout();
                 macroCmd->addCommand(cmd);
                 addMacroCmd = true;
             }
@@ -2490,7 +2490,7 @@ void KPrTextView::dropEvent( TQDropEvent * e )
         TQCString returnedTypeMime = KoTextObject::providesOasis( e );
         if ( !returnedTypeMime.isEmpty() )
         {
-            TQByteArray arr = e->encodedData( returnedTypeMime );
+            TQByteArray arr = e->tqencodedData( returnedTypeMime );
             if ( arr.size() )
             {
                 KCommand *cmd = kpTextObject()->pasteOasis( cursor(), arr, false );
diff --git a/kpresenter/KPrTextObject.h b/kpresenter/KPrTextObject.h
index 6b62d6b8..3bacdb69 100644
--- a/kpresenter/KPrTextObject.h
+++ b/kpresenter/KPrTextObject.h
@@ -115,7 +115,7 @@ public:
     void applyStyleChange( KoStyleChangeDefMap changed );
 
     void removeHighlight();
-    void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool repaint, KDialogBase* dialog = 0 );
+    void highlightPortion( KoTextParag * parag, int index, int length, KPrCanvas *canvas, bool tqrepaint, KDialogBase* dialog = 0 );
 
     KCommand * pasteOasis( KoTextCursor * cursor, const TQByteArray & data, bool removeSelected );
 
@@ -137,7 +137,7 @@ public:
     bool isProtectContent() const { return textObject()->protectContent();}
     void loadVariable( TQValueList<TQDomElement> & listVariable,KoTextParag *lastParag, int offset=0 );
 
-    void layout();
+    void tqlayout();
 
     /** Reimplemented from KoTextFlow */
     int availableHeight() const;
@@ -194,8 +194,8 @@ protected:
     virtual void loadKTextObject( const TQDomElement &e );
     void drawText( TQPainter* _painter, KoTextZoomHandler* zoomHandler, bool onlyChanged, KoTextCursor* cursor, bool resetChanged );
     void drawParags( TQPainter *p, KoTextZoomHandler* zoomHandler, const TQColorGroup& cg, int from, int to );
-    void saveParagLayout( const KoParagLayout& layout, TQDomElement & parentElem );
-    void invalidate();
+    void saveParagLayout( const KoParagLayout& tqlayout, TQDomElement & parentElem );
+    void tqinvalidate();
     void recalcVerticalAlignment();
     virtual KoPen defaultPen() const;
 protected slots:
diff --git a/kpresenter/KPrTextObjectIface.cpp b/kpresenter/KPrTextObjectIface.cpp
index 01478ef2..0dfc1d79 100644
--- a/kpresenter/KPrTextObjectIface.cpp
+++ b/kpresenter/KPrTextObjectIface.cpp
@@ -247,25 +247,25 @@ bool KPrTextObjectIface::isProtectContent() const
 void KPrTextObjectIface::setPtMarginLeft(double val)
 {
     m_textobject->setBLeft(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 void KPrTextObjectIface::setPtMarginRight(double val)
 {
     m_textobject->setBRight(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 void KPrTextObjectIface::setPtMarginTop(double val)
 {
     m_textobject->setBTop(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 void KPrTextObjectIface::setPtMarginBottom(double val)
 {
     m_textobject->setBBottom(val);
-    m_textobject->kPresenterDocument()->layout( m_textobject );
+    m_textobject->kPresenterDocument()->tqlayout( m_textobject );
 }
 
 double KPrTextObjectIface::ptMarginLeft()const
diff --git a/kpresenter/KPrTextPreview.h b/kpresenter/KPrTextPreview.h
index bedb4753..f25d6987 100644
--- a/kpresenter/KPrTextPreview.h
+++ b/kpresenter/KPrTextPreview.h
@@ -13,10 +13,10 @@ public:
     KPrTextPreview( TQWidget* parent, const char* name = 0 );
     ~KPrTextPreview() {}
 
-    void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; repaint( true ); }
-    void setShadowDistance( int sd ) { shadowDistance = sd; repaint( true ); }
-    void setShadowColor( const TQColor &sc ) { shadowColor = sc; repaint( true ); }
-    void setAngle( double a ) { angle = a; repaint( true ); }
+    void setShadowDirection( ShadowDirection sd ) { shadowDirection = sd; tqrepaint( true ); }
+    void setShadowDistance( int sd ) { shadowDistance = sd; tqrepaint( true ); }
+    void setShadowColor( const TQColor &sc ) { shadowColor = sc; tqrepaint( true ); }
+    void setAngle( double a ) { angle = a; tqrepaint( true ); }
 
 protected:
     void drawContents( TQPainter* );
diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp
index fd794daa..6708065b 100644
--- a/kpresenter/KPrTextProperty.cpp
+++ b/kpresenter/KPrTextProperty.cpp
@@ -23,7 +23,7 @@
 #include "KPrTextProperty.h"
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kdebug.h>
@@ -37,15 +37,15 @@ KPrTextProperty::KPrTextProperty( TQWidget *parent, const char *name, const Marg
 , m_unit( unit )
 , m_protectContent( protectContent )
 {
-    TQGridLayout *layout = new TQGridLayout( this, 1, 1, 11, 6 );
+    TQGridLayout *tqlayout = new TQGridLayout( this, 1, 1, 11, 6 );
 
-    layout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 );
-    layout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 );
+    tqlayout->addWidget( m_protectContentCheck = new TQCheckBox( i18n( "Protect content" ), this ), 0, 0 );
+    tqlayout->addWidget( m_margins = new KPrMarginWidget( this, name, m_unit ), 1, 0 );
 
     connect( m_protectContentCheck, TQT_SIGNAL( toggled ( bool ) ),
              this, TQT_SLOT( slotProtectContentChanged( bool ) ) );
 
-    resize( TQSize( 301, 217 ).expandedTo( minimumSizeHint() ) );
+    resize( TQSize( 301, 217 ).expandedTo( tqminimumSizeHint() ) );
 
     m_margins->setValues( marginsStruct.leftMargin, marginsStruct.rightMargin,
                           marginsStruct.topMargin, marginsStruct.bottomMargin );
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index 33a0e9ed..a7fc0899 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -34,7 +34,7 @@
 #include <tqheader.h>
 #include <tqwmatrix.h>
 #include <tqvbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqimage.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -105,7 +105,7 @@ void KPrEffectPreview::run( PageEffect effect, EffectSpeed speed )
 
         delete m_pageEffect;
         m_pageEffect = 0;
-        TQLabel::repaint();
+        TQLabel::tqrepaint();
     }
 
     m_pageEffect = new KPrPageEffects( TQT_TQPAINTDEVICE(this), m_target, effect, speed );
@@ -160,8 +160,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
 
     // right-side of the dialog, for showing effect preview
 
-    TQVBoxLayout *rightlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() );
-    rightlayout->setAutoAdd( true );
+    TQVBoxLayout *righttqlayout = new TQVBoxLayout( rightpart, KDialog::marginHint(), KDialog::spacingHint() );
+    righttqlayout->setAutoAdd( true );
 
     effectPreview = new KPrEffectPreview( rightpart, doc, view );
 
@@ -178,8 +178,8 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
     pageEffect = pg->getPageEffect();
     speed = pg->getPageEffectSpeed();
 
-    TQVBoxLayout *leftlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() );
-    leftlayout->setAutoAdd( true );
+    TQVBoxLayout *lefttqlayout = new TQVBoxLayout( leftpart, KDialog::marginHint(), KDialog::spacingHint() );
+    lefttqlayout->setAutoAdd( true );
 
     new TQLabel( i18n("Effect:"), leftpart );
 
@@ -260,7 +260,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
     automaticPreview->setChecked( true );
 
     TQWidget* previewspacer = new TQWidget( previewgrp );
-    previewspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
+    previewspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding,
                                                TQSizePolicy::Expanding ) );
 
     previewButton = new TQPushButton( previewgrp );
@@ -314,7 +314,7 @@ KPrTransEffectDia::KPrTransEffectDia( TQWidget *parent, const char *name,
     connect( timeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(timeChanged(int)) );
 
     TQWidget* rspacer = new TQWidget( rightpart );
-    rspacer->setSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
+    rspacer->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
     TQWidget* lspacer = new TQWidget( leftpart );
     lspacer->setMinimumSize( 10, spacingHint() );
@@ -386,7 +386,7 @@ static TQString getSoundFileFilter()
         if ( comma )
             str += '\n';
         comma = true;
-        str += TQString( i18n( "*.%1|%2 Files" ) ).arg( *it ).arg( (*it).upper() );
+        str += TQString( i18n( "*.%1|%2 Files" ) ).tqarg( *it ).tqarg( (*it).upper() );
 
         full += TQString( "*.") + (*it) + ' ';
     }
diff --git a/kpresenter/KPrUtils.cpp b/kpresenter/KPrUtils.cpp
index 2cbf5dc6..fa21141a 100644
--- a/kpresenter/KPrUtils.cpp
+++ b/kpresenter/KPrUtils.cpp
@@ -383,7 +383,7 @@ TQString saveOasisTimer( int second )
 
     //ISO8601 chapter 5.5.3.2
     //TQDate doesn't encode it as this format.
-    TQString timeIso = TQString( "PT%1H%2M%3S" ).arg( hours ).arg( ms ).arg( sec );
+    TQString timeIso = TQString( "PT%1H%2M%3S" ).tqarg( hours ).tqarg( ms ).tqarg( sec );
     return timeIso;
 }
 
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 9958ac13..a86caa80 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -26,12 +26,12 @@
 #include <tqpopupmenu.h>
 #include <tqcursor.h>
 #include <tqfileinfo.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <assert.h>
 #include <tqtoolbutton.h>
 #include <tqtooltip.h>
 #include <tqdir.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqradiobutton.h>
 #include <tqdragobject.h>
 #include <tqfile.h>
@@ -410,23 +410,23 @@ KPrView::KPrView( KPrDocument* _doc, TQWidget *_parent, const char *_name )
     if ( sb ) // No statusbar in e.g. konqueror
     {
         m_sbPageLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbPageLabel->setAlignment( AlignLeft | AlignVCenter );
+        m_sbPageLabel->tqsetAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbPageLabel, 0 );
 
         m_sbModifiedLabel = new KStatusBarLabel( "   ", 0, sb );
-        m_sbModifiedLabel->setAlignment( AlignLeft | AlignVCenter );
+        m_sbModifiedLabel->tqsetAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbModifiedLabel, 0 );
 
         m_sbObjectLabel = new KStatusBarLabel( TQString(), 0, sb );
-        m_sbObjectLabel->setAlignment( AlignLeft | AlignVCenter );
+        m_sbObjectLabel->tqsetAlignment( AlignLeft | AlignVCenter );
         addStatusBarItem( m_sbObjectLabel, 1 );
 
         m_sbZoomLabel = new KStatusBarLabel( ' ' + TQString::number( m_pKPresenterDoc->zoomHandler()->zoom() ) + "% ", 0, sb );
-        m_sbZoomLabel->setAlignment( AlignHCenter | AlignVCenter );
+        m_sbZoomLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbZoomLabel, 0 );
 
         m_sbUnitLabel = new KStatusBarLabel( ' ' + KoUnit::unitDescription( m_pKPresenterDoc->unit() ) + ' ', 0, sb );
-        m_sbUnitLabel->setAlignment( AlignHCenter | AlignVCenter );
+        m_sbUnitLabel->tqsetAlignment( AlignHCenter | AlignVCenter );
         addStatusBarItem( m_sbUnitLabel, 0 );
     }
 
@@ -502,12 +502,12 @@ void KPrView::setupPrinter( KPrinter &prt )
     prt.setFromTo( 1, m_pKPresenterDoc->getPageNums() );
     prt.setOption( "kde-range", m_pKPresenterDoc->selectedForPrinting() );
     prt.setPageSelection(KPrinter::ApplicationSide);
-    KoPageLayout layout = m_pKPresenterDoc->pageLayout();
-    prt.setOption( "kde-margin-top", TQString::number(layout.ptTop) );
-    prt.setOption( "kde-margin-bottom", TQString::number(layout.ptBottom) );
-    prt.setOption( "kde-margin-left", TQString::number(layout.ptLeft) );
-    prt.setOption( "kde-margin-right", TQString::number(layout.ptRight) );
-    KoFormat pageFormat = layout.format;
+    KoPageLayout tqlayout = m_pKPresenterDoc->pageLayout();
+    prt.setOption( "kde-margin-top", TQString::number(tqlayout.ptTop) );
+    prt.setOption( "kde-margin-bottom", TQString::number(tqlayout.ptBottom) );
+    prt.setOption( "kde-margin-left", TQString::number(tqlayout.ptLeft) );
+    prt.setOption( "kde-margin-right", TQString::number(tqlayout.ptRight) );
+    KoFormat pageFormat = tqlayout.format;
     prt.setPageSize( static_cast<KPrinter::PageSize>( KoPageFormat::printerPageSize( pageFormat ) ) );
 
     if ( m_pKPresenterDoc->pageLayout().orientation == PG_LANDSCAPE || pageFormat == PG_SCREEN )
@@ -579,9 +579,9 @@ void KPrView::print( KPrinter &prt )
         m_pKPresenterDoc->recalcVariables( VT_ALL );
     }
 
-    m_canvas->repaint();
+    m_canvas->tqrepaint();
     kdDebug(33001) << "KPrView::print zoom&res reset" << endl;
-    m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::currentDateTime());
+    m_pKPresenterDoc->getVariableCollection()->variableSetting()->setLastPrintingDate(TQDateTime::tqcurrentDateTime());
     m_pKPresenterDoc->recalcVariables( VT_DATE );
 }
 
@@ -620,7 +620,7 @@ void KPrView::editPaste()
     if ( !m_canvas->currentTextObjectView() ) {
         m_canvas->setToolEditMode( TEM_MOUSE );
         deSelectAllObjects();
-        TQMimeSource *data = TQApplication::clipboard()->data();
+        TQMimeSource *data = TQApplication::tqclipboard()->data();
         if ( data->provides( "text/uri-list" ) )
         {
             m_pKPresenterDoc->pastePage( data, currPg );
@@ -632,7 +632,7 @@ void KPrView::editPaste()
         {
             // TODO: it would be nice to have no offset when pasting onto a different page...
             m_canvas->activePage()->pasteObjs(
-                data->encodedData(KoStoreDrag::mimeType("application/x-kpresenter")),
+                data->tqencodedData(KoStoreDrag::mimeType("application/x-kpresenter")),
                 1, 0.0, 0.0, 0.0, 20.0, 20.0);
 
             m_canvas->setMouseSelectedObject(true);
@@ -644,7 +644,7 @@ void KPrView::editPaste()
             //TODO : fix me !!
             // TODO: it would be nice to have no offset when pasting onto a different page...
             //m_canvas->activePage()->pasteObjs(
-            //data->encodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")),
+            //data->tqencodedData(KoStoreDrag::mimeType("application/vnd.oasis.opendocument.presentation")),
             //1, 0.0, 0.0, 0.0, 20.0, 20.0);
 
             m_canvas->setMouseSelectedObject(true);
@@ -846,7 +846,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
                             if ( !KIO::NetAccess::upload( tempFile.name(), url, this ) )
                             {
                                 KMessageBox::sorry( this, i18n(
-                                   "Unable to save the file to '%1'. %2.").arg( url.prettyURL() ).arg( KIO::NetAccess::lastErrorString() ),
+                                   "Unable to save the file to '%1'. %2.").tqarg( url.prettyURL() ).tqarg( KIO::NetAccess::lastErrorString() ),
                                    i18n("Save Failed") );
                             }
                         }
@@ -857,7 +857,7 @@ void KPrView::savePicture( const TQString& oldName, KoPicture& picture)
                     }
                     else
                         KMessageBox::sorry( this, i18n(
-                            "Error during saving: could not create temporary file: %1.").arg( strerror( tempFile.status() ) ),
+                            "Error during saving: could not create temporary file: %1.").tqarg( strerror( tempFile.status() ) ),
                             i18n("Save Picture") );
                 }
             }
@@ -1274,7 +1274,7 @@ void KPrView::extraShadow()
 
         if ( !shadowDia ) {
             shadowDia = new KPrShadowDialogImpl( this );
-            shadowDia->resize( shadowDia->minimumSize() );
+            shadowDia->resize( shadowDia->tqminimumSize() );
             connect( shadowDia, TQT_SIGNAL( apply() ), TQT_TQOBJECT(this), TQT_SLOT( shadowOk() ) );
         }
 
@@ -1509,7 +1509,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
             KProcess proc;
             proc << xdgScreenSaver;
             proc << "suspend";
-            proc << TQString::number( topLevelWidget()->winId() );
+            proc << TQString::number( tqtopLevelWidget()->winId() );
             kdDebug() << k_funcinfo << proc.args() << endl;
             proc.start( KProcess::DontCare );
         } else {
@@ -1580,7 +1580,7 @@ void KPrView::startScreenPres( int pgNum /*1-based*/ )
         if ( !kPresenterDoc()->spManualSwitch() )
         {
              m_autoPresStop = false;
-             m_pKPresenterDoc->repaint( false );
+             m_pKPresenterDoc->tqrepaint( false );
 
              if ( ! m_autoPresTimerConnected ) {
                  connect( &m_autoPresTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( doAutomaticScreenPres() ) );
@@ -1633,7 +1633,7 @@ void KPrView::screenStop()
             KProcess proc;
             proc << xdgScreenSaver;
             proc << "resume";
-            proc << TQString::number( topLevelWidget()->winId() );
+            proc << TQString::number( tqtopLevelWidget()->winId() );
             kdDebug() << k_funcinfo << proc.args() << endl;
             proc.start( KProcess::DontCare );
         } else {
@@ -1856,7 +1856,7 @@ void KPrView::slotApplyFont()
 
 void KPrView::slotCounterStyleSelected()
 {
-    TQString actionName = TQString::fromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
+    TQString actionName = TQString::tqfromLatin1(TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name());
     if ( actionName.startsWith( "counterstyle_" ) )
     {
         TQString styleStr = actionName.mid(13);
@@ -2175,7 +2175,7 @@ void KPrView::createGUI()
 
     // setup page
     pageBase = new PageBase( splitterVertical, this );
-    pageBase->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
+    pageBase->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ) );
 
     m_canvas=new KPrCanvas( pageBase, "Canvas", this );
 
@@ -2414,7 +2414,7 @@ void KPrView::setupActions()
     actionToolsZoom->setExclusiveGroup( "tools" );
 
     actionToolsShapePopup = new KActionMenu( i18n( "&Shape" ), "rectangle",
-                                             actionCollection(), "tools_shapepopup" );
+                                             actionCollection(), "tools_tqshapepopup" );
     actionToolsShapePopup->setDelayed(true);
     connect(actionToolsShapePopup, TQT_SIGNAL(activated()), TQT_TQOBJECT(this), TQT_SLOT(toolsShapePopup()));
 
@@ -2597,7 +2597,7 @@ void KPrView::setupActions()
         // This approach allows to edit toolbars and extract separate actions from this menu
         KToggleAction* act = new KToggleAction( styleIt.current()->name(), /*TODO icon,*/
                                                 0, TQT_TQOBJECT(this), TQT_SLOT( slotCounterStyleSelected() ),
-                                                actionCollection(), TQString("counterstyle_%1").arg( styleIt.current()->style() ).latin1() );
+                                                actionCollection(), TQString("counterstyle_%1").tqarg( styleIt.current()->style() ).latin1() );
         act->setExclusiveGroup( "counterstyle" );
         // Add to the right menu: both for "none", bullet for bullets, numbers otherwise
         if ( styleIt.current()->style() == KoParagCounter::STYLE_NONE ) {
@@ -3096,19 +3096,19 @@ void KPrView::setupActions()
     actionAlignVerticalTop = new KToggleAction( i18n( "Align Top" ), 0,
                                                 TQT_TQOBJECT(this), TQT_SLOT( alignVerticalTop() ),
                                                 actionCollection(), "align_top" );
-    actionAlignVerticalTop->setExclusiveGroup( "vertical_alignment" );
+    actionAlignVerticalTop->setExclusiveGroup( "vertical_tqalignment" );
     actionAlignVerticalTop->setChecked( true );
 
 
     actionAlignVerticalBottom = new KToggleAction( i18n( "Align Bottom" ), 0,
                                                    TQT_TQOBJECT(this), TQT_SLOT( alignVerticalBottom() ),
                                                    actionCollection(), "align_bottom" );
-    actionAlignVerticalBottom->setExclusiveGroup( "vertical_alignment" );
+    actionAlignVerticalBottom->setExclusiveGroup( "vertical_tqalignment" );
 
     actionAlignVerticalCenter = new KToggleAction( i18n( "Align Middle" ), 0,
                                                    TQT_TQOBJECT(this), TQT_SLOT( alignVerticalCenter() ),
                                                    actionCollection(), "align_center" );
-    actionAlignVerticalCenter->setExclusiveGroup( "vertical_alignment" );
+    actionAlignVerticalCenter->setExclusiveGroup( "vertical_tqalignment" );
 
 
     actionSavePicture= new KAction( i18n("Save Picture..."), 0,
@@ -3491,8 +3491,8 @@ void KPrView::reorganize()
 
         if(kPresenterDoc()->showRuler())
         {
-            int hSpace = v_ruler->minimumSizeHint().width();
-            int vSpace = h_ruler->minimumSizeHint().height();
+            int hSpace = v_ruler->tqminimumSizeHint().width();
+            int vSpace = h_ruler->tqminimumSizeHint().height();
 
             m_canvas->move( hSpace, vSpace );
             if ( h_ruler )
@@ -3552,8 +3552,8 @@ void PageBase::resizeEvent( TQResizeEvent *e )
     TQSize s = e ? e->size() : size();
 
     if ( view->m_bShowGUI ) {
-        int hSpace = view->getVRuler()->minimumSizeHint().width();
-        int vSpace = view->getVRuler()->minimumSizeHint().height();
+        int hSpace = view->getVRuler()->tqminimumSizeHint().width();
+        int vSpace = view->getVRuler()->tqminimumSizeHint().height();
 
         view->m_canvas->resize( s.width() - ( hSpace + 16 ), s.height() - ( vSpace + 16 ) );
         view->vert->setGeometry( s.width() - 16, 0, 16, s.height() - 32 );
@@ -3717,7 +3717,7 @@ void KPrView::setupPopupMenus()
     actionToolsLinePopup->insert(actionToolsCubicBezierCurve);
     actionToolsLinePopup->insert(actionToolsQuadricBezierCurve);
 
-    // create insert-shape popup
+    // create insert-tqshape popup
     actionToolsShapePopup->insert(actionToolsRectangle);
     actionToolsShapePopup->insert(actionToolsCircleOrEllipse);
     actionToolsShapePopup->insert(actionToolsPie);
@@ -3778,8 +3778,8 @@ void KPrView::setupRulers()
     v_ruler = new KoRuler( pageBase, m_canvas, Qt::Vertical, kPresenterDoc()->pageLayout(), 0, kPresenterDoc()->unit() );
     v_ruler->setReadWrite(kPresenterDoc()->isReadWrite());
 
-    int hSpace = v_ruler->minimumSizeHint().width();
-    int vSpace = h_ruler->minimumSizeHint().height();
+    int hSpace = v_ruler->tqminimumSizeHint().width();
+    int vSpace = h_ruler->tqminimumSizeHint().height();
 
     m_canvas->resize( m_canvas->width() - hSpace, m_canvas->height() - vSpace );
     m_canvas->move( hSpace, vSpace );
@@ -3847,7 +3847,7 @@ void KPrView::skipToPage( int num )
     //(Laurent) deselect object when we change page.
     //otherwise you can change object properties on other page
     deSelectAllObjects();
-    m_pKPresenterDoc->repaint( FALSE );
+    m_pKPresenterDoc->tqrepaint( FALSE );
 
     m_pKPresenterDoc->displayActivePage( page );
 }
@@ -4102,7 +4102,7 @@ void KPrView::updatePageInfo()
 {
     if (m_sbPageLabel)
         m_sbPageLabel->setText( TQString(" ") +
-                                i18n("Slide %1/%2").arg(getCurrPgNum()).arg(m_pKPresenterDoc->getPageNums())+
+                                i18n("Slide %1/%2").tqarg(getCurrPgNum()).tqarg(m_pKPresenterDoc->getPageNums())+
                                 TQString(" ") );
 }
 
@@ -4120,13 +4120,13 @@ void KPrView::updateObjectStatusBarItem()
             KPrObject * obj = m_canvas->getSelectedObj();
             KoSize size = obj->getSize();
             m_sbObjectLabel->setText( ' ' + i18n( "Statusbar info", "%1: %2, %3 - %4, %5 (width: %6, height: %7)" )
-                    .arg( /*frame->frameSet()->name()*/obj->getObjectName() )
-                    .arg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) )
-                    .arg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) )
-                    .arg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) )
-                    .arg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) )
-                    .arg( KoUnit::toUserStringValue( size.width(), unit ) )
-                    .arg( KoUnit::toUserStringValue( size.height(), unit ) ) );
+                    .tqarg( /*frame->frameSet()->name()*/obj->getObjectName() )
+                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().x(), unit ) )
+                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() , unit) )
+                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().x() + size.width(), unit ) )
+                    .tqarg( KoUnit::toUserStringValue( obj->getOrig().y() + size.height(), unit ) )
+                    .tqarg( KoUnit::toUserStringValue( size.width(), unit ) )
+                    .tqarg( KoUnit::toUserStringValue( size.height(), unit ) ) );
         }
         else
             m_sbObjectLabel->setText( i18n("1 object selected", "%n objects selected", nbSelected) );
@@ -4206,7 +4206,7 @@ void KPrView::setEditMaster( bool editMaster )
         if ( sidebar )
             sidebar->setViewMasterPage( m_editMaster );
         updateNoteBarText();
-        m_canvas->repaint( false );
+        m_canvas->tqrepaint( false );
     }
 }
 
@@ -4675,7 +4675,7 @@ void KPrView::spellCheckerMisspelling( const TQString &old, int pos )
 
     kdDebug() << "KWView::spellCheckerMisspelling parag=" << parag->paragId() << " pos=" << pos << " length=" << old.length() << endl;
 
-    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ );
+    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ );
 }
 
 void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQString &corr )
@@ -4694,7 +4694,7 @@ void KPrView::spellCheckerCorrected( const TQString &old, int pos, const TQStrin
     if ( !textdoc )
         return;
     pos += m_spell.kospell->currentStartIndex();
-    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*repaint*/ );
+    textdoc->textObject()->highlightPortion( parag, pos, old.length(), m_canvas,true/*tqrepaint*/ );
 
     KoTextCursor cursor( textdoc );
     cursor.setParag( parag );
@@ -4881,7 +4881,7 @@ void KPrView::refreshCustomMenu()
             if ( !lst.contains( varName) )
             {
                 lst.append( varName );
-                TQCString name = TQString("custom-action_%1").arg(i).latin1();
+                TQCString name = TQString("custom-action_%1").tqarg(i).latin1();
                 act = new KAction( varName, shortCuts[varName], TQT_TQOBJECT(this),
                                    TQT_SLOT( insertCustomVariable() ), actionCollection(), name );
 
@@ -4896,7 +4896,7 @@ void KPrView::refreshCustomMenu()
         actionInsertCustom->popupMenu()->insertSeparator();
 
     act = new KAction( i18n("New..."), 0, TQT_TQOBJECT(this), TQT_SLOT( insertNewCustomVariable() ), actionCollection(),
-                       TQString("custom-action_%1").arg(i).latin1() );
+                       TQString("custom-action_%1").tqarg(i).latin1() );
     act->setGroup( "custom-variable-action" );
     actionInsertCustom->insert( act );
 
@@ -5067,7 +5067,7 @@ void KPrView::slotUpdateRuler()
                 if( getHRuler()->flags()!= flags )
                 {
                     getHRuler()->changeFlags(flags);
-                    getHRuler()->repaint();
+                    getHRuler()->tqrepaint();
                 }
             }
             if( getVRuler())
@@ -5075,7 +5075,7 @@ void KPrView::slotUpdateRuler()
                 if( getVRuler()->flags() != 0 )
                 {
                     getVRuler()->changeFlags(0);
-                    getVRuler()->repaint();
+                    getVRuler()->tqrepaint();
                 }
             }
         }
@@ -5244,22 +5244,22 @@ void KPrView::changeZoomMenu( int zoom )
         qHeapSort( list );
 
         for (TQValueList<int>::Iterator it = list.begin() ; it != list.end() ; ++it)
-            lst.append( i18n("%1%").arg(*it) );
+            lst.append( i18n("%1%").tqarg(*it) );
     }
     else
     {
-        lst << i18n("%1%").arg("33");
-        lst << i18n("%1%").arg("50");
-        lst << i18n("%1%").arg("75");
-        lst << i18n("%1%").arg("100");
-        lst << i18n("%1%").arg("125");
-        lst << i18n("%1%").arg("150");
-        lst << i18n("%1%").arg("200");
-        lst << i18n("%1%").arg("250");
-        lst << i18n("%1%").arg("350");
-        lst << i18n("%1%").arg("400");
-        lst << i18n("%1%").arg("450");
-        lst << i18n("%1%").arg("500");
+        lst << i18n("%1%").tqarg("33");
+        lst << i18n("%1%").tqarg("50");
+        lst << i18n("%1%").tqarg("75");
+        lst << i18n("%1%").tqarg("100");
+        lst << i18n("%1%").tqarg("125");
+        lst << i18n("%1%").tqarg("150");
+        lst << i18n("%1%").tqarg("200");
+        lst << i18n("%1%").tqarg("250");
+        lst << i18n("%1%").tqarg("350");
+        lst << i18n("%1%").tqarg("400");
+        lst << i18n("%1%").tqarg("450");
+        lst << i18n("%1%").tqarg("500");
     }
     actionViewZoom->setItems( lst );
 }
@@ -5267,7 +5267,7 @@ void KPrView::changeZoomMenu( int zoom )
 void KPrView::showZoom( int zoom )
 {
     TQStringList list = actionViewZoom->items();
-    TQString zoomStr( i18n("%1%").arg( zoom ) );
+    TQString zoomStr( i18n("%1%").tqarg( zoom ) );
     int pos = list.findIndex(zoomStr);
     if( pos == -1)
     {
@@ -5315,7 +5315,7 @@ void KPrView::viewZoom( const TQString &s )
     }
 
     m_canvas->setFocus();
-    m_canvas->repaint();
+    m_canvas->tqrepaint();
 }
 
 void KPrView::setZoomRect( const KoRect & rect )
@@ -5331,7 +5331,7 @@ void KPrView::setZoomRect( const KoRect & rect )
     m_canvas->setToolEditMode( TEM_MOUSE );
     m_canvas->scrollTopLeftPoint( zoomHandler()->zoomPoint( rect.topLeft() ) );
     m_canvas->setUpdatesEnabled( true );
-    m_canvas->repaint();
+    m_canvas->tqrepaint();
 }
 
 void KPrView::setZoom( int zoom, bool updateViews )
@@ -5360,8 +5360,8 @@ KoTextZoomHandler *KPrView::zoomHandler() const
 void KPrView::slotViewFormattingChars()
 {
     m_pKPresenterDoc->setViewFormattingChars(actionViewFormattingChars->isChecked());
-    m_pKPresenterDoc->layout(); // Due to the different formatting when this option is activated
-    m_pKPresenterDoc->repaint(false);
+    m_pKPresenterDoc->tqlayout(); // Due to the different formatting when this option is activated
+    m_pKPresenterDoc->tqrepaint(false);
 }
 
 void KPrView::setPageDuration( int _pgNum )
@@ -5647,7 +5647,7 @@ void KPrView::viewGuideLines()
     m_pKPresenterDoc->updateGuideLineButton();
     deSelectAllObjects();
     refreshRuler( state );
-    m_pKPresenterDoc->repaint(false);
+    m_pKPresenterDoc->tqrepaint(false);
 }
 
 
@@ -5656,7 +5656,7 @@ void KPrView::viewGrid()
     m_pKPresenterDoc->setShowGrid( actionViewShowGrid->isChecked() );
     m_pKPresenterDoc->setModified( true );
     m_pKPresenterDoc->updateGridButton();
-    m_pKPresenterDoc->repaint(false);
+    m_pKPresenterDoc->tqrepaint(false);
 }
 
 
@@ -5681,7 +5681,7 @@ void KPrView::refreshRuler( bool state )
         if ( !m_pKPresenterDoc->isReadWrite())
         {
             getHRuler()->changeFlags(KoRuler::F_NORESIZE);
-            getHRuler()->repaint();
+            getHRuler()->tqrepaint();
         }
         else
         {
@@ -5690,7 +5690,7 @@ void KPrView::refreshRuler( bool state )
                 if( getHRuler()->flags() != KoRuler::F_HELPLINES )
                 {
                     getHRuler()->changeFlags(KoRuler::F_HELPLINES);
-                    getHRuler()->repaint();
+                    getHRuler()->tqrepaint();
                 }
             }
             else
@@ -5698,7 +5698,7 @@ void KPrView::refreshRuler( bool state )
                 if( getHRuler()->flags() != 0 )
                 {
                     getHRuler()->changeFlags( 0 );
-                    getHRuler()->repaint();
+                    getHRuler()->tqrepaint();
                 }
             }
         }
@@ -5709,7 +5709,7 @@ void KPrView::refreshRuler( bool state )
         if ( !m_pKPresenterDoc->isReadWrite())
         {
             getVRuler()->changeFlags(KoRuler::F_NORESIZE);
-            getVRuler()->repaint();
+            getVRuler()->tqrepaint();
         }
         else
         {
@@ -5718,7 +5718,7 @@ void KPrView::refreshRuler( bool state )
                 if( getVRuler()->flags() != KoRuler::F_HELPLINES )
                 {
                     getVRuler()->changeFlags(KoRuler::F_HELPLINES);
-                    getVRuler()->repaint();
+                    getVRuler()->tqrepaint();
                 }
             }
             else
@@ -5726,7 +5726,7 @@ void KPrView::refreshRuler( bool state )
                 if( getVRuler()->flags()!= 0)
                 {
                     getVRuler()->changeFlags(0);
-                    getVRuler()->repaint();
+                    getVRuler()->tqrepaint();
                 }
             }
         }
@@ -5889,7 +5889,7 @@ void KPrView::slotObjectEditChanged()
         KoParagCounter counter;
         if(paragLayout->counter)
             counter = *(paragLayout->counter);
-        int align = paragLayout->alignment;
+        int align = paragLayout->tqalignment;
         if ( align == TQt::AlignAuto )
             align = TQt::AlignLeft; // ## seems hard to detect RTL here
         alignChanged( align );
@@ -5964,11 +5964,11 @@ void KPrView::duplicateObj()
         m_canvas->copyObjs();
         m_canvas->setToolEditMode( TEM_MOUSE );
         deSelectAllObjects();
-        TQMimeSource *data = TQApplication::clipboard()->data();
+        TQMimeSource *data = TQApplication::tqclipboard()->data();
         TQCString clip_str = KoStoreDrag::mimeType("application/x-kpresenter");
         if ( data->provides( clip_str ) )
         {
-            m_canvas->activePage()->pasteObjs( data->encodedData(clip_str),
+            m_canvas->activePage()->pasteObjs( data->tqencodedData(clip_str),
                                                nbCopy, angle, increaseX,increaseY, moveX, moveY );
             m_canvas->setMouseSelectedObject(true);
             emit objectSelectedChanged();
@@ -6224,7 +6224,7 @@ void KPrView::updateRulerInProtectContentMode()
             getHRuler()->changeFlags(KoRuler::F_INDENTS | KoRuler::F_TABS);
         else
             getHRuler()->changeFlags(0);
-        getHRuler()->repaint();
+        getHRuler()->tqrepaint();
     }
 }
 
diff --git a/kpresenter/KPrView.h b/kpresenter/KPrView.h
index f00b7e2d..1fc3cc7e 100644
--- a/kpresenter/KPrView.h
+++ b/kpresenter/KPrView.h
@@ -1172,7 +1172,7 @@ private:
 
     CurrentLineTool m_currentLineTool;
 
-    // store the currently selected shape-tool
+    // store the currently selected tqshape-tool
     enum CurrentShapeTool {
         StRectangle = 1,
         StCircle = 2,
diff --git a/kpresenter/KPrViewIface.cpp b/kpresenter/KPrViewIface.cpp
index 49c2d887..6f8aa314 100644
--- a/kpresenter/KPrViewIface.cpp
+++ b/kpresenter/KPrViewIface.cpp
@@ -642,9 +642,9 @@ TQStringList KPrViewIface::exportPage( int _nPage,
                         //       see http://www.indeview.org for details.
                         // Note: We use the 1-based page number as fallback page title.
                         res << TQString("Name=%1")
-                                .arg( page->pageTitle( TQString("Page%1").arg(_nPage) ) );
+                                .tqarg( page->pageTitle( TQString("Page%1").tqarg(_nPage) ) );
                         res << TQString("Notes=%1")
-                                .arg( page->noteText() );
+                                .tqarg( page->noteText() );
                     }
                 }
             }
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 5641c6cd..2197cf32 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -33,7 +33,7 @@
 #include <ktempfile.h>
 
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
@@ -46,10 +46,10 @@
 #include <tqdir.h>
 #include <tqheader.h>
 #include <tqwmatrix.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqregexp.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include <tqcheckbox.h>
 
@@ -87,7 +87,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn,
     for (uint i=0; i<strIn.length(); i++)
     {
         ch=strIn[i];
-        switch (ch.unicode())
+        switch (ch.tqunicode())
         {
         case 38: // &
         {
@@ -129,7 +129,7 @@ static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn,
             {
                 if (!codec->canEncode(ch))
                 {
-                    strReturn+=TQString("&#%1;").arg(ch.unicode());
+                    strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
                     break;
                 }
             }
@@ -156,7 +156,7 @@ static TQString EscapeEncodingOnly(const TQTextCodec* codec, const TQString& str
         {
             if (!codec->canEncode(ch))
             {
-                strReturn+=TQString("&#%1;").arg(ch.unicode());
+                strReturn+=TQString("&#%1;").tqarg(ch.tqunicode());
                 continue;
             }
         }
@@ -211,7 +211,7 @@ void KPrWebPresentation::loadConfig()
     if ( num <= slideInfos.count() ) {
         for ( unsigned int i = 0; i < num; i++ )
         {
-            TQString key = TQString::fromLatin1( "SlideTitle%1" ).arg( i );
+            TQString key = TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i );
             if ( cfg.hasKey( key ) )
             {
                 // We'll assume that the selected pages haven't changed... Hmm.
@@ -245,7 +245,7 @@ void KPrWebPresentation::saveConfig()
     cfg.writeEntry( "Slides", slideInfos.count() );
 
     for ( unsigned int i = 0; i < slideInfos.count(); i++ )
-        cfg.writeEntry( TQString::fromLatin1( "SlideTitle%1" ).arg( i ), slideInfos[ i ].slideTitle );
+        cfg.writeEntry( TQString::tqfromLatin1( "SlideTitle%1" ).tqarg( i ), slideInfos[ i ].slideTitle );
 
     cfg.writeEntry( "BackColor", backColor );
     cfg.writeEntry( "TitleColor", titleColor );
@@ -310,7 +310,7 @@ void KPrWebPresentation::createSlidesPictures( KProgress *progressBar )
     for ( unsigned int i = 0; i < slideInfos.count(); i++ ) {
         int pgNum = slideInfos[i].pageNumber;
         view->getCanvas()->drawPageInPix( pix, pgNum, zoom, true /*force real variable value*/ );
-        filename = TQString( "%1/pics/slide_%2.png" ).arg( path ).arg( i + 1 );
+        filename = TQString( "%1/pics/slide_%2.png" ).tqarg( path ).tqarg( i + 1 );
 
         KTempFile tmp;
         pix.save( tmp.name(), "PNG" );
@@ -395,8 +395,8 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
 
         unsigned int pgNum = i + 1; // pgquiles # elpauer . org - I think this is a bug, seems to be an overflow if we have max_unsigned_int slides
         KTempFile tmp;
-        TQString dest= TQString( "%1/html/slide_%2.html" ).arg( path ).arg( pgNum );
-        TQString next= TQString( "slide_%2.html" ).arg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works
+        TQString dest= TQString( "%1/html/slide_%2.html" ).tqarg( path ).tqarg( pgNum );
+        TQString next= TQString( "slide_%2.html" ).tqarg( pgNum<slideInfos.count() ? pgNum+1 : (m_bLoopSlides ? 1 : pgNum ) ); // Ugly, but it works
 
         TQFile file( tmp.name() );
         file.open( IO_WriteOnly );
@@ -480,7 +480,7 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
             streamOut << "<a href=\"" << next << "\">";
 
 	    streamOut << "<img src=\"../pics/slide_" << pgNum << ".png\" border=\"0\" alt=\""
-                      << i18n( "Slide %1" ).arg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">";
+                      << i18n( "Slide %1" ).tqarg( pgNum ) << "\"" << ( isXML() ?" /":"") << ">";
 
 	    if ( i < slideInfos.count() - 1 )
                 streamOut << "</a>";
@@ -509,9 +509,9 @@ void KPrWebPresentation::createSlidesHTML( KProgress *progressBar )
             if (email.isEmpty())
                 htmlAuthor=escapeHtmlText( codec, author );
             else
-                htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
+                htmlAuthor=TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author ));
             streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
-                                          .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
+                                          .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) );
 
             streamOut << "    </center><hr noshade=\"noshade\"" << ( isXML() ?" /":"") << ">\n";
         }
@@ -532,7 +532,7 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
 {
     TQTextCodec *codec = KGlobal::charsets()->codecForName( m_encoding );
     KTempFile tmp;
-    TQString dest = TQString( "%1/index.html" ).arg( path );
+    TQString dest = TQString( "%1/index.html" ).tqarg( path );
     TQFile file( tmp.name() );
     file.open( IO_WriteOnly );
     TQTextStream streamOut( &file );
@@ -560,9 +560,9 @@ void KPrWebPresentation::createMainPage( KProgress *progressBar )
 
     // footer: author name, e-mail
     TQString htmlAuthor = email.isEmpty() ? escapeHtmlText( codec, author ) :
-                         TQString("<a href=\"mailto:%1\">%2</a>").arg( escapeHtmlText( codec, email )).arg( escapeHtmlText( codec, author ));
+                         TQString("<a href=\"mailto:%1\">%2</a>").tqarg( escapeHtmlText( codec, email )).tqarg( escapeHtmlText( codec, author ));
     streamOut << EscapeEncodingOnly ( codec, i18n( "Created on %1 by <i>%2</i> with <a href=\"http://www.koffice.org/kpresenter\">KPresenter</a>" )
-                                      .arg( KGlobal::locale()->formatDate ( TQDate::currentDate() ) ).arg( htmlAuthor ) );
+                                      .tqarg( KGlobal::locale()->formatDate ( TQDate::tqcurrentDate() ) ).tqarg( htmlAuthor ) );
 
     streamOut << "</body>\n</html>\n";
     file.close();
@@ -664,63 +664,63 @@ void KPrWebPresentationWizard::setupPage1()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page1 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 7, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 7, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignTop| TQt::AlignLeft );
     helptext->setText( i18n( "Enter your name, email address and "
                              "the title of the web presentation. "
                              "Also enter the output directory where the "
                              "web presentation should be saved. " ) );
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Author:"), canvas );
-    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label1, i18n("This is where you enter the name of the person or "
                                   "organization that should be named as the author of "
                                   "the presentation.") );
-    layout->addWidget( label1, 2, 0 );
+    tqlayout->addWidget( label1, 2, 0 );
 
     TQLabel *label2 = new TQLabel( i18n("Title:"), canvas );
-    label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label2, i18n("This is where you enter the title of the overall "
                                   "presentation." ) );
-    layout->addWidget( label2, 3, 0 );
+    tqlayout->addWidget( label2, 3, 0 );
 
     TQLabel *label3 = new TQLabel( i18n("Email address:"), canvas );
-    label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label3, i18n("This is where you enter the email address of the "
                                   "person or organization that is responsible for "
                                   "the presentation.") );
-    layout->addWidget( label3, 4, 0 );
+    tqlayout->addWidget( label3, 4, 0 );
 
     TQLabel *label4 = new TQLabel( i18n("Path:"), canvas );
-    label4->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label4->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label4, i18n("The value entered for the path is the directory "
                                   "where the presentation will be saved. If it does "
                                   "not exist, you'll be asked if you want to create "
                                   "the directory or abort the creation.") );
-    layout->addWidget( label4, 5, 0 );
+    tqlayout->addWidget( label4, 5, 0 );
 
     author = new KLineEdit( webPres.getAuthor(), canvas );
     TQWhatsThis::add( author, i18n("This is where you enter the name of the person or "
                                   "organization that should be named as the author of "
                                   "the presentation.") );
-    layout->addWidget( author, 2, 1 );
+    tqlayout->addWidget( author, 2, 1 );
 
     title = new KLineEdit( webPres.getTitle(), canvas );
     TQWhatsThis::add( title, i18n("This is where you enter the title of the overall "
                                  "presentation." ) );
-    layout->addWidget( title, 3, 1 );
+    tqlayout->addWidget( title, 3, 1 );
 
     email = new KLineEdit( webPres.getEmail(), canvas );
     TQWhatsThis::add( email, i18n("This is where you enter the email address of the "
                                  "person or organization that is responsible for "
                                  "the presentation.") );
-    layout->addWidget( email, 4, 1 );
+    tqlayout->addWidget( email, 4, 1 );
 
     path=new KURLRequester( canvas );
     path->setMode( KFile::Directory);
@@ -729,11 +729,11 @@ void KPrWebPresentationWizard::setupPage1()
                                 "where the presentation will be saved. If it does "
                                 "not exist, you'll be asked if you want to create "
                                 "the directory or abort the creation.") );
-    layout->addWidget( path, 5, 1 );
+    tqlayout->addWidget( path, 5, 1 );
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addMultiCell( spacer, 6, 6, 0, 1 );
+    tqlayout->addMultiCell( spacer, 6, 6, 0, 1 );
 
     connect(path, TQT_SIGNAL(textChanged(const TQString&)),
             this,TQT_SLOT(slotChoosePath(const TQString&)));
@@ -762,43 +762,43 @@ void KPrWebPresentationWizard::setupPage2()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page2 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 6, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     TQString help = i18n("Here you can configure the style of the web pages.");
     help += i18n( "You can also specify the zoom for the slides." );
     helptext->setText(help);
 
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Zoom:"), canvas );
-    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label1, i18n( "This selection allows you to specify "
                                    "the size of the slide image." ) );
-    layout->addWidget( label1, 2, 0 );
+    tqlayout->addWidget( label1, 2, 0 );
 
     TQLabel *label2 = new TQLabel( i18n( "Encoding:" ), canvas );
-    label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
 
-    layout->addWidget( label2, 3, 0 );
+    tqlayout->addWidget( label2, 3, 0 );
 
     TQLabel *label3 = new TQLabel( i18n( "Document type:" ), canvas );
-    label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label3, 4, 0 );
+    label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label3, 4, 0 );
 
     zoom = new KIntNumInput( webPres.getZoom(), canvas );
     TQWhatsThis::add( zoom, i18n( "This selection allows you to specify "
                                  "the size of the slide image." ) );
-    layout->addWidget( zoom, 2, 1 );
+    tqlayout->addWidget( zoom, 2, 1 );
     zoom->setSuffix( " %" );
     zoom->setRange( 25, 1000, 5 );
 
     encoding = new KComboBox( false, canvas );
-    layout->addWidget( encoding, 3, 1 );
+    tqlayout->addWidget( encoding, 3, 1 );
 
     // Fill encoding combo
     // Stolen from tdelibs/kate/part/katedialogs.cpp
@@ -819,7 +819,7 @@ void KPrWebPresentationWizard::setupPage2()
     }
 
     doctype = new KComboBox( false, canvas );
-    layout->addWidget( doctype, 4, 1 );
+    tqlayout->addWidget( doctype, 4, 1 );
     doctype->insertItem( "HTML 4.01", -1 );
     doctype->insertItem( "XHTML 1.0", -1 );
 
@@ -827,7 +827,7 @@ void KPrWebPresentationWizard::setupPage2()
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addMultiCell( spacer, 5, 5, 0, 1 );
+    tqlayout->addMultiCell( spacer, 5, 5, 0, 1 );
 
     addPage( page2, i18n( "Step 2: Configure HTML" ) );
 
@@ -852,40 +852,40 @@ void KPrWebPresentationWizard::setupPage3()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page3 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 6, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     helptext->setText( i18n( "Now you can customize the colors of the web pages." ) );
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Text color:"), canvas );
-    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label1, 2, 0 );
+    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label1, 2, 0 );
 
     TQLabel *label2 = new TQLabel( i18n("Title color:"), canvas );
-    label2->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label2, 3, 0 );
+    label2->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label2, 3, 0 );
 
     TQLabel *label3 = new TQLabel( i18n("Background color:"), canvas );
-    label3->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label3, 4, 0 );
+    label3->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label3, 4, 0 );
 
     textColor = new KColorButton( webPres.getTextColor(), canvas );
-    layout->addWidget( textColor, 2, 1 );
+    tqlayout->addWidget( textColor, 2, 1 );
 
     titleColor = new KColorButton( webPres.getTitleColor(), canvas );
-    layout->addWidget( titleColor, 3, 1 );
+    tqlayout->addWidget( titleColor, 3, 1 );
 
     backColor = new KColorButton( webPres.getBackColor(), canvas );
-    layout->addWidget( backColor, 4, 1 );
+    tqlayout->addWidget( backColor, 4, 1 );
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addMultiCell( spacer, 5, 5, 0, 1 );
+    tqlayout->addMultiCell( spacer, 5, 5, 0, 1 );
 
     addPage( page3, i18n( "Step 3: Customize Colors" ) );
 
@@ -909,11 +909,11 @@ void KPrWebPresentationWizard::setupPage4()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page4 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 3, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 3, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     helptext->setText( i18n( "Here you can specify titles for "
                              "each slide. Click on a slide in "
                              "the list and then enter the title "
@@ -921,19 +921,19 @@ void KPrWebPresentationWizard::setupPage4()
                              "click on a title, KPresenter "
                              "mainview will display the slide.") );
 
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
     TQLabel *label = new TQLabel( i18n( "Slide title:" ), canvas );
-    label->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
-    layout->addWidget( label, 1, 0 );
+    label->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    tqlayout->addWidget( label, 1, 0 );
 
     slideTitle = new KLineEdit( canvas );
-    layout->addWidget( slideTitle, 1, 1 );
+    tqlayout->addWidget( slideTitle, 1, 1 );
     connect( slideTitle, TQT_SIGNAL( textChanged( const TQString & ) ), this,
              TQT_SLOT( slideTitleChanged( const TQString & ) ) );
 
     slideTitles = new KListView( canvas );
-    layout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 );
+    tqlayout->addMultiCellWidget( slideTitles, 2, 2, 0, 1 );
     slideTitles->addColumn( i18n( "No." ) );
     slideTitles->addColumn( i18n( "Slide Title" ) );
     connect( slideTitles, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), this,
@@ -977,60 +977,60 @@ void KPrWebPresentationWizard::setupPage5()
     sidebar->setPixmap(locate("data", "kpresenter/pics/webslideshow-sidebar.png"));
 
     TQWidget* canvas = new TQWidget( page5 );
-    TQGridLayout *layout = new TQGridLayout( canvas, 6, 2,
+    TQGridLayout *tqlayout = new TQGridLayout( canvas, 6, 2,
                                            KDialog::marginHint(), KDialog::spacingHint() );
 
     TQLabel *helptext = new TQLabel( canvas );
-    helptext->setAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
+    helptext->tqsetAlignment( TQt::WordBreak | TQt::AlignVCenter| TQt::AlignLeft );
     TQString help = i18n("Here you can configure some options for unattended "
                         "presentations, such as time elapsed before automatically advance to "
                         "the next slide, looping and the presence of headers.");
     helptext->setText(help);
 
-    layout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
+    tqlayout->addMultiCellWidget( helptext, 0, 0, 0, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 50 ), 1, 1, 0, 1 );
 
     TQLabel *label1 = new TQLabel( i18n("Advance after:"), canvas );
-    label1->setAlignment( TQt::AlignVCenter | TQt::AlignRight );
+    label1->tqsetAlignment( TQt::AlignVCenter | TQt::AlignRight );
     TQWhatsThis::add( label1, i18n( "This selection allows you to specify "
                                    "the time between slides." ) );
-    layout->addWidget( label1, 2, 0 );
+    tqlayout->addWidget( label1, 2, 0 );
 
     timeBetweenSlides = new KIntNumInput( webPres.getTimeBetweenSlides(), canvas );
     timeBetweenSlides->setSpecialValueText(i18n( "Disabled" ));
     TQWhatsThis::add( timeBetweenSlides, i18n( "This selection allows you to specify "
                                  "the time between slides." ) );
-    layout->addWidget( timeBetweenSlides, 2, 1 );
+    tqlayout->addWidget( timeBetweenSlides, 2, 1 );
     timeBetweenSlides->setSuffix( " seconds" );
     timeBetweenSlides->setRange( 0, 900, 1 );
 
-    layout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 );
+    tqlayout->addMultiCell( new TQSpacerItem( 1, 10 ), 1, 1, 0, 1 );
 
     writeHeader=new TQCheckBox( i18n("Write header to the slides"), canvas);
     TQWhatsThis::add( writeHeader, i18n( "This checkbox allows you to specify if you "
                                        "want to write the navigation buttons on top "
                                        "of the slide." ) );
     writeHeader->setChecked( webPres.wantHeader() );
-    layout->addWidget( writeHeader, 3, 1);
+    tqlayout->addWidget( writeHeader, 3, 1);
 
     writeFooter=new TQCheckBox( i18n("Write footer to the slides"), canvas);
     TQWhatsThis::add( writeFooter, i18n( "This checkbox allows you to specify if you "
                                        "want to write an imprint consisting on the author "
                                        "and the software used to create these slides." ) );
     writeFooter->setChecked( webPres.wantFooter() );
-    layout->addWidget( writeFooter, 4, 1);
+    tqlayout->addWidget( writeFooter, 4, 1);
 
     loopSlides=new TQCheckBox( i18n("Loop presentation"), canvas);
     TQWhatsThis::add( loopSlides, i18n( "This checkbox allows you to specify if you "
                                        "want the presentation to start again once "
                                        "the latest slide is reached." ) );
     loopSlides->setChecked( webPres.wantLoopSlides() );
-    layout->addWidget( loopSlides, 5, 1);
+    tqlayout->addWidget( loopSlides, 5, 1);
 
     TQSpacerItem* spacer = new TQSpacerItem( 1, 10,
                                            TQSizePolicy::Minimum, TQSizePolicy::Expanding );
-    layout->addMultiCell( spacer, 5, 5, 0, 1 );
+    tqlayout->addMultiCell( spacer, 5, 5, 0, 1 );
 
     addPage( page5, i18n( "Step 5: Options for Unattended Presentations" ) );
 
@@ -1081,7 +1081,7 @@ void KPrWebPresentationWizard::pageChanged()
         {
             TQString msg = i18n( "<qt>The directory <b>%1</b> does not exist.<br>"
                                 "Do you want create it?</qt>" );
-            if( KMessageBox::questionYesNo( this, msg.arg( pathname ),
+            if( KMessageBox::questionYesNo( this, msg.tqarg( pathname ),
                                             i18n( "Directory Not Found" ) )
                 == KMessageBox::Yes)
             {
diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index d33675ab..ccbfc0e8 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -22,7 +22,7 @@
 
 #include <tqlabel.h>
 #include <tqvbox.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqdir.h>
 #include <tqwhatsthis.h>
 
@@ -86,7 +86,7 @@ void AFChoose::setupTabs()
         for (grpPtr=groupList.first();grpPtr != 0;grpPtr=groupList.next())
         {
             grpPtr->tab = new TQVBox(this);
-            TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined shape by clicking on it then clicking the OK button (or just double-click on the shape). You can then insert the shape onto your slide by drawing the area with the mouse pointer." ) );
+            TQWhatsThis::add(grpPtr->tab, i18n( "Choose a predefined tqshape by clicking on it then clicking the OK button (or just double-click on the tqshape). You can then insert the tqshape onto your slide by drawing the area with the mouse pointer." ) );
             grpPtr->loadWid = new KIconCanvas(grpPtr->tab);
             // Changes for the new KIconCanvas (Werner)
             TQDir d( grpPtr->dir.absFilePath() );
@@ -137,7 +137,7 @@ void AFChoose::setupTabs()
                         continue; // Invalid .desktop file
                 }
             }
-            grpPtr->loadWid->setBackgroundColor(colorGroup().base());
+            grpPtr->loadWid->setBackgroundColor(tqcolorGroup().base());
             grpPtr->loadWid->setResizeMode(TQIconView::Adjust);
             grpPtr->loadWid->sort();
             connect(grpPtr->loadWid,TQT_SIGNAL(nameChanged(TQString)),
@@ -148,7 +148,7 @@ void AFChoose::setupTabs()
                     TQT_SLOT(slotDoubleClick()));
             grpPtr->label = new TQLabel(grpPtr->tab);
             grpPtr->label->setText(" ");
-            grpPtr->label->setMaximumHeight(grpPtr->label->sizeHint().height());
+            grpPtr->label->setMaximumHeight(grpPtr->label->tqsizeHint().height());
             addTab(grpPtr->tab,grpPtr->name);
         }
     }
diff --git a/kpresenter/autoformEdit/ATFInterpreter.cpp b/kpresenter/autoformEdit/ATFInterpreter.cpp
index 0f01368a..5f010518 100644
--- a/kpresenter/autoformEdit/ATFInterpreter.cpp
+++ b/kpresenter/autoformEdit/ATFInterpreter.cpp
@@ -199,7 +199,7 @@ TQPointArray ATFInterpreter::getPointArray(int wid,int heig)
                     if (i == 14) py = tmp;
                 }
             }
-            pntArray.setPoint(coordList.at(),px,py);
+            pntArray.setPoint(coordList.tqat(),px,py);
         }
     }
     return pntArray;
@@ -239,7 +239,7 @@ void ATFInterpreter::interpret()
 
     for (TQStringList::Iterator it=lines.begin(); it!=lines.end(); ++it)
     {
-        if (!(*it).isEmpty() && (*it).at(0) != COMMENT)
+        if (!(*it).isEmpty() && (*it).tqat(0) != COMMENT)
         {
             if (level.top() == LEVEL_NULL)
             {
@@ -265,7 +265,7 @@ void ATFInterpreter::interpret()
             }
             else if (level.top() == LEVEL_X || level.top() == LEVEL_Y || level.top() == LEVEL_ATTR)
             {
-                switch (((*it).at(0)).latin1())
+                switch (((*it).tqat(0)).latin1())
                 {
                 case VAR_1:
                 {
@@ -310,7 +310,7 @@ void ATFInterpreter::interpret()
                 } break;
                 case VAR_PW:
                 {
-                    pw = 1; pw = ((*it).at(4)).latin1() - 48;
+                    pw = 1; pw = ((*it).tqat(4)).latin1() - 48;
                     attrib.pwDiv = (*it);
                 } break;
                 case '}':
@@ -363,10 +363,10 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s)
 
     for (unsigned int i=1; i<s.length(); ++i)
     {
-        if(s.at(i)==' ')
+        if(s.tqat(i)==' ')
             continue;
         signPtr = new Sign;
-        switch (s.at(i).latin1())
+        switch (s.tqat(i).latin1())
         {
         case VAR_W: signPtr->type = ST_WIDTH; break;
         case VAR_H: signPtr->type = ST_HEIGHT; break;
@@ -431,20 +431,20 @@ TQPtrList<ATFInterpreter::Sign> ATFInterpreter::getVar(const TQString &s)
             signPtr->type = ST_NUMBER;
             if (s.length() - 1 > i)
             {
-                switch (s.at(i+1).latin1())
+                switch (s.tqat(i+1).latin1())
                 {
                 case NUM_0: case NUM_1: case NUM_2: case NUM_3: case NUM_4:
                 case NUM_5: case NUM_6: case NUM_7: case NUM_8: case NUM_9:
                 {
-                    signPtr->num = (s.at(i).latin1() - 48) * 10 + s.at(i+1).latin1() - 48;
+                    signPtr->num = (s.tqat(i).latin1() - 48) * 10 + s.tqat(i+1).latin1() - 48;
                     i++;
                 } break;
                 default:
-                    signPtr->num = s.at(i).latin1() - 48; break;
+                    signPtr->num = s.tqat(i).latin1() - 48; break;
                 }
             }
             else
-                signPtr->num = s.at(i).latin1() - 48;
+                signPtr->num = s.tqat(i).latin1() - 48;
         } break;
         }
         list.append(signPtr);
diff --git a/kpresenter/generalpropertyui.ui b/kpresenter/generalpropertyui.ui
index 0dad8b48..eec430f1 100644
--- a/kpresenter/generalpropertyui.ui
+++ b/kpresenter/generalpropertyui.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -157,7 +157,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>
diff --git a/kpresenter/gradientpropertyui.ui b/kpresenter/gradientpropertyui.ui
index b0ccae0a..bc7f0707 100644
--- a/kpresenter/gradientpropertyui.ui
+++ b/kpresenter/gradientpropertyui.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -77,7 +77,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout17</cstring>
+                <cstring>tqlayout17</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/kpresenter/imageEffectBase.ui b/kpresenter/imageEffectBase.ui
index ec1f9959..430bfac8 100644
--- a/kpresenter/imageEffectBase.ui
+++ b/kpresenter/imageEffectBase.ui
@@ -48,7 +48,7 @@
                             <verstretch>1</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>300</width>
                             <height>200</height>
@@ -60,7 +60,7 @@
                     <property name="scaledContents">
                         <bool>true</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -336,7 +336,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>130</height>
@@ -409,7 +409,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>130</height>
@@ -471,7 +471,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>81</height>
@@ -523,7 +523,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>71</height>
@@ -572,7 +572,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>111</height>
@@ -621,7 +621,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>71</height>
@@ -648,7 +648,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -672,7 +672,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -718,7 +718,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>111</height>
@@ -767,7 +767,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>121</height>
@@ -794,7 +794,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -818,7 +818,7 @@
                                 <property name="text">
                                     <string>This effect has no options.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
@@ -867,7 +867,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>101</height>
@@ -946,7 +946,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>101</height>
@@ -998,7 +998,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>101</height>
@@ -1050,7 +1050,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>181</height>
@@ -1102,7 +1102,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>181</height>
@@ -1148,7 +1148,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>71</height>
@@ -1200,7 +1200,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>181</height>
@@ -1246,7 +1246,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>183</height>
@@ -1325,7 +1325,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>41</height>
@@ -1374,7 +1374,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>81</height>
@@ -1436,7 +1436,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>91</height>
diff --git a/kpresenter/insertpagedia.ui b/kpresenter/insertpagedia.ui
index aecf704d..9d7372cf 100644
--- a/kpresenter/insertpagedia.ui
+++ b/kpresenter/insertpagedia.ui
@@ -137,7 +137,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kpresenter/kprconverter.pl b/kpresenter/kprconverter.pl
index 524b3d8d..60aa3fb3 100644
--- a/kpresenter/kprconverter.pl
+++ b/kpresenter/kprconverter.pl
@@ -43,9 +43,9 @@ while (<INPUT>)
       # In the old format we had horzAlign="[0|1|2]" 0=left, 1=center, 2=right
       # In the new one it's align="..." and uses the Qt::AlignmentFlags enums.
       # Qt::AlignLeft=1, AlignRight=2, AlignHCenter=4
-      $alignment=$1 if(/horzAlign=(\"[0-2]+\")/);
-      $alignment =~ tr/01/14/;
-      s/horzAlign=\"[0-2]+\"/align=$alignment/;
+      $tqalignment=$1 if(/horzAlign=(\"[0-2]+\")/);
+      $tqalignment =~ tr/01/14/;
+      s/horzAlign=\"[0-2]+\"/align=$tqalignment/;
       s/>$/ type=$objType>/;
     }
   elsif (/<\/PARAGRAPH>/)
diff --git a/kpresenter/marginui.ui b/kpresenter/marginui.ui
index 8e638381..b4e1bd1e 100644
--- a/kpresenter/marginui.ui
+++ b/kpresenter/marginui.ui
@@ -43,7 +43,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -59,7 +59,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
diff --git a/kpresenter/penstyle.ui b/kpresenter/penstyle.ui
index 56241f6f..bcbcca09 100644
--- a/kpresenter/penstyle.ui
+++ b/kpresenter/penstyle.ui
@@ -82,7 +82,7 @@
             <property name="name">
                 <cstring>pbPreview</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>80</width>
                     <height>40</height>
diff --git a/kpresenter/picturepropertyui.ui b/kpresenter/picturepropertyui.ui
index b1df2a2f..6812256c 100644
--- a/kpresenter/picturepropertyui.ui
+++ b/kpresenter/picturepropertyui.ui
@@ -131,7 +131,7 @@
             <property name="name">
                 <cstring>picturePreview</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>200</height>
diff --git a/kpresenter/piepropertyui.ui b/kpresenter/piepropertyui.ui
index 39c77f24..854e3168 100644
--- a/kpresenter/piepropertyui.ui
+++ b/kpresenter/piepropertyui.ui
@@ -56,7 +56,7 @@
             <property name="name">
                 <cstring>piePreview</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>200</height>
diff --git a/kpresenter/polygonpropertyui.ui b/kpresenter/polygonpropertyui.ui
index 813215db..2b1b87dd 100644
--- a/kpresenter/polygonpropertyui.ui
+++ b/kpresenter/polygonpropertyui.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -42,7 +42,7 @@
                     <property name="name">
                         <cstring>polygonPreview</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>200</height>
diff --git a/kpresenter/rectpropertyui.ui b/kpresenter/rectpropertyui.ui
index 98bedfd5..ce16ef61 100644
--- a/kpresenter/rectpropertyui.ui
+++ b/kpresenter/rectpropertyui.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -111,13 +111,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>16</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>16</width>
                             <height>32767</height>
@@ -142,7 +142,7 @@
             <property name="name">
                 <cstring>rectPreview</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>100</height>
diff --git a/kpresenter/rotationpropertyui.ui b/kpresenter/rotationpropertyui.ui
index 3f604490..ea998478 100644
--- a/kpresenter/rotationpropertyui.ui
+++ b/kpresenter/rotationpropertyui.ui
@@ -50,7 +50,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -100,7 +100,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>31</width>
                             <height>20</height>
@@ -113,7 +113,7 @@
             <property name="name">
                 <cstring>previewPanel</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>160</width>
                     <height>160</height>
@@ -136,7 +136,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kpresenter/shadowdialog.ui b/kpresenter/shadowdialog.ui
index 9434c919..44fc0e02 100644
--- a/kpresenter/shadowdialog.ui
+++ b/kpresenter/shadowdialog.ui
@@ -336,7 +336,7 @@
                     <property name="name">
                         <cstring>previewPanel</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>160</width>
                             <height>160</height>
@@ -389,7 +389,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/kpresenter/slidetransitionwidget.ui b/kpresenter/slidetransitionwidget.ui
index b9774639..2314d8b9 100644
--- a/kpresenter/slidetransitionwidget.ui
+++ b/kpresenter/slidetransitionwidget.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>layout39</cstring>
+                <cstring>tqlayout39</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -42,7 +42,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>240</width>
                             <height>180</height>
@@ -67,7 +67,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -75,7 +75,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -147,7 +147,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -276,7 +276,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>29</height>