From a84302cc767bcabbf01b8c76f61419f4a2ab4ff0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:31:39 -0600 Subject: Rename old tq methods that no longer need a unique name (cherry picked from commit 45f529de247fc4b3662f6b474abe03fe904306ec) --- kpdf/ui/minibar.cpp | 6 +++--- kpdf/ui/pagepainter.cpp | 2 +- kpdf/ui/pageview.cpp | 12 ++++++------ kpdf/ui/presentationwidget.cpp | 12 ++++++------ kpdf/ui/propertiesdialog.cpp | 4 ++-- kpdf/ui/thumbnaillist.h | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'kpdf/ui') diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp index db692703..3aa147a6 100644 --- a/kpdf/ui/minibar.cpp +++ b/kpdf/ui/minibar.cpp @@ -198,7 +198,7 @@ void MiniBar::notifyViewportChanged( bool /*smoothMove*/ ) void MiniBar::resizeEvent( TQResizeEvent * e ) { // auto-hide 'prev' and 'next' buttons if not enough space - const TQSize & myHint = tqminimumSizeHint(); + const TQSize & myHint = minimumSizeHint(); bool shown = m_prevButton->isVisible() && m_nextButton->isVisible(); if ( shown && e->size().width() < myHint.width() ) { @@ -208,7 +208,7 @@ void MiniBar::resizeEvent( TQResizeEvent * e ) } else if ( !shown ) { - int histeresis = m_prevButton->tqsizeHint().width() * 2 + 2; + int histeresis = m_prevButton->sizeHint().width() * 2 + 2; if ( e->size().width() > (myHint.width() + histeresis) ) { m_prevButton->show(); @@ -337,7 +337,7 @@ PagesEdit::PagesEdit( MiniBar * parent ) setValidator( m_validator ); // customize text properties - tqsetAlignment( TQt::AlignCenter ); + setAlignment( TQt::AlignCenter ); setMaxLength( 4 ); } diff --git a/kpdf/ui/pagepainter.cpp b/kpdf/ui/pagepainter.cpp index 21e9c37f..27a9626e 100644 --- a/kpdf/ui/pagepainter.cpp +++ b/kpdf/ui/pagepainter.cpp @@ -139,7 +139,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags, { case KpdfSettings::EnumRenderMode::Inverted: // Invert image pixels using TQImage internal function - backImage.tqinvertPixels(false); + backImage.invertPixels(false); break; case KpdfSettings::EnumRenderMode::Recolor: // Recolor image using KImageEffect::flatten with dither:0 diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index de5fad0c..b44b320c 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -592,7 +592,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe ) TQImage blendedImage = blendedPixmap.convertToImage(); KImageEffect::blend( selBlendColor.dark(140), blendedImage, 0.2 ); // copy the blended pixmap back to its place - pixmapPainter.tqdrawPixmap( blendRect.left(), blendRect.top(), blendedImage ); + pixmapPainter.drawPixmap( blendRect.left(), blendRect.top(), blendedImage ); } // draw border (red if the selection is too small) pixmapPainter.setPen( selBlendColor ); @@ -1105,16 +1105,16 @@ void PageView::contentsMouseReleaseEvent( TQMouseEvent * e ) for ( ; iIt != iEnd; ++iIt ) { PageViewItem * item = *iIt; - const TQRect & tqitemRect = item->tqgeometry(); - if ( selectionRect.intersects( tqitemRect ) ) + const TQRect & itemRect = item->tqgeometry(); + if ( selectionRect.intersects( itemRect ) ) { // request the textpage if there isn't one const KPDFPage * kpdfPage = item->page(); if ( !kpdfPage->hasSearchPage() ) d->document->requestTextPage( kpdfPage->number() ); - // grab text in the rect that intersects tqitemRect - TQRect relativeRect = selectionRect.intersect( tqitemRect ); - relativeRect.moveBy( -tqitemRect.left(), -tqitemRect.top() ); + // grab text in the rect that intersects itemRect + TQRect relativeRect = selectionRect.intersect( itemRect ); + relativeRect.moveBy( -itemRect.left(), -itemRect.top() ); NormalizedRect normRect( relativeRect, item->width(), item->height() ); selectedText += kpdfPage->getText( normRect ); } diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index d4e14b6a..ac3be93c 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -837,14 +837,14 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::BlindsHorizontal: { KPDFPageTransition transition( KPDFPageTransition::Blinds ); - transition.tqsetAlignment( KPDFPageTransition::Horizontal ); + transition.setAlignment( KPDFPageTransition::Horizontal ); return transition; break; } case KpdfSettings::EnumSlidesTransition::BlindsVertical: { KPDFPageTransition transition( KPDFPageTransition::Blinds ); - transition.tqsetAlignment( KPDFPageTransition::Vertical ); + transition.setAlignment( KPDFPageTransition::Vertical ); return transition; break; } @@ -896,7 +896,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::SplitHorizontalIn: { KPDFPageTransition transition( KPDFPageTransition::Split ); - transition.tqsetAlignment( KPDFPageTransition::Horizontal ); + transition.setAlignment( KPDFPageTransition::Horizontal ); transition.setDirection( KPDFPageTransition::Inward ); return transition; break; @@ -904,7 +904,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::SplitHorizontalOut: { KPDFPageTransition transition( KPDFPageTransition::Split ); - transition.tqsetAlignment( KPDFPageTransition::Horizontal ); + transition.setAlignment( KPDFPageTransition::Horizontal ); transition.setDirection( KPDFPageTransition::Outward ); return transition; break; @@ -912,7 +912,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::SplitVerticalIn: { KPDFPageTransition transition( KPDFPageTransition::Split ); - transition.tqsetAlignment( KPDFPageTransition::Vertical ); + transition.setAlignment( KPDFPageTransition::Vertical ); transition.setDirection( KPDFPageTransition::Inward ); return transition; break; @@ -920,7 +920,7 @@ const KPDFPageTransition PresentationWidget::defaultTransition( int type ) const case KpdfSettings::EnumSlidesTransition::SplitVerticalOut: { KPDFPageTransition transition( KPDFPageTransition::Split ); - transition.tqsetAlignment( KPDFPageTransition::Vertical ); + transition.setAlignment( KPDFPageTransition::Vertical ); transition.setDirection( KPDFPageTransition::Outward ); return transition; break; diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp index d9cee932..d49f28be 100644 --- a/kpdf/ui/propertiesdialog.cpp +++ b/kpdf/ui/propertiesdialog.cpp @@ -82,10 +82,10 @@ PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc) } // current width: left column + right column + dialog borders - int width = tqlayout->tqminimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30; + int width = tqlayout->minimumSize().width() + valMaxWidth + marginHint() + spacingHint() + marginHint() + 30; if (page2Layout) { - width = TQMAX( width, page2Layout->tqsizeHint().width() + marginHint() + spacingHint() + 31 ); + width = TQMAX( width, page2Layout->sizeHint().width() + marginHint() + spacingHint() + 31 ); } // stay inside the 2/3 of the screen width TQRect screenContainer = KGlobalSettings::desktopGeometry( this ); diff --git a/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h index 549ea20c..fb128045 100644 --- a/kpdf/ui/thumbnaillist.h +++ b/kpdf/ui/thumbnaillist.h @@ -102,7 +102,7 @@ class ThumbnailsBox : public TQVBox { public: ThumbnailsBox( TQWidget * parent ) : TQVBox( parent ) {}; - TQSize tqsizeHint() const { return TQSize(); } + TQSize sizeHint() const { return TQSize(); } }; /** -- cgit v1.2.1