Rename obsolete tq methods to standard names

22 files changed, 190 insertions, 190 deletions

diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index 2b1a2cbe..8e129f98 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -271,14 +271,14 @@ void KoHelpView::paintEvent( TQPaintEvent* )
 KoHelpWidget::KoHelpWidget( TQString help, TQWidget* parent )
 		: TQWidget( parent )
 {
-	TQGridLayout* tqlayout = new TQGridLayout( this, 3, 3 );
-	tqlayout->setMargin( 2 );
-	tqlayout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter );
-	tqlayout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 );
-	tqlayout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter );
-	tqlayout->addColSpacing( 0, 5 );
-	tqlayout->addColSpacing( 2, 5 );
-	tqlayout->setColStretch( 1, 1 );
+	TQGridLayout* layout = new TQGridLayout( this, 3, 3 );
+	layout->setMargin( 2 );
+	layout->addWidget( m_upButton = new KoHelpNavButton( KoHelpNavButton::Up, this ), 0, 1, AlignHCenter );
+	layout->addWidget( m_helpViewport = new TQWidget( this ), 1, 1 );
+	layout->addWidget( m_downButton = new KoHelpNavButton( KoHelpNavButton::Down, this ), 2, 1, AlignHCenter );
+	layout->addColSpacing( 0, 5 );
+	layout->addColSpacing( 2, 5 );
+	layout->setColStretch( 1, 1 );
 
 	m_helpView = new KoHelpView( m_helpViewport );
 	m_helpViewport->setBackgroundMode( PaletteLight );
@@ -370,20 +370,20 @@ void KoHelpWidget::stopScrolling()
 KoContextHelpPopup::KoContextHelpPopup( TQWidget* parent )
 		: TQWidget( parent, "", WType_Dialog | WStyle_Customize | WStyle_NoBorder )
 {
-	TQGridLayout* tqlayout = new TQGridLayout( this );
+	TQGridLayout* layout = new TQGridLayout( this );
 	TQHBoxLayout* buttonLayout;
-	tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
-	tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
-	buttonLayout = new TQHBoxLayout( tqlayout );
-	//tqlayout->addLayout( buttonLayout, 2, 0 );
-	tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 );
+	layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
+	layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
+	buttonLayout = new TQHBoxLayout( layout );
+	//layout->addLayout( buttonLayout, 2, 0 );
+	layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 2, 1, 1 );
 	buttonLayout->add( m_close = new KoTinyButton( KoTinyButton::Close, this ) );
 	buttonLayout->add( m_sticky = new KoTinyButton( KoTinyButton::Sticky, this ) );
-	tqlayout->addColSpacing( 2, 2 );
-	tqlayout->addRowSpacing( 3, 2 );
-	tqlayout->setMargin( 3 );
-	tqlayout->setSpacing( 1 );
-	tqlayout->setRowStretch( 1, 1 );
+	layout->addColSpacing( 2, 2 );
+	layout->addRowSpacing( 3, 2 );
+	layout->setMargin( 3 );
+	layout->setSpacing( 1 );
+	layout->setRowStretch( 1, 1 );
 	buttonLayout->setSpacing( 1 );
 	setMinimumSize( 180, 180 );
 
@@ -537,13 +537,13 @@ KoContextHelpWidget::KoContextHelpWidget( TQWidget* parent, const char* name )
 		: TQWidget( parent, name )
 {
 	setCaption( i18n( "Context Help" ) );
-	TQGridLayout* tqlayout = new TQGridLayout( this );
-	tqlayout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
-	tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
-	tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 );
-	tqlayout->setMargin( 2 );
-	tqlayout->setSpacing( 1 );
-	tqlayout->setRowStretch( 1, 1 );
+	TQGridLayout* layout = new TQGridLayout( this );
+	layout->addWidget( m_helpIcon = new TQLabel( this ), 0, 0 );
+	layout->addWidget( m_helpTitle = new KoVerticalLabel( this ), 1, 0 );
+	layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", this ), 0, 1, 1, 1 );
+	layout->setMargin( 2 );
+	layout->setSpacing( 1 );
+	layout->setRowStretch( 1, 1 );
 	this->setMinimumSize( 180, 120 );
 	this->show();
 	setContextHelp( i18n( "Context Help" ), i18n( "Here will be shown help according to your actions" ), 0 );
@@ -567,13 +567,13 @@ KoContextHelpDocker::KoContextHelpDocker( TQWidget* parent, const char* name )
 {
 	setCaption( i18n( "Context Help" ) );
 	TQWidget* mainWidget = new TQWidget( this );
-	TQGridLayout* tqlayout = new TQGridLayout( mainWidget );
-	tqlayout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 );
-	tqlayout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 );
-	tqlayout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 );
-	tqlayout->setMargin( 2 );
-	tqlayout->setSpacing( 1 );
-	tqlayout->setRowStretch( 1, 1 );
+	TQGridLayout* layout = new TQGridLayout( mainWidget );
+	layout->addWidget( m_helpIcon = new TQLabel( mainWidget ), 0, 0 );
+	layout->addWidget( m_helpTitle = new KoVerticalLabel( mainWidget ), 1, 0 );
+	layout->addMultiCellWidget( m_helpViewer = new KoHelpWidget( "", mainWidget ), 0, 1, 1, 1 );
+	layout->setMargin( 2 );
+	layout->setSpacing( 1 );
+	layout->setRowStretch( 1, 1 );
 	mainWidget->setMinimumSize( 180, 120 );
 	mainWidget->show();
 	setWidget( mainWidget );
