diff options
Diffstat (limited to 'karbon/widgets')
| -rw-r--r-- | karbon/widgets/vcanvas.cc | 4 | ||||
| -rw-r--r-- | karbon/widgets/vgradienttabwidget.cc | 8 | ||||
| -rw-r--r-- | karbon/widgets/vgradientwidget.cc | 10 | ||||
| -rw-r--r-- | karbon/widgets/vruler.cc | 2 | ||||
| -rw-r--r-- | karbon/widgets/vstrokefillpreview.h | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc index d96018b9..d0a1b6b7 100644 --- a/karbon/widgets/vcanvas.cc +++ b/karbon/widgets/vcanvas.cc @@ -228,7 +228,7 @@ VCanvas::viewportPaintEvent( TQPaintEvent *e ) setYMirroring( p ); // TRICK : slightly adjust the matrix so libart AA looks better - TQWMatrix mat = p->tqworldMatrix(); + TQWMatrix mat = p->worldMatrix(); p->setWorldMatrix( mat.translate( -.5, -.5 ) ); // set up clippath @@ -305,7 +305,7 @@ VCanvas::drawDocument( TQPainter* /*painter*/, const KoRect&, bool drawVObjects p->setZoomFactor( m_view->zoom() ); setYMirroring( p ); // TRICK : slightly adjust the matrix so libart AA looks better - TQWMatrix mat = p->tqworldMatrix(); + TQWMatrix mat = p->worldMatrix(); p->setWorldMatrix( mat.translate( -.5, -.5 ) ); m_part->document().drawPage( p, m_part->pageLayout(), m_view->showPageMargins() ); diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc index f65cfd74..c90c655d 100644 --- a/karbon/widgets/vgradienttabwidget.cc +++ b/karbon/widgets/vgradienttabwidget.cc @@ -93,9 +93,9 @@ void VGradientListItem::paint( TQPainter* painter ) painter->drawPixmap( 0, 0, m_pixmap ); painter->restore(); if ( isSelected() ) - painter->setPen( listBox()->tqcolorGroup().highlightedText() ); + painter->setPen( listBox()->colorGroup().highlightedText() ); else - painter->setPen( listBox()->tqcolorGroup().base() ); + painter->setPen( listBox()->colorGroup().base() ); painter->drawRect( r ); painter->flush(); } // VGradientListItem::paint @@ -151,13 +151,13 @@ void VGradientPreview::paintEvent( TQPaintEvent* ) TQPainter p( &pixmap ); - p.setPen( tqcolorGroup().light() ); + p.setPen( colorGroup().light() ); p.moveTo( 1, height() - 1 ); p.lineTo( 1, 1 ); p.lineTo( width() - 1, 1 ); p.lineTo( width() - 1, height() - 1 ); p.lineTo( 1, height() - 1 ); - p.setPen( tqcolorGroup().dark() ); + p.setPen( colorGroup().dark() ); p.moveTo( 0, height() - 1 ); p.lineTo( 0, 0 ); p.lineTo( width() - 1, 0 ); diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc index f1c55ea1..7e9ecd75 100644 --- a/karbon/widgets/vgradientwidget.cc +++ b/karbon/widgets/vgradientwidget.cc @@ -117,7 +117,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) TQPainter p( &pixmap ); - p.setPen( tqcolorGroup().light() ); + p.setPen( colorGroup().light() ); // light frame around widget p.moveTo( 1, height() - 1 ); p.lineTo( 1, 1 ); @@ -129,7 +129,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) p.moveTo( 1, 3 + gh ); p.lineTo( width() - 1, 3 + gh ); - p.setPen( tqcolorGroup().dark() ); + p.setPen( colorGroup().dark() ); // left-top frame around widget p.moveTo( 0, height() - 1 ); p.lineTo( 0, 0 ); @@ -151,7 +151,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* ) m_pntArea.setRect( 2, height() - ph - 2, w, ph ); // clear point area - p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), tqcolorGroup().background() ); + p.fillRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height(), colorGroup().background() ); p.setClipRect( m_pntArea.x(), m_pntArea.y(), m_pntArea.width(), m_pntArea.height() ); p.translate( m_pntArea.x(), m_pntArea.y() ); @@ -244,7 +244,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) if( currentPoint % 2 == 1 ) { // ramp point hit -> change color - VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->tqtopLevelWidget() ); + VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( currentPoint / 2 )->color, this->topLevelWidget() ); if( d->exec() == TQDialog::Accepted ) { m_gradient->m_colorStops.at( currentPoint / 2 )->color = d->Color(); @@ -256,7 +256,7 @@ void VGradientWidget::mouseDoubleClickEvent( TQMouseEvent* e ) else if( currentPoint == 0 ) { // now point hit -> create new color stop - VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->tqtopLevelWidget() ); + VColorDlg* d = new VColorDlg( m_gradient->m_colorStops.at( 0 )->color, this->topLevelWidget() ); if( d->exec() == TQDialog::Accepted ) { m_gradient->addStop( d->Color(), (float)( e->x() - 2 ) / ( m_pntArea.width() ), 0.5 ); diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cc index de03eb23..0fd21cc1 100644 --- a/karbon/widgets/vruler.cc +++ b/karbon/widgets/vruler.cc @@ -188,7 +188,7 @@ void VRuler::drawRuler() p.begin(m_pixmapBuffer); p.setPen(TQColor(0x70, 0x70, 0x70)); - p.setBackgroundColor(tqcolorGroup().background()); + p.setBackgroundColor(colorGroup().background()); p.eraseRect(0, 0, m_pixmapBuffer -> width(), m_pixmapBuffer -> height()); switch (m_unit) { diff --git a/karbon/widgets/vstrokefillpreview.h b/karbon/widgets/vstrokefillpreview.h index 1790c9c9..53234b09 100644 --- a/karbon/widgets/vstrokefillpreview.h +++ b/karbon/widgets/vstrokefillpreview.h @@ -37,9 +37,9 @@ public: VStrokeFillPreview( KarbonPart *part, TQWidget* parent = 0L, const char* name = 0L ); ~VStrokeFillPreview(); - virtual TQSize tqsizeHint() const + virtual TQSize sizeHint() const { return TQSize( 50, 50 ); } - virtual TQSize tqminimumSizeHint() const + virtual TQSize minimumSizeHint() const { return TQSize( 20, 20 ); } virtual TQSizePolicy sizePolicy() const { return TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); } |