Rename obsolete tq methods to standard names

1 files changed, 15 insertions, 15 deletions

diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index 1d424b27..0e38c8b5 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -830,7 +830,7 @@ void KoStylePreview::drawContents( TQPainter *painter )
 
     TQRect whiteRect( r.x() + 10, r.y() + 10,
                      r.width() - 20, r.height() - 20 );
-    TQColorGroup cg = TQApplication::tqpalette().active();
+    TQColorGroup cg = TQApplication::palette().active();
     painter->fillRect( whiteRect, cg.brush( TQColorGroup::Base ) );
 
     KoTextParag * parag = m_textdoc->firstParag();
@@ -1605,9 +1605,9 @@ KoParagCounterWidget::KoParagCounterWidget( bool disableAll, TQWidget * parent,
     gNumbering = new TQButtonGroup( this, "numberingGroup" );
     gNumbering->setTitle( i18n( "Numbering" ) );
     gNumbering->setColumnLayout(0, Qt::Vertical );
-    gNumbering->tqlayout()->setSpacing( 0 );
-    gNumbering->tqlayout()->setMargin( 0 );
-    TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->tqlayout() );
+    gNumbering->layout()->setSpacing( 0 );
+    gNumbering->layout()->setMargin( 0 );
+    TQHBoxLayout *numberingGroupLayout = new TQHBoxLayout( gNumbering->layout() );
     numberingGroupLayout->setAlignment( TQt::AlignTop );
     numberingGroupLayout->setSpacing( KDialog::spacingHint() );
     numberingGroupLayout->setMargin( KDialog::marginHint() );
@@ -1770,9 +1770,9 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     gPosition = new TQGroupBox( this, "gPosition" );
     gPosition->setTitle( i18n( "Po&sition" ) );
     gPosition->setColumnLayout(0, Qt::Vertical );
-    gPosition->tqlayout()->setSpacing( 0 );
-    gPosition->tqlayout()->setMargin( 0 );
-    TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->tqlayout() );
+    gPosition->layout()->setSpacing( 0 );
+    gPosition->layout()->setMargin( 0 );
+    TQVBoxLayout* GroupBox2Layout = new TQVBoxLayout( gPosition->layout() );
     GroupBox2Layout->setAlignment( TQt::AlignTop );
     GroupBox2Layout->setSpacing( KDialog::spacingHint() );
     GroupBox2Layout->setMargin( KDialog::marginHint() );
@@ -1798,9 +1798,9 @@ KoParagTabulatorsWidget::KoParagTabulatorsWidget( KoUnit::Unit unit, double fram
     bgAlign = new TQButtonGroup( this );
     bgAlign->setTitle( i18n( "Alignment" ) );
     bgAlign->setColumnLayout(0, Qt::Vertical );
-    bgAlign->tqlayout()->setSpacing( 0 );
-    bgAlign->tqlayout()->setMargin( 0 );
-    TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->tqlayout() );
+    bgAlign->layout()->setSpacing( 0 );
+    bgAlign->layout()->setMargin( 0 );
+    TQVBoxLayout* ButtonGroup1Layout = new TQVBoxLayout( bgAlign->layout() );
     ButtonGroup1Layout->setAlignment( TQt::AlignTop );
     ButtonGroup1Layout->setSpacing( KDialog::spacingHint() );
     ButtonGroup1Layout->setMargin( KDialog::marginHint() );
@@ -2159,31 +2159,31 @@ KoParagDia::KoParagDia( TQWidget* parent, const char* name,
     {
         TQVBox * page = addVBoxPage( i18n( "Indent && S&pacing" ) );
         m_indentSpacingWidget = new KoIndentSpacingWidget( unit,_frameWidth,page, "indent-spacing" );
-        m_indentSpacingWidget->tqlayout()->setMargin(0);
+        m_indentSpacingWidget->layout()->setMargin(0);
     }
     if ( m_flags & PD_ALIGN )
     {
         TQVBox * page = addVBoxPage( i18n( "General &Layout" ) );
         m_alignWidget = new KoParagAlignWidget( breakLine, page, "align" );
-        m_alignWidget->tqlayout()->setMargin(0);
+        m_alignWidget->layout()->setMargin(0);
     }
     if ( m_flags & PD_DECORATION )
     {
         TQVBox * page = addVBoxPage( i18n( "D&ecorations" ) );
         m_decorationsWidget = new KoParagDecorationWidget( page, "decorations");
-        m_decorationsWidget->tqlayout()->setMargin(0);
+        m_decorationsWidget->layout()->setMargin(0);
     }
     if ( m_flags & PD_NUMBERING )
     {
         TQVBox * page = addVBoxPage( i18n( "B&ullets/Numbers" ) );
         m_counterWidget = new KoParagCounterWidget( disableAll , page, "numbers" );
-        m_counterWidget->tqlayout()->setMargin(0);
+        m_counterWidget->layout()->setMargin(0);
     }
     if ( m_flags & PD_TABS )
     {
         TQVBox * page = addVBoxPage( i18n( "&Tabulators" ) );
         m_tabulatorsWidget = new KoParagTabulatorsWidget( unit,_frameWidth, page, "tabs");
-        m_tabulatorsWidget->tqlayout()->setMargin(0);
+        m_tabulatorsWidget->layout()->setMargin(0);
     }
 
     connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT(slotReset()));