diff --git a/lib/kofficeui/KoGeneralPropertyUi.ui b/lib/kofficeui/KoGeneralPropertyUi.ui
index 5d3d6e4f..399bc900 100644
--- a/lib/kofficeui/KoGeneralPropertyUi.ui
+++ b/lib/kofficeui/KoGeneralPropertyUi.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout13</cstring>
+                <cstring>layout13</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp
index a889b3d8..00664410 100644
--- a/lib/kofficeui/KoGuideLineDia.cpp
+++ b/lib/kofficeui/KoGuideLineDia.cpp
@@ -60,7 +60,7 @@ KoGuideLineDia::KoGuideLineDia( TQWidget *parent, KoPoint &pos, KoRect &rect,
 
     TQButtonGroup *group = new TQButtonGroup( 1, Qt::Horizontal, i18n( "Orientation" ), vbox );
     group->setRadioButtonExclusive( true );
-    //group->tqlayout();
+    //group->layout();
     m_hButton = new TQRadioButton( i18n( "Horizontal" ), group );
     m_vButton = new TQRadioButton( i18n( "Vertical" ), group );
 
diff --git a/lib/kofficeui/KoPageLayoutColumns.cpp b/lib/kofficeui/KoPageLayoutColumns.cpp
index 8ea3b0b9..2d1e6b77 100644
--- a/lib/kofficeui/KoPageLayoutColumns.cpp
+++ b/lib/kofficeui/KoPageLayoutColumns.cpp
@@ -25,18 +25,18 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout)
+KoPageLayoutColumns::KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout)
     : KoPageLayoutColumnsBase(parent) {
     m_columns = columns;
     TQHBoxLayout *lay = new TQHBoxLayout(previewPane);
-    m_preview = new KoPagePreview( previewPane, "Preview", tqlayout );
+    m_preview = new KoPagePreview( previewPane, "Preview", layout );
     lay->addWidget(m_preview);
     lay = new TQHBoxLayout(columnSpacingPane);
     m_spacing = new KoUnitDoubleSpinBox( columnSpacingPane );
     m_spacing->setValue(  m_columns.ptColumnSpacing );
     m_spacing->setUnit( unit );
     double dStep = KoUnit::fromUserValue( 0.2, unit );
-    m_spacing->setMinMaxStep( 0, tqlayout.ptWidth/2, dStep );
+    m_spacing->setMinMaxStep( 0, layout.ptWidth/2, dStep );
     lay->addWidget(m_spacing);
     labelSpacing->setBuddy( m_spacing );
     nColumns->setValue( m_columns.columns );
@@ -63,8 +63,8 @@ void KoPageLayoutColumns::nSpaceChanged( double spacing ) {
     emit propertyChange(m_columns);
 }
 
-void KoPageLayoutColumns::setLayout(KoPageLayout &tqlayout) {
-    m_preview->setPageLayout( tqlayout );
+void KoPageLayoutColumns::setLayout(KoPageLayout &layout) {
+    m_preview->setPageLayout( layout );
 }
 
 #include <KoPageLayoutColumns.moc>
diff --git a/lib/kofficeui/KoPageLayoutColumns.h b/lib/kofficeui/KoPageLayoutColumns.h
index 8ebac1b2..b9dcd6c2 100644
--- a/lib/kofficeui/KoPageLayoutColumns.h
+++ b/lib/kofficeui/KoPageLayoutColumns.h
@@ -43,15 +43,15 @@ public:
      * @param parent the parent widget
      * @param columns the KoColumns data structure that this dialog should be initialzed with
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
-     * @param tqlayout the page tqlayout that the preview should be initialzed with.
+     * @param layout the page layout that the preview should be initialzed with.
      */
-    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& tqlayout);
+    KoPageLayoutColumns(TQWidget *parent, const KoColumns& columns, KoUnit::Unit unit, const KoPageLayout& layout);
 
     /**
-     * Update the page preview widget with the param tqlayout.
-     * @param tqlayout the new tqlayout
+     * Update the page preview widget with the param layout.
+     * @param layout the new layout
      */
-    void setLayout(KoPageLayout &tqlayout);
+    void setLayout(KoPageLayout &layout);
 public slots:
 
     /**
diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp
index 5cffc108..3150ab51 100644
--- a/lib/kofficeui/KoPageLayoutDia.cpp
+++ b/lib/kofficeui/KoPageLayoutDia.cpp
@@ -49,10 +49,10 @@
 /******************************************************************/
 
 /*===================== constrcutor ==============================*/
-KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& tqlayout )
+KoPagePreview::KoPagePreview( TQWidget* parent, const char *name, const KoPageLayout& layout )
     : TQGroupBox( i18n( "Page Preview" ), parent, name )
 {
-    setPageLayout( tqlayout );
+    setPageLayout( layout );
     columns = 1;
     setMinimumSize( 150, 150 );
 }
@@ -62,15 +62,15 @@ KoPagePreview::~KoPagePreview()
 {
 }
 
-/*=================== set tqlayout =================================*/
-void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
+/*=================== set layout =================================*/
+void KoPagePreview::setPageLayout( const KoPageLayout &layout )
 {
     // resolution[XY] is in pixel per pt
     double resolutionX = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiX()) );
     double resolutionY = POINT_TO_INCH( static_cast<double>(KoGlobal::dpiY()) );
 
-    m_pageWidth = tqlayout.ptWidth * resolutionX;
-    m_pageHeight = tqlayout.ptHeight * resolutionY;
+    m_pageWidth = layout.ptWidth * resolutionX;
+    m_pageHeight = layout.ptHeight * resolutionY;
 
     double zh = 110.0 / m_pageHeight;
     double zw = 110.0 / m_pageWidth;
@@ -79,15 +79,15 @@ void KoPagePreview::setPageLayout( const KoPageLayout &tqlayout )
     m_pageWidth *= z;
     m_pageHeight *= z;
 
-    m_textFrameX = tqlayout.ptLeft * resolutionX * z;
-    m_textFrameY = tqlayout.ptTop * resolutionY * z;
-    m_textFrameWidth = m_pageWidth - ( tqlayout.ptLeft + tqlayout.ptRight ) * resolutionX * z;
-    m_textFrameHeight = m_pageHeight - ( tqlayout.ptTop + tqlayout.ptBottom ) * resolutionY * z;
+    m_textFrameX = layout.ptLeft * resolutionX * z;
+    m_textFrameY = layout.ptTop * resolutionY * z;
+    m_textFrameWidth = m_pageWidth - ( layout.ptLeft + layout.ptRight ) * resolutionX * z;
+    m_textFrameHeight = m_pageHeight - ( layout.ptTop + layout.ptBottom ) * resolutionY * z;
 
     repaint( true );
 }
 
