Rename obsolete tq methods to standard names

7 files changed, 24 insertions, 24 deletions

diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp
index 864291c5..baa449af 100644
--- a/kpdf/ui/minibar.cpp
+++ b/kpdf/ui/minibar.cpp
@@ -87,7 +87,7 @@ MiniBar::MiniBar( TQWidget * parent, KPDFDocument * document )
     TQSpacerItem * spacerL = new TQSpacerItem( 20, 10, TQSizePolicy::Expanding );
     horLayout->addItem( spacerL );
 
-    // central 2r by 3c grid tqlayout that contains all components
+    // central 2r by 3c grid layout that contains all components
     TQGridLayout * gridLayout = new TQGridLayout( 0, 3,5, 2,1 );
      // top spacer 6x6 px
 //     TQSpacerItem * spacerTop = new TQSpacerItem( 6, 6, TQSizePolicy::Fixed, TQSizePolicy::Fixed );
@@ -318,7 +318,7 @@ void ProgressWidget::paintEvent( TQPaintEvent * e )
         p.drawLine( delta, 0, delta, h );
     }
     // draw a frame-like outline
-    //p.setPen( tqpalette().active().mid() );
+    //p.setPen( palette().active().mid() );
     //p.drawRect( 0,0, w, h );
 }
 
@@ -372,7 +372,7 @@ void PagesEdit::focusOutEvent( TQFocusEvent * e )
 {
     // change background color to a dark tone
     setLineWidth( 1 );
-    setPaletteBackgroundColor( tqpalette().active().background().light( 105 ) );
+    setPaletteBackgroundColor( palette().active().background().light( 105 ) );
     // restore text
     TQLineEdit::setText( backString );
     // call default handler
@@ -428,7 +428,7 @@ void HoverButton::paintEvent( TQPaintEvent * e )
     else
     {
         TQPainter p( this );
-        p.fillRect(e->rect(), parentWidget() ? parentWidget()->tqpalette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
+        p.fillRect(e->rect(), parentWidget() ? parentWidget()->palette().brush(TQPalette::Active, TQColorGroup::Background) : paletteBackgroundColor());
         drawButtonLabel( &p );
     }
 }
diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index b0b9da30..cf93db68 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -68,7 +68,7 @@ public:
     TQValueVector< PageViewItem * > items;
     TQValueList< PageViewItem * > visibleItems;
 
-    // view tqlayout (columns and continuous in Settings), zoom and mouse
+    // view layout (columns and continuous in Settings), zoom and mouse
     PageView::ZoomMode zoomMode;
     float zoomFactor;
     int rotation;
@@ -392,7 +392,7 @@ void PageView::notifyViewportChanged( bool smoothMove )
         return;
     }
 
-    // retqlayout in "Single Pages" mode or if a retqlayout is pending
+    // relayout in "Single Pages" mode or if a relayout is pending
     d->blockPixmapsRequest = true;
     if ( !KpdfSettings::viewContinuous() || d->dirtyLayout )
         slotRelayoutPages();
