From 1aa0bb45dc0a8f890f1419d01ca3b9328ad03f4a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 24 Dec 2011 11:53:11 -0600 Subject: Rename a few stragglers --- kcoloredit/paletteviewscrolledarea.cpp | 2 +- kghostview/marklist.cpp | 2 +- kolourpaint/kpmainwindow_edit.cpp | 2 +- kpdf/ui/minibar.cpp | 6 +++--- kpdf/ui/pagepainter.cpp | 2 +- kpdf/ui/pageview.cpp | 8 ++++---- kpdf/ui/presentationwidget.cpp | 4 ++-- kpdf/ui/thumbnaillist.cpp | 4 ++-- kpovmodeler/pmdockwidget.cpp | 4 ++-- kviewshell/marklist.cpp | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp index d529b8d7..b0524ebf 100644 --- a/kcoloredit/paletteviewscrolledarea.cpp +++ b/kcoloredit/paletteviewscrolledarea.cpp @@ -251,7 +251,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) { painter.fillRect(0, 0, rowWidth, height(), TQBrush( TQFrame::palette().active().base() )); TQBrush normalBackgroundBrush(TQFrame::palette().active().background()); - TQBrush selectedBackgroundBrush(TQFrame::tqpalette().active().highlight()); + TQBrush selectedBackgroundBrush(TQFrame::palette().active().highlight()); TQBrush foregroundBrush; TQBrush cursorBrush(TQFrame::palette().active().foreground()); TQPen backgroundPen(TQFrame::palette().active().foreground()); diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp index ee91af25..9505b965 100644 --- a/kghostview/marklist.cpp +++ b/kghostview/marklist.cpp @@ -81,7 +81,7 @@ void MarkListItem::setPixmap( TQPixmap thumbnail ) void MarkListItem::setSelected( bool selected ) { if (selected) - setPaletteBackgroundColor( TQApplication::tqpalette().active().highlight() ); + setPaletteBackgroundColor( TQApplication::palette().active().highlight() ); else setPaletteBackgroundColor( _backgroundColor ); } diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp index cc9d5421..f7435eaa 100644 --- a/kolourpaint/kpmainwindow_edit.cpp +++ b/kolourpaint/kpmainwindow_edit.cpp @@ -311,7 +311,7 @@ static bool HasSomethingToPaste (kpMainWindow *mw) return hasSomething; } -// HACK: SYNC: Non-TQt apps do not cause TQApplication::tqclipboard() to +// HACK: SYNC: Non-TQt apps do not cause TQApplication::clipboard() to // emit dataChanged(). We don't want to have our paste // action disabled when we can actually paste something. // diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp index baa449af..eec74581 100644 --- a/kpdf/ui/minibar.cpp +++ b/kpdf/ui/minibar.cpp @@ -308,12 +308,12 @@ void ProgressWidget::paintEvent( TQPaintEvent * e ) // paint rects and a separator line TQPainter p( this ); if ( cRect.isValid() ) - p.fillRect( cRect, tqpalette().active().highlightedText() ); + p.fillRect( cRect, palette().active().highlightedText() ); if ( fRect.isValid() ) - p.fillRect( fRect, tqpalette().active().highlight() ); + p.fillRect( fRect, palette().active().highlight() ); if ( l && l != w ) { - p.setPen( tqpalette().active().highlight().dark( 120 ) ); + p.setPen( palette().active().highlight().dark( 120 ) ); int delta = TQApplication::reverseLayout() ? w - l : l; p.drawLine( delta, 0, delta, h ); } diff --git a/kpdf/ui/pagepainter.cpp b/kpdf/ui/pagepainter.cpp index f5b659b5..a4644c16 100644 --- a/kpdf/ui/pagepainter.cpp +++ b/kpdf/ui/pagepainter.cpp @@ -213,7 +213,7 @@ void PagePainter::paintPageOnPainter( const KPDFPage * page, int id, int flags, // 3. visually enchance links and images if requested if ( enhanceLinks || enhanceImages ) { - TQColor normalColor = TQApplication::tqpalette().active().highlight(); + TQColor normalColor = TQApplication::palette().active().highlight(); TQColor lightColor = normalColor.light( 140 ); // enlarging limits for intersection is like growing the 'rectGeometry' below TQRect limitsEnlarged = limits; diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index cf93db68..0029676e 100644 --- a/kpdf/ui/pageview.cpp +++ b/kpdf/ui/pageview.cpp @@ -618,7 +618,7 @@ void PageView::viewportPaintEvent( TQPaintEvent * pe ) if ( !selectionRect.isNull() && selectionRect.intersects( contentsRect ) && !selectionRectInternal.contains( contentsRect ) ) { - screenPainter.setPen( tqpalette().active().highlight().dark(110) ); + screenPainter.setPen( palette().active().highlight().dark(110) ); screenPainter.drawRect( selectionRect ); } // 4) Layer 3: overlays @@ -876,7 +876,7 @@ void PageView::contentsMouseMoveEvent( TQMouseEvent * e ) { d->aPrevAction = d->aMouseNormal; d->aMouseSelect->activate(); - TQColor selColor = tqpalette().active().highlight().light( 120 ); + TQColor selColor = palette().active().highlight().light( 120 ); selectionStart( e->x() + deltaX, e->y() + deltaY, selColor, false ); selectionEndPoint( e->x(), e->y() ); break; @@ -946,7 +946,7 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e ) case MouseZoom: // set first corner of the zoom rect if ( leftButton ) - selectionStart( e->x(), e->y(), tqpalette().active().highlight(), false ); + selectionStart( e->x(), e->y(), palette().active().highlight(), false ); else if ( rightButton ) updateZoom( ZoomOut ); break; @@ -954,7 +954,7 @@ void PageView::contentsMousePressEvent( TQMouseEvent * e ) case MouseSelect: // set first corner of the selection rect if ( leftButton ) { - TQColor selColor = tqpalette().active().highlight().light( 120 ); + TQColor selColor = palette().active().highlight().light( 120 ); selectionStart( e->x(), e->y(), selColor, false ); } break; diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index ada517d9..74800e88 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -690,9 +690,9 @@ void PresentationWidget::generateOverlay() // generate a 2 colors pixmap using mixing shadow (made with highlight color) // and image (made with highlightedText color) - TQColor color = tqpalette().active().highlightedText(); + TQColor color = palette().active().highlightedText(); int red = color.red(), green = color.green(), blue = color.blue(); - color = tqpalette().active().highlight(); + color = palette().active().highlight(); int sRed = color.red(), sGreen = color.green(), sBlue = color.blue(); // pointers unsigned int * data = (unsigned int *)image.bits(), diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp index 22819cb6..6c5e2b5f 100644 --- a/kpdf/ui/thumbnaillist.cpp +++ b/kpdf/ui/thumbnaillist.cpp @@ -495,9 +495,9 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e ) TQPainter p( this ); // draw the bottom label + highlight mark - TQColor fillColor = m_selected ? tqpalette().active().highlight() : tqpalette().active().base(); + TQColor fillColor = m_selected ? palette().active().highlight() : palette().active().base(); p.fillRect( 0, 0, width, height, fillColor ); - p.setPen( m_selected ? tqpalette().active().highlightedText() : tqpalette().active().text() ); + p.setPen( m_selected ? palette().active().highlightedText() : palette().active().text() ); p.drawText( 0, m_pixmapHeight + m_margin, width, m_labelHeight, TQt::AlignCenter, TQString::number( m_labelNumber ) ); // draw page outline and pixmap diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index 76aceb1f..caa72b4c 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -392,7 +392,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name ) layout->addWidget( stayButton ); layout->addWidget( closeButton ); layout->activate(); - drag->setFixedHeight( tqlayout->minimumSize().height() ); + drag->setFixedHeight( layout->minimumSize().height() ); } void PMDockWidgetHeader::setTopLevel( bool isTopLevel ) @@ -436,7 +436,7 @@ void PMDockWidgetHeader::setDragPanel( PMDockWidgetHeaderDrag* nd ) layout->addWidget( stayButton ); layout->addWidget( closeButton ); layout->activate(); - drag->setFixedHeight( tqlayout->minimumSize().height() ); + drag->setFixedHeight( layout->minimumSize().height() ); } void PMDockWidgetHeader::slotStayClicked() diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index bedbb6ad..65c671a1 100644 --- a/kviewshell/marklist.cpp +++ b/kviewshell/marklist.cpp @@ -217,7 +217,7 @@ void MarkListWidget::setChecked( bool checked ) void MarkListWidget::setSelected( bool selected ) { if (selected) - setPaletteBackgroundColor( TQApplication::tqpalette().active().highlight() ); + setPaletteBackgroundColor( TQApplication::palette().active().highlight() ); else setPaletteBackgroundColor( _backgroundColor ); } -- cgit v1.2.3