-/*=================== set tqlayout =================================*/
+/*=================== set layout =================================*/
 void KoPagePreview::setPageColumns( const KoColumns &_columns )
 {
     columns = _columns.columns;
@@ -129,7 +129,7 @@ void KoPagePreview::drawContents( TQPainter *painter )
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                                  const KoPageLayout& tqlayout,
+                                  const KoPageLayout& layout,
                                   const KoHeadFoot& hf, int tabs,
                                   KoUnit::Unit unit, bool modal )
     : KDialogBase( KDialogBase::Tabbed, i18n("Page Layout"), KDialogBase::Ok | KDialogBase::Cancel,
@@ -137,7 +137,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
 
     flags = tabs;
-    m_layout = tqlayout;
+    m_layout = layout;
     m_unit = unit;
     m_pageSizeTab = 0;
     m_columnsTab = 0;
@@ -154,7 +154,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 
 /*==================== constructor ===============================*/
 KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
-                  const KoPageLayout& tqlayout,
+                  const KoPageLayout& layout,
                   const KoHeadFoot& hf,
                   const KoColumns& columns,
                   const KoKWHeaderFooter& kwhf,
@@ -164,7 +164,7 @@ KoPageLayoutDia::KoPageLayoutDia( TQWidget* parent, const char* name,
 {
     flags = tabs;
 
-    m_layout = tqlayout;
+    m_layout = layout;
     m_column = columns;
     m_unit = unit;
     m_pageSizeTab = 0;
@@ -186,14 +186,14 @@ KoPageLayoutDia::~KoPageLayoutDia()
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         unit = dlg->unit();
     }
@@ -204,15 +204,15 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, int ta
 }
 
 /*======================= show dialog ============================*/
-bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColumns& columns,
+bool KoPageLayoutDia::pageLayout( KoPageLayout& layout, KoHeadFoot& hf, KoColumns& columns,
                                   KoKWHeaderFooter &_kwhf, int tabs, KoUnit::Unit& unit, TQWidget* parent )
 {
     bool res = false;
-    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", tqlayout, hf, columns, _kwhf, tabs, unit );
+    KoPageLayoutDia *dlg = new KoPageLayoutDia( parent, "PageLayout", layout, hf, columns, _kwhf, tabs, unit );
 
     if ( dlg->exec() == TQDialog::Accepted ) {
         res = true;
-        if ( tabs & FORMAT_AND_BORDERS ) tqlayout = dlg->tqlayout();
+        if ( tabs & FORMAT_AND_BORDERS ) layout = dlg->layout();
         if ( tabs & HEADER_AND_FOOTER ) hf = dlg->headFoot();
         if ( tabs & COLUMNS ) columns = dlg->columns();
         if ( tabs & KW_HEADER_AND_FOOTER ) _kwhf = dlg->headerFooter();
@@ -224,7 +224,7 @@ bool KoPageLayoutDia::pageLayout( KoPageLayout& tqlayout, KoHeadFoot& hf, KoColu
     return res;
 }
 
-/*===================== get a standard page tqlayout ===============*/
+/*===================== get a standard page layout ===============*/
 KoPageLayout KoPageLayoutDia::standardLayout()
 {
     return KoPageLayout::standardLayout();
@@ -261,17 +261,17 @@ void KoPageLayoutDia::setupTab1( bool enableBorders )
             this, TQT_SLOT (sizeUpdated( KoPageLayout&)));
 }
 
-void KoPageLayoutDia::sizeUpdated(KoPageLayout &tqlayout) {
-    m_layout.ptWidth = tqlayout.ptWidth;
-    m_layout.ptHeight = tqlayout.ptHeight;
-    m_layout.ptLeft = tqlayout.ptLeft;
-    m_layout.ptRight = tqlayout.ptRight;
-    m_layout.ptTop = tqlayout.ptTop;
-    m_layout.ptBottom = tqlayout.ptBottom;
-    m_layout.format = tqlayout.format;
-    m_layout.orientation = tqlayout.orientation;
+void KoPageLayoutDia::sizeUpdated(KoPageLayout &layout) {
+    m_layout.ptWidth = layout.ptWidth;
+    m_layout.ptHeight = layout.ptHeight;
+    m_layout.ptLeft = layout.ptLeft;
+    m_layout.ptRight = layout.ptRight;
+    m_layout.ptTop = layout.ptTop;
+    m_layout.ptBottom = layout.ptBottom;
+    m_layout.format = layout.format;
+    m_layout.orientation = layout.orientation;
     if(m_columnsTab)
-        m_columnsTab->setLayout(tqlayout);
+        m_columnsTab->setLayout(layout);
 }
 
 /*================ setup header and footer tab ===================*/
@@ -282,9 +282,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- header ---------------
     TQGroupBox *gHead = new TQGroupBox( 0, Qt::Vertical, i18n( "Head Line" ), tab2 );
-    gHead->tqlayout()->setSpacing(KDialog::spacingHint());
-    gHead->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *headGrid = new TQGridLayout( gHead->tqlayout(), 2, 3 );
+    gHead->layout()->setSpacing(KDialog::spacingHint());
+    gHead->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *headGrid = new TQGridLayout( gHead->layout(), 2, 3 );
 
     TQLabel *lHeadLeft = new TQLabel( i18n( "Left:" ), gHead );
     headGrid->addWidget( lHeadLeft, 0, 0 );
@@ -311,9 +311,9 @@ void KoPageLayoutDia::setupTab2( const KoHeadFoot& hf )
 
     // ------------- footer ---------------
     TQGroupBox *gFoot = new TQGroupBox( 0, Qt::Vertical, i18n( "Foot Line" ), tab2 );
-    gFoot->tqlayout()->setSpacing(KDialog::spacingHint());
-    gFoot->tqlayout()->setMargin(KDialog::marginHint());
-    TQGridLayout *footGrid = new TQGridLayout( gFoot->tqlayout(), 2, 3 );
+    gFoot->layout()->setSpacing(KDialog::spacingHint());
+    gFoot->layout()->setMargin(KDialog::marginHint());
+    TQGridLayout *footGrid = new TQGridLayout( gFoot->layout(), 2, 3 );
 
     TQLabel *lFootLeft = new TQLabel( i18n( "Left:" ), gFoot );
     footGrid->addWidget( lFootLeft, 0, 0 );
@@ -362,7 +362,7 @@ void KoPageLayoutDia::setupTab3()
     TQWidget *tab3 = addPage(i18n( "Col&umns" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab3);
     m_columnsTab = new KoPageLayoutColumns(tab3, m_column, m_unit, m_layout);
-    m_columnsTab->tqlayout()->setMargin(0);
+    m_columnsTab->layout()->setMargin(0);
     lay->addWidget(m_columnsTab);
     m_columnsTab->show();
     connect (m_columnsTab, TQT_SIGNAL( propertyChange(KoColumns&)),
@@ -382,7 +382,7 @@ void KoPageLayoutDia::setupTab4(const KoKWHeaderFooter kwhf )
     TQWidget *tab4 = addPage(i18n( "H&eader && Footer" ));
     TQHBoxLayout *lay = new TQHBoxLayout(tab4);
     m_headerTab = new KoPageLayoutHeader(tab4, m_unit, kwhf);
-    m_headerTab->tqlayout()->setMargin(0);
+    m_headerTab->layout()->setMargin(0);
     lay->addWidget(m_headerTab);
     m_headerTab->show();
 
diff --git a/lib/kofficeui/KoPageLayoutDia.h b/lib/kofficeui/KoPageLayoutDia.h
index 21fe7df3..1ed23ec5 100644
--- a/lib/kofficeui/KoPageLayoutDia.h
+++ b/lib/kofficeui/KoPageLayoutDia.h
@@ -61,7 +61,7 @@ public:
     ~KoPagePreview();
 
     /**
-     *  set page tqlayout
+     *  set page layout
      */
     void setPageLayout( const KoPageLayout& );
     void setPageColumns( const KoColumns& );
@@ -78,7 +78,7 @@ protected:
 class KoPageLayoutDiaPrivate;
 
 /**
- *  With this dialog the user can specify the tqlayout of the paper during printing.
+ *  With this dialog the user can specify the layout of the paper during printing.
  */
 class KOFFICEUI_EXPORT KoPageLayoutDia : public KDialogBase
 {
@@ -92,14 +92,14 @@ public:
      *
      *  @param parent   The parent of the dialog.
      *  @param name     The name of the dialog.
-     *  @param tqlayout   The tqlayout.
+     *  @param layout   The layout.
      *  @param headfoot The header and the footer.
      *  @param flags     a variable with all features this dialog should show.
      *  @param unit     The unit to use for displaying the values to the user.
      *  @param modal    Whether the dialog is modal or not.
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& tqlayout,
+             const KoPageLayout& layout,
              const KoHeadFoot& headfoot,
              int flags, KoUnit::Unit unit, bool modal=true );
 
@@ -108,7 +108,7 @@ public:
      *
      *  @param parent     The parent of the dialog.
      *  @param name       The name of the dialog.
-     *  @param tqlayout     The tqlayout.
+     *  @param layout     The layout.
      *  @param headfoot   The header and the footer.
      *  @param columns    The number of columns on the page.
      *  @param kwheadfoot The KWord header and footer.
@@ -116,7 +116,7 @@ public:
      *  @param unit       The unit to use for displaying the values to the user
      */
     KoPageLayoutDia( TQWidget* parent, const char* name,
-             const KoPageLayout& tqlayout,
+             const KoPageLayout& layout,
              const KoHeadFoot& headfoot,
              const KoColumns& columns,
              const KoKWHeaderFooter& kwheadfoot,
@@ -128,26 +128,26 @@ public:
     ~KoPageLayoutDia();
 
     /**
-     *  Show page tqlayout dialog.
+     *  Show page layout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
 
     /**
-     *  Show page tqlayout dialog.
+     *  Show page layout dialog.
      *  See constructor for documentation on the parameters
      */
     static bool pageLayout( KoPageLayout&, KoHeadFoot&, KoColumns&, KoKWHeaderFooter&, int tabs, KoUnit::Unit& unit, TQWidget* parent = 0 );
     /**
-     *  Retrieves a standard page tqlayout.
+     *  Retrieves a standard page layout.
      *  Deprecated: better use KoPageLayout::standardLayout()
      */
     static KDE_DEPRECATED KoPageLayout standardLayout();
 
     /**
-     *  Returns the tqlayout
+     *  Returns the layout
      */
-    const KoPageLayout& tqlayout() const { return m_layout; }
+    const KoPageLayout& layout() const { return m_layout; }
 
     /**
      *  Returns the header and footer information
@@ -177,7 +177,7 @@ private:
     TQLineEdit *eFootMid;
     TQLineEdit *eFootRight;
 
-    // tqlayout
+    // layout
     KoPageLayout m_layout;
     KoColumns m_column;
 
@@ -189,7 +189,7 @@ protected slots:
     virtual void slotOk();
 
 private slots:
-    void sizeUpdated(KoPageLayout &tqlayout);
+    void sizeUpdated(KoPageLayout &layout);
     void columnsUpdated(KoColumns &columns);
 
 private:
diff --git a/lib/kofficeui/KoPageLayoutHeaderBase.ui b/lib/kofficeui/KoPageLayoutHeaderBase.ui
index 41246d84..7f36378e 100644
--- a/lib/kofficeui/KoPageLayoutHeaderBase.ui
+++ b/lib/kofficeui/KoPageLayoutHeaderBase.ui
@@ -45,7 +45,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -120,7 +120,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout2</cstring>
+                        <cstring>layout2</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index 54be2b3f..73629862 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -34,9 +34,9 @@
 #include <tqvgroupbox.h>
 #include <tqhbuttongroup.h>
 
-KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
+KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,const KoColumns& columns,  bool unitChooser, bool enableBorders)
     : TQWidget(parent), m_blockSignals(false) {
-    m_layout = tqlayout;
+    m_layout = layout;
     m_unit = unit;
 
     TQGridLayout *grid1 = new TQGridLayout( this, 5, 2, 0, KDialog::spacingHint() );
@@ -130,7 +130,7 @@ KoPageLayoutSize::KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayou
     marginsFrame->setMargin( KDialog::marginHint() );
     grid1->addWidget( marginsFrame, 3, 0 );
 
-    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->tqlayout(), 3, 3,
+    TQGridLayout *marginsLayout = new TQGridLayout( marginsFrame->layout(), 3, 3,
        KDialog::spacingHint() );
 
     // left margin
diff --git a/lib/kofficeui/KoPageLayoutSize.h b/lib/kofficeui/KoPageLayoutSize.h
index d917b349..6d50e014 100644
--- a/lib/kofficeui/KoPageLayoutSize.h
+++ b/lib/kofficeui/KoPageLayoutSize.h
@@ -42,13 +42,13 @@ public:
     /**
      * Contructor
      * @param parent the parent widget
-     * @param tqlayout the page tqlayout that this widget should be initialzed with.
+     * @param layout the page layout that this widget should be initialzed with.
      * @param unit the unit-type (mm/cm/inch) that the dialog should show
      * @param columns the KoColumns (amout of columns) that the preview should be initialized with
      * @param unitChooser if true a combobox with the unit-type is shown for the user to change
      * @param enableBorders if true enable the user to change the margins (aka borders) of the page
      */
-    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& tqlayout, KoUnit::Unit unit,
+    KoPageLayoutSize(TQWidget *parent, const KoPageLayout& layout, KoUnit::Unit unit,
             const KoColumns& columns, bool unitChooser, bool enableBorders);
 
     /**
@@ -78,11 +78,11 @@ public slots:
 signals:
     /**
      * Emitted whenever the user changed something in the dialog.
-     * @param tqlayout the update tqlayout structure with currently displayed info.
+     * @param layout the update layout structure with currently displayed info.
      * Note that the info may not be fully correct and physically possible (in which
      * case queryClose will return false)
      */
-    void propertyChange(KoPageLayout &tqlayout);
+    void propertyChange(KoPageLayout &layout);
 
 protected:
     TQComboBox *cpgFormat;
diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp
index cc8f5189..b11b0604 100644
--- a/lib/kofficeui/KoRuler.cpp
+++ b/lib/kofficeui/KoRuler.cpp
@@ -44,7 +44,7 @@ public:
     bool whileMovingBorderLeft, whileMovingBorderRight;
     bool whileMovingBorderTop, whileMovingBorderBottom;
     TQPixmap pmFirst, pmLeft;
-    KoPageLayout tqlayout;
+    KoPageLayout layout;
     KoTabChooser *tabChooser;
     KoTabulatorList tabList;
     // Do we have to remove a certain tab in the DC Event?
@@ -93,7 +93,7 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta
 
     d->canvas = _canvas;
     orientation = _orientation;
-    d->tqlayout = _layout;
+    d->layout = _layout;
     d->flags = _flags;
 
     d->m_bReadWrite=true;
@@ -125,11 +125,11 @@ KoRuler::KoRuler( TQWidget *_parent, TQWidget *_canvas, Qt::Orientation _orienta
 
     d->removeTab.type = T_INVALID;
     if ( orientation == Qt::Horizontal ) {
-        frameStart = tqRound( zoomIt(d->tqlayout.ptLeft) );
-        d->frameEnd = tqRound( zoomIt(d->tqlayout.ptWidth - d->tqlayout.ptRight) );
+        frameStart = tqRound( zoomIt(d->layout.ptLeft) );
+        d->frameEnd = tqRound( zoomIt(d->layout.ptWidth - d->layout.ptRight) );
     } else {
-        frameStart = tqRound( zoomIt(d->tqlayout.ptTop) );
-        d->frameEnd = tqRound( zoomIt(d->tqlayout.ptHeight - d->tqlayout.ptBottom) );
+        frameStart = tqRound( zoomIt(d->layout.ptTop) );
+        d->frameEnd = tqRound( zoomIt(d->layout.ptHeight - d->layout.ptBottom) );
     }
     m_bFrameStartSet = false;
 
@@ -211,7 +211,7 @@ void KoRuler::drawHorizontal( TQPainter *_painter )
     TQPainter p( &buffer );
     p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
 
-    int totalw = tqRound( zoomIt(d->tqlayout.ptWidth) );
+    int totalw = tqRound( zoomIt(d->layout.ptWidth) );
     TQString str;
 
     p.setBrush( colorGroup().brush( TQColorGroup::Base ) );
@@ -373,7 +373,7 @@ void KoRuler::drawVertical( TQPainter *_painter )
     TQPainter p( &buffer );
     p.fillRect( 0, 0, width(), height(), TQBrush( colorGroup().brush( TQColorGroup::Background ) ) );
 
-    int totalh = tqRound( zoomIt(d->tqlayout.ptHeight) );
+    int totalh = tqRound( zoomIt(d->layout.ptHeight) );
     // Clip rect - this gives basically always a rect like (2,2,width-2,height-2)
     TQRect paintRect = _painter->clipRegion( TQPainter::CoordPainter ).boundingRect();
     // Ruler rect
@@ -598,7 +598,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e )
         if ( d->canvas )
             drawLine(d->oldMx, -1);
         update();
-        emit newPageLayout( d->tqlayout );
+        emit newPageLayout( d->layout );
     } else if ( d->action == A_BR_TOP || d->action == A_BR_BOTTOM ) {
         d->whileMovingBorderTop = false;
         d->whileMovingBorderBottom = false;
@@ -610,7 +610,7 @@ void KoRuler::mouseReleaseEvent( TQMouseEvent *e )
             p.end();
         }
         update();
-        emit newPageLayout( d->tqlayout );
+        emit newPageLayout( d->layout );
     } else if ( d->action == A_FIRST_INDENT ) {
         if ( d->canvas )
             drawLine(d->oldMx, -1);
@@ -667,12 +667,12 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
     hasToDelete = false;
 
     int pw = d->frameEnd - frameStart;
-    int ph = tqRound(zoomIt(d->tqlayout.ptHeight));
+    int ph = tqRound(zoomIt(d->layout.ptHeight));
     int left = frameStart - diffx;
-    int top = tqRound(zoomIt(d->tqlayout.ptTop));
+    int top = tqRound(zoomIt(d->layout.ptTop));
     top -= diffy;
     int right = d->frameEnd - diffx;
-    int bottom = tqRound(zoomIt(d->tqlayout.ptBottom));
+    int bottom = tqRound(zoomIt(d->layout.ptBottom));
     bottom = ph - bottom - diffy;
     // Cumulate first-line-indent
     int ip_first = tqRound( zoomIt( i_first + ( d->rtl ? d->i_right : i_left) ) );
@@ -693,13 +693,13 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                 /////// ######
                 // At the moment, moving the left and right border indicators
                 // is disabled when setFrameStartEnd has been called (i.e. in KWord)
-                // Changing the tqlayout margins directly from it would be utterly wrong
+                // Changing the layout margins directly from it would be utterly wrong
                 // (just try the 2-columns modes...). What needs to be done is:
                 // emitting a signal frameResized in mouseReleaseEvent, when a left/right
                 // border has been moved, and in kword we need to update the margins from
                 // there, if the left border of the 1st column or the right border of the
                 // last column was moved... and find what to do with the other borders.
-                // And for normal frames, resize the frame without touching the page tqlayout.
+                // And for normal frames, resize the frame without touching the page layout.
                 // All that is too much for now -> disabling.
                 if ( !m_bFrameStartSet )
                 {
@@ -747,7 +747,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                     case A_BR_LEFT: {
                         if ( d->canvas && mx < right-10 && mx+diffx-2 > 0) {
                             drawLine( d->oldMx, mx );
-                            d->tqlayout.ptLeft = unZoomIt(static_cast<double>(mx + diffx));
+                            d->layout.ptLeft = unZoomIt(static_cast<double>(mx + diffx));
                             if( ip_left > right-left-15 ) {
                                 ip_left=right-left-15;
                                 ip_left=ip_left<0 ? 0 : ip_left;
@@ -770,7 +770,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                     case A_BR_RIGHT: {
                         if ( d->canvas && mx > left+10 && mx+diffx <= pw-2) {
                             drawLine( d->oldMx, mx );
-                            d->tqlayout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx )));
+                            d->layout.ptRight = unZoomIt(static_cast<double>(pw - ( mx + diffx )));
                             if( ip_left > right-left-15 ) {
                                 ip_left=right-left-15;
                                 ip_left=ip_left<0 ? 0 : ip_left;
@@ -895,7 +895,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                             p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy );
                             p.drawLine( 0, my, d->canvas->width(), my );
                             p.end();
-                            d->tqlayout.ptTop = unZoomIt(static_cast<double>(my + diffy));
+                            d->layout.ptTop = unZoomIt(static_cast<double>(my + diffy));
                             d->oldMx = mx;
                             d->oldMy = my;
                             update();
@@ -910,7 +910,7 @@ void KoRuler::mouseMoveEvent( TQMouseEvent *e )
                             p.drawLine( 0, d->oldMy, d->canvas->width(), d->oldMy );
                             p.drawLine( 0, my, d->canvas->width(), my );
                             p.end();
-                            d->tqlayout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy )));
+                            d->layout.ptBottom = unZoomIt(static_cast<double>(ph - ( my + diffy )));
                             d->oldMx = mx;
                             d->oldMy = my;
                             update();
@@ -984,7 +984,7 @@ void KoRuler::handleDoubleClick()
 
     // Double-clicked nothing
     d->action = A_NONE;
-    emit doubleClicked(); // usually page tqlayout dialog
+    emit doubleClicked(); // usually page layout dialog
 }
 
 void KoRuler::setTabList( const KoTabulatorList & _tabList )
@@ -1195,7 +1195,7 @@ TQSize KoRuler::sizeHint() const
 
 void KoRuler::setPageLayout( const KoPageLayout& _layout )
 {
-    d->tqlayout = _layout;
+    d->layout = _layout;
     update();
 }
 
diff --git a/lib/kofficeui/KoRuler.h b/lib/kofficeui/KoRuler.h
index 52dcecd0..352e6820 100644
--- a/lib/kofficeui/KoRuler.h
+++ b/lib/kofficeui/KoRuler.h
@@ -96,7 +96,7 @@ class KoRulerPrivate;
  * and supports zooming, tabulators, paragraph indents, showing the mouse position, etc.
  *
  * It also offers a popupmenu upon right-clicking, for changing the unit,
- * the page tqlayout, or removing a tab.
+ * the page layout, or removing a tab.
  */
 class KOFFICEUI_EXPORT KoRuler : public TQFrame
 {
@@ -139,7 +139,7 @@ public:
     const double& zoom() const { return m_zoom; }
 
     /**
-     * Set the page tqlayout, see @ref KoPageLayout.
+     * Set the page layout, see @ref KoPageLayout.
      * This defines the size of the page and the margins,
      * from which the size of the ruler is deducted.
      */
diff --git a/lib/kofficeui/KoTabBar.cpp b/lib/kofficeui/KoTabBar.cpp
index a249084f..fe448916 100644
--- a/lib/kofficeui/KoTabBar.cpp
+++ b/lib/kofficeui/KoTabBar.cpp
@@ -37,7 +37,7 @@
 // TODO
 // improvement possibilities
 // - use offscreen buffer to reduce flicker even more
-// - keep track of tabs, only (re)tqlayout when necessary
+// - keep track of tabs, only (re)layout when necessary
 // - paint all tabs to buffer, show only by shifting
 // - customizable button pixmaps
 // - use TQStyle to paint the tabs & buttons (is it good/possible?)
@@ -57,7 +57,7 @@ public:
     // read-only: no mouse drag, double-click, right-click
     bool readOnly;
     
-    // if true, tqlayout is from right to left
+    // if true, layout is from right to left
     bool reverseLayout;
 
     // list of all tabs, in order of appearance
@@ -724,7 +724,7 @@ void KoTabBar::resizeEvent( TQResizeEvent* )
 
 TQSize KoTabBar::sizeHint() const
 {
-    return TQSize( 40, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) );
+    return TQSize( 40, style().pixelMetric( TQStyle::PM_ScrollBarExtent, this ) );
 }
 
 void KoTabBar::renameTab( const TQString& old_name, const TQString& new_name )
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 0311049e..af79486d 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -165,7 +165,7 @@ class KoTemplateChooseDiaPrivate {
 	// choose a file
 	MyFileDialog *m_filedialog;
 
-	// for the tqlayout
+	// for the layout
 	TQTabWidget* tabWidget;
 	TQWidget* newTab;
 	TQWidget* existingTab;
@@ -298,13 +298,13 @@ KoTemplateChooseDia::DialogType KoTemplateChooseDia::getDialogType() const {
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
+void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout)
 {
 
         d->m_recent = new KoTCDRecentFilesIconView(widgetbase, "recent files");
         // I prefer the icons to be in "most recent first" order (DF)
         d->m_recent->setSorting( static_cast<TQDir::SortSpec>( TQDir::Time | TQDir::Reversed ) );
-        tqlayout->addWidget(d->m_recent,0,0);
+        layout->addWidget(d->m_recent,0,0);
 
         TQString oldGroup = d->m_instance->config()->group();
         d->m_instance->config()->setGroup( "RecentFiles" );
@@ -342,7 +342,7 @@ void KoTemplateChooseDia::setupRecentDialog(TQWidget * widgetbase, TQGridLayout
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
+void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout)
 {
     TQString dir = TQString();
     TQPoint point( 0, 0 );
@@ -353,7 +353,7 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
 	    "file dialog",
 	    false);
 
-    tqlayout->addWidget(d->m_filedialog,0,0);
+    layout->addWidget(d->m_filedialog,0,0);
     d->m_filedialog->reparent( widgetbase , point );
     //d->m_filedialog->setOperationMode( KFileDialog::Opening);
 
@@ -387,20 +387,20 @@ void KoTemplateChooseDia::setupFileDialog(TQWidget * widgetbase, TQGridLayout *
 
 /*================================================================*/
 // private
-void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout)
+void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout)
 {
 
     d->m_jwidget = new KJanusWidget(
 	    widgetbase,
 	    "kjanuswidget",
 	    KJanusWidget::IconList);
-    tqlayout->addWidget(d->m_jwidget,0,0);
+    layout->addWidget(d->m_jwidget,0,0);
 
     d->boxdescription = new TQVGroupBox(
 	    i18n("Selected Template"),
 	    widgetbase,
 	    "boxdescription");
-    tqlayout->addWidget(d->boxdescription, 1, 0 );
+    layout->addWidget(d->boxdescription, 1, 0 );
 
     // config
     KConfigGroup grp( d->m_instance->config(), "TemplateChooserDialog" );
@@ -429,9 +429,9 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
 		group->name(),
 		group->first()->loadPicture(d->m_instance));
 
-	TQGridLayout * tqlayout = new TQGridLayout(frame);
+	TQGridLayout * layout = new TQGridLayout(frame);
 	KoTCDIconCanvas *canvas = new KoTCDIconCanvas( frame );
-	tqlayout->addWidget(canvas,0,0);
+	layout->addWidget(canvas,0,0);
 
 	canvas->setBackgroundColor( colorGroup().base() );
 	canvas->setResizeMode(TQIconView::Adjust);
@@ -481,7 +481,7 @@ void KoTemplateChooseDia::setupTemplateDialog(TQWidget * widgetbase, TQGridLayou
     TQString translatedstring = i18n("Always start %1 with the selected template").arg(d->m_nativeName);
 
     d->m_nodiag = new TQCheckBox ( translatedstring , widgetbase);
-    tqlayout->addWidget(d->m_nodiag, 2, 0);
+    layout->addWidget(d->m_nodiag, 2, 0);
     TQString  startwithoutdialog = grp.readEntry( "NoStartDlg" );
     bool ischecked = startwithoutdialog == TQString("yes");
 
diff --git a/lib/kofficeui/KoTemplateChooseDia.h b/lib/kofficeui/KoTemplateChooseDia.h
index 677c11b1..9363477d 100644
--- a/lib/kofficeui/KoTemplateChooseDia.h
+++ b/lib/kofficeui/KoTemplateChooseDia.h
@@ -236,9 +236,9 @@ private:
 
     TQString descriptionText(const TQString &name, const TQString &description);
     void setupDialog();
-    void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * tqlayout);
-    void setupFileDialog(TQWidget * widgetbase, TQGridLayout * tqlayout);
-    void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * tqlayout);
+    void setupTemplateDialog(TQWidget * widgetbase, TQGridLayout * layout);
+    void setupFileDialog(TQWidget * widgetbase, TQGridLayout * layout);
+    void setupRecentDialog(TQWidget * widgetbase, TQGridLayout * layout);
     bool collectInfo();
     bool noStartupDlg() const;
 
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index 4e8c4d0c..d2dc25f0 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -142,15 +142,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan
     TQVBoxLayout *rightbox=new TQVBoxLayout(mbox);
     TQGroupBox *pixbox=new TQGroupBox(i18n("Picture"), mainwidget);
     rightbox->addWidget(pixbox);
-    TQVBoxLayout *pixtqlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(),
+    TQVBoxLayout *pixlayout=new TQVBoxLayout(pixbox, KDialogBase::marginHint(),
                                            KDialogBase::spacingHint());
     pixtqlayout->addSpacing(pixbox->fontMetrics().height()/2);
-    pixtqlayout->addStretch(1);
+    pixlayout->addStretch(1);
     d->m_default=new TQRadioButton(i18n("&Default"), pixbox);
     d->m_default->setChecked(true);
     connect(d->m_default, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDefault()));
-    pixtqlayout->addWidget(d->m_default);
-    TQHBoxLayout *custombox=new TQHBoxLayout(pixtqlayout);
+    pixlayout->addWidget(d->m_default);
+    TQHBoxLayout *custombox=new TQHBoxLayout(pixlayout);
     d->m_custom=new TQRadioButton(i18n("Custom"), pixbox);
     d->m_custom->setChecked(false);
     connect(d->m_custom, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustom()));
@@ -159,15 +159,15 @@ KoTemplateCreateDia::KoTemplateCreateDia( const TQCString &templateType, KInstan
     connect(d->m_select, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelect()));
     custombox->addWidget(d->m_select, 1);
     custombox->addStretch(1);
-    pixtqlayout->addStretch(1);
+    pixlayout->addStretch(1);
     label=new TQLabel(i18n("Preview:"), pixbox);
-    pixtqlayout->addWidget(label);
-    TQHBoxLayout *previewbox=new TQHBoxLayout(pixtqlayout);
+    pixlayout->addWidget(label);
+    TQHBoxLayout *previewbox=new TQHBoxLayout(pixlayout);
     previewbox->addStretch(10);
     d->m_preview=new TQLabel(pixbox); // setPixmap() -> auto resize?
     previewbox->addWidget(d->m_preview);
     previewbox->addStretch(10);
-    pixtqlayout->addStretch(8);
+    pixlayout->addStretch(8);
 
     d->m_defaultTemplate = new TQCheckBox( i18n("Use the new template as default"), mainwidget );
     d->m_defaultTemplate->setChecked( true );
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index bc5affeb..10334c32 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -368,7 +368,7 @@ void KoColorPanel::paintEvent( TQPaintEvent* e )
     // The "active" element (if there is one)
     if ( hasFocus() && m_focusPosition.x != -1 && m_focusPosition.y != -1 &&
          mapFromPosition( m_focusPosition ).intersects( e->rect() ) )
-        tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
+        style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
                                colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
 
     --lns;  // Attention: We just avoid some lns - 1 statements
@@ -579,7 +579,7 @@ void KoColorPanel::updateFocusPosition( const Position& newPosition )
     TQMap<Position, TQColor>::ConstIterator it = m_colorMap.find( m_focusPosition );
     if ( it != m_colorMap.end() ) {
         // draw at the new focus position
-        tqstyle().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
+        style().tqdrawPrimitive( TQStyle::PE_Panel, &p, TQRect( m_focusPosition.x << 4, m_focusPosition.y << 4, TILESIZE, TILESIZE ),
                                colorGroup(), TQStyle::Style_Sunken | TQStyle::Style_Enabled );
         p.fillRect( ( m_focusPosition.x << 4 ) + 2, ( m_focusPosition.y << 4 ) + 2, 12, 12, it.data() );
     }
@@ -712,15 +712,15 @@ void KoToolButton::drawButton(TQPainter *_painter)
 
     // Draw styled toolbuttons
     _painter->setClipRect( 0, 0, width() - ARROW_WIDTH, height() );
-    tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg,
+    style().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( 0, 0, width() - ARROW_WIDTH, height() ), cg,
                                 flags, TQStyle::SC_ToolButton, active, opt );
     _painter->setClipRect( width() - ARROW_WIDTH, 0, ARROW_WIDTH, height() );
-    tqstyle().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg,
+    style().drawComplexControl( TQStyle::CC_ToolButton, _painter, this, TQRect( width(), 0, ARROW_WIDTH, height() ), cg,
                                 arrowFlags, TQStyle::SC_ToolButton, arrowActive, opt );
     _painter->setClipping( false );
 
     // ...and the arrow indicating the popup
-    tqstyle().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ),
+    style().tqdrawPrimitive( TQStyle::PE_ArrowDown, _painter, TQRect( width() - ARROW_WIDTH - 1, 0, ARROW_WIDTH, height() ),
                            cg, flags, opt );
 
     if ( KToolBarButton::isRaised() || m_arrowPressed )