@@ -1147,7 +1147,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
                 if ( choice == 3 )
                 {
                     // [2] copy pixmap to clipboard
-                    TQClipboard *cb = TQApplication::tqclipboard();
+                    TQClipboard *cb = TQApplication::clipboard();
                     cb->setPixmap( copyPix, TQClipboard::Clipboard );
                     if ( cb->supportsSelection() )
                         cb->setPixmap( copyPix, TQClipboard::Selection );
@@ -1175,7 +1175,7 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e )
                 if ( choice == 1 )
                 {
                     // [1] copy text to clipboard
-                    TQClipboard *cb = TQApplication::tqclipboard();
+                    TQClipboard *cb = TQApplication::clipboard();
                     cb->setText( selectedText, TQClipboard::Clipboard );
                     if ( cb->supportsSelection() )
                         cb->setText( selectedText, TQClipboard::Selection );
@@ -1544,7 +1544,7 @@ void PageView::updateZoom( ZoomMode newZoomMode )
 
     if ( newZoomMode != d->zoomMode || (newZoomMode == ZoomFixed && newFactor != d->zoomFactor ) )
     {
-        // rebuild tqlayout and update the whole viewport
+        // rebuild layout and update the whole viewport
         d->zoomMode = newZoomMode;
         d->zoomFactor = newFactor;
         // be sure to block updates to document's viewport
diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp
index 27565753..ce657882 100644
--- a/kpdf/ui/pageviewutils.cpp
+++ b/kpdf/ui/pageviewutils.cpp
@@ -27,7 +27,7 @@ PageViewMessage::PageViewMessage( TQWidget * parent )
     setFocusPolicy( TQ_NoFocus );
     setBackgroundMode( NoBackground );
     setPaletteBackgroundColor(kapp->palette().color(TQPalette::Active, TQColorGroup::Background));
-    // if the tqlayout is LtR, we can safely place it in the right position
+    // if the layout is LtR, we can safely place it in the right position
     if ( !TQApplication::reverseLayout() )
         move( 10, 10 );
     resize( 0, 0 );
@@ -116,7 +116,7 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
     bufferPainter.setPen( foregroundColor() );
     bufferPainter.drawText( 5 + textXOffset, yText, message );
 
-    // if the tqlayout is RtL, we can move it to the right place only after we
+    // if the layout is RtL, we can move it to the right place only after we
     // know how much size it will take
     if ( TQApplication::reverseLayout() )
         move( parentWidget()->width() - geometry.width() - 10, 10 );
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 12ebe96d..ada517d9 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -314,7 +314,7 @@ void PresentationWidget::paintEvent( TQPaintEvent * pe )
         m_topBar->alignItemRight( 1 );
         m_topBar->hide();
         // change topbar background color
-        TQPalette p = m_topBar->tqpalette();
+        TQPalette p = m_topBar->palette();
         p.setColor( TQPalette::Active, TQColorGroup::Button, TQt::gray );
         p.setColor( TQPalette::Active, TQColorGroup::Background, TQt::darkGray );
         m_topBar->setPalette( p );
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index 06521692..718a0635 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -24,12 +24,12 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
 {
   // Properties
   TQFrame *page = addPage(i18n("Properties"));
-  TQGridLayout *tqlayout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
+  TQGridLayout *layout = new TQGridLayout( page, 2, 2, marginHint(), spacingHint() );
 
   // get document info, if not present display blank data and a warning
   const DocumentInfo * info = doc->documentInfo();
   if ( !info ) {
-    tqlayout->addWidget( new TQLabel( i18n( "No document opened." ), page ), 0, 0 );
+    layout->addWidget( new TQLabel( i18n( "No document opened." ), page ), 0, 0 );
     return;
   }
 
@@ -49,11 +49,11 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
     if ( titleString.isEmpty() || valueString.isEmpty() )
         continue;
 
-    // create labels and tqlayout them
+    // create labels and layout them
     TQLabel *key = new TQLabel( i18n( "%1:" ).arg( titleString ), page );
     TQLabel *value = new KSqueezedTextLabel( valueString, page );
-    tqlayout->addWidget( key, row, 0, AlignRight );
-    tqlayout->addWidget( value, row, 1 );
+    layout->addWidget( key, row, 0, AlignRight );
+    layout->addWidget( value, row, 1 );
     row++;
 
     // refine maximum width of 'value' labels
@@ -66,8 +66,8 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
     TQLabel *key = new TQLabel( i18n( "Pages:" ), page );
     TQLabel *value = new TQLabel( TQString::number( doc->pages() ), page );
 
-    tqlayout->addWidget( key, row, 0 );
-    tqlayout->addWidget( value, row, 1 );
+    layout->addWidget( key, row, 0 );
+    layout->addWidget( value, row, 1 );
   }
 
   // Fonts
@@ -82,7 +82,7 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
   }
 
   // current width: left column + right column + dialog borders
-  int width = tqlayout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
+  int width = layout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30;
   if (page2Layout)
   {
     width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 );
diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp
index 7ca3ba49..f21d8b73 100644
--- a/kpdf/ui/searchwidget.cpp
+++ b/kpdf/ui/searchwidget.cpp
@@ -79,10 +79,10 @@ void SearchWidget::clearText()
 void SearchWidget::slotTextChanged( const TQString & text )
 {
     // if 0<length<3 set 'red' text and send a blank string to document
-    TQColor color = text.length() > 0 && text.length() < 3 ? TQt::darkRed : tqpalette().active().text();
+    TQColor color = text.length() > 0 && text.length() < 3 ? TQt::darkRed : palette().active().text();
     KLineEdit * lineEdit = getLined( LEDIT_ID );
     lineEdit->setPaletteForegroundColor( color );
-    lineEdit->setPaletteBackgroundColor( tqpalette().active().base() );
+    lineEdit->setPaletteBackgroundColor( palette().active().base() );
     m_inputDelayTimer->stop();
     m_inputDelayTimer->start(333, true);
 }
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index 8f9359b5..22819cb6 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -82,7 +82,7 @@ ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document )
 	setDragAutoScroll( false );
 
 	// set contents background to the 'base' color
-	viewport()->setPaletteBackgroundColor( tqpalette().active().base() );
+	viewport()->setPaletteBackgroundColor( palette().active().base() );
 
 	setFrameStyle( StyledPanel | Raised );
 	connect( this, TQT_SIGNAL(contentsMoving(int, int)), this, TQT_SLOT(slotRequestVisiblePixmaps(int, int)) );
@@ -509,7 +509,7 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e )
         p.setPen( isBookmarked ? TQColor( 0xFF8000 ) : TQt::black );
         p.drawRect( m_margin/2 - 1, m_margin/2 - 1, m_pixmapWidth + 2, m_pixmapHeight + 2 );
         // draw the clear rect
-        p.setPen( isBookmarked ? TQColor( 0x804000 ) : tqpalette().active().base() );
+        p.setPen( isBookmarked ? TQColor( 0x804000 ) : palette().active().base() );
         // draw the bottom and right shadow edges
         if ( !isBookmarked )
         {