@@ -798,7 +798,7 @@ void KoToolButton::drawButton(TQPainter *_painter)
     if (!textLabel().isNull() && !textRect.isNull()) {
         _painter->setFont( KGlobalSettings::toolBarFont() );
         if ( !isEnabled() )
-            _painter->setPen( tqpalette().disabled().dark() );
+            _painter->setPen( palette().disabled().dark() );
         else if( KToolBarButton::isRaised() )
             _painter->setPen( KGlobalSettings::toolBarHighlightColor() );
         else
@@ -838,15 +838,15 @@ void KoToolButton::init()
     // We are interested in the mouse clicks on the arrow button
     m_popup->installEventFilter( this );
 
-    ARROW_WIDTH = tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator) + 4;
+    ARROW_WIDTH = style().pixelMetric(TQStyle::PM_MenuButtonIndicator) + 4;
     kdDebug() << "##################### Arrow: " << ARROW_WIDTH << endl;
 }
 
 void KoToolButton::buttonShift( int& dx, int& dy )
 {
     if ( isDown() && !m_arrowPressed ) {
-        dx += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal );
-        dy += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical );
+        dx += style().pixelMetric( TQStyle::PM_ButtonShiftHorizontal );
+        dy += style().pixelMetric( TQStyle::PM_ButtonShiftVertical );
     }
 }
 
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 14b92ec6..2a2c854e 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -379,48 +379,48 @@ double KoUnitDoubleComboBox::value( void ) const
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, const char *name )
     : TQWidget( parent ), m_step( 1.0 )
 {
-    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
-    //tqlayout->setMargin( 2 );
+    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+    //layout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    tqlayout->addWidget( up, 0, 0 );
+    layout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    tqlayout->addWidget( down, 1, 0 );
+    layout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( 0.0, KoUnit::U_PT ), KoUnit::ptToUnit( 9999.99, KoUnit::U_PT ), 0.0, KoUnit::U_PT, 2, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 KoUnitDoubleSpinComboBox::KoUnitDoubleSpinComboBox( TQWidget *parent, double lower, double upper, double step, double value,
                                                     KoUnit::Unit unit, unsigned int precision, const char *name )
     : TQWidget( parent ), m_step( step )//, m_lowerInPoints( lower ), m_upperInPoints( upper )
 {
-    TQGridLayout *tqlayout = new TQGridLayout( this, 2, 3 );
-    //tqlayout->setMargin( 2 );
+    TQGridLayout *layout = new TQGridLayout( this, 2, 3 );
+    //layout->setMargin( 2 );
     TQPushButton *up = new TQPushButton( "+", this );
     //up->setFlat( true );
     up->setMaximumHeight( 15 );
     up->setMaximumWidth( 15 );
-    tqlayout->addWidget( up, 0, 0 );
+    layout->addWidget( up, 0, 0 );
     connect( up, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) );
 
     TQPushButton *down = new TQPushButton( "-", this );
     down->setMaximumHeight( 15 );
     down->setMaximumWidth( 15 );
-    tqlayout->addWidget( down, 1, 0 );
+    layout->addWidget( down, 1, 0 );
     connect( down, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) );
 
     m_combo = new KoUnitDoubleComboBox( this, KoUnit::ptToUnit( lower, unit ), KoUnit::ptToUnit( upper, unit ), value, unit, precision, name );
     connect( m_combo, TQT_SIGNAL( valueChanged( double ) ), this, TQT_SIGNAL( valueChanged( double ) ) );
-    tqlayout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
+    layout->addMultiCellWidget( m_combo, 0, 1, 2, 2 );
 }
 
 void
diff --git a/lib/kofficeui/tkaction.cpp b/lib/kofficeui/tkaction.cpp
index cfc21c65..65b4de02 100644
--- a/lib/kofficeui/tkaction.cpp
+++ b/lib/kofficeui/tkaction.cpp
@@ -128,11 +128,11 @@ TQWidget* TKAction::createLayout(TQWidget* parent, TQWidget* children)
   TQLabel* pixLabel = new TQLabel(base,"pixmap");
   children->reparent(base,TQPoint(0,0));
   children->setName("widget");
-  TQHBoxLayout* tqlayout = new TQHBoxLayout(base,0,3);
-  tqlayout->setResizeMode(TQLayout::Minimum);
-  tqlayout->addWidget(textLabel);
-  tqlayout->addWidget(pixLabel);
-  tqlayout->addWidget(children,1);
+  TQHBoxLayout* layout = new TQHBoxLayout(base,0,3);
+  layout->setResizeMode(TQLayout::Minimum);
+  layout->addWidget(textLabel);
+  layout->addWidget(pixLabel);
+  layout->addWidget(children,1);
 
   updateLayout(base);
   return base;
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index 1449d0fb..11ddbc7f 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -43,7 +43,7 @@ TKColorPopupMenu::~TKColorPopupMenu()
 
 void TKColorPopupMenu::updateItemSize()
 {
-  styleChange(tqstyle());
+  styleChange(style());
 }
 /****************************************************************************************/
 class TKSelectColorActionPrivate
diff --git a/lib/kofficeui/tkcombobox.cpp b/lib/kofficeui/tkcombobox.cpp
index cd20f790..c7b2a8b2 100644
--- a/lib/kofficeui/tkcombobox.cpp
+++ b/lib/kofficeui/tkcombobox.cpp
@@ -87,11 +87,11 @@ void TKComboBox::paintEvent(TQPaintEvent*)
   TQPixmap pixmap(arrow_down);
 
 
-  tqstyle().drawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), colorGroup() );
-  tqstyle().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() );
+  style().drawControl( TQStyle::CE_PushButton, &p, this, TQRect( bx, by, bw, bh ), colorGroup() );
+  style().drawItem( &p, TQRect( bx, by, bw, bh), AlignCenter, colorGroup(), isEnabled(), &pixmap, TQString() );
 
   if ( hasFocus()) {
-    tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g );
+    style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, fr, g );
   }
 
   if (!editable()) {
diff --git a/lib/kofficeui/tktoolbarbutton.cpp b/lib/kofficeui/tktoolbarbutton.cpp
index af2b14c2..8a2798e0 100644
--- a/lib/kofficeui/tktoolbarbutton.cpp
+++ b/lib/kofficeui/tktoolbarbutton.cpp
@@ -353,14 +353,14 @@ void TKToolBarButton::drawButton( TQPainter* p )
 #define DRAW_PIXMAP_AND_TEXT \
   int x = 3;\
   if (pixmap()) {\
-    tqstyle().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\
+    style().drawItem( p, TQRect( x, 0, pixmap()->width(), height() ), AlignCenter, colorGroup(), isEnabled(), pixmap(), TQString() );\
     if (d->m_iconMode==TK::IconAndText && !d->m_text.isEmpty()) {\
       x += pixmap()->width() + 3;\
     }\
   }\
   if ((d->m_iconMode==TK::IconAndText||d->m_iconMode==TK::TextOnly) && !d->m_text.isEmpty()) {\
     TQFontMetrics fm(KGlobalSettings::toolBarFont());\
-    tqstyle().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\
+    style().drawItem( p, TQRect( x, 0, fm.width(d->m_text), height() ), AlignCenter, colorGroup(), isEnabled(), 0, d->m_text );\
   }
 
   const char* arrow[] = {
@@ -384,20 +384,20 @@ void TKToolBarButton::drawButton( TQPainter* p )
             if (d->m_isRaised)	flags |= TQStyle::Style_Raised;
             if (hasFocus())	flags |= TQStyle::Style_HasFocus;
 
-            tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
-            tqstyle().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
-            tqstyle().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() );
+            style().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( 0, 0, width()-12, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
+            style().drawComplexControl( TQStyle::CC_ToolButton, p, this, TQRect( width()-13, 0, 13, height() ), colorGroup(), flags, TQStyle::SC_ToolButton );
+            style().drawItem( p, TQRect( width()-13, 0, 13, height() ), AlignCenter, colorGroup(), isEnabled(), &arrow_pix, TQString() );
             if ( d->m_isRaised )
                 qDrawShadeLine( p, width()-12, 0, width()-12, height(), colorGroup(), true );
             DRAW_PIXMAP_AND_TEXT
         } else {
-            tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : tqpalette().disabled(), f );
+            style().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f );
             DRAW_PIXMAP_AND_TEXT
             int z = f ? 1:0;
             p->drawPixmap(width()-11+z,(height()-4)/2+z ,arrow_pix);
         }
     } else {
-        tqstyle().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : tqpalette().disabled(), f );
+        style().drawControl( TQStyle::CE_PushButton, p, this, TQRect( 0, 0, width(), height() ), isEnabled() ? colorGroup() : palette().disabled(), f );
         DRAW_PIXMAP_AND_TEXT
     }
 }