summaryrefslogtreecommitdiffstats
path: root/karbon
diff options
context:
space:
mode:
Diffstat (limited to 'karbon')
-rw-r--r--karbon/core/vgradient.cpp2
-rw-r--r--karbon/dockers/vdocumentdocker.cpp6
-rw-r--r--karbon/karbon_part.cpp4
-rw-r--r--karbon/karbon_resourceserver.cpp4
-rw-r--r--karbon/karbon_view.cpp8
-rw-r--r--karbon/tools/vtexttool.cpp2
-rw-r--r--karbon/widgets/vgradienttabwidget.cpp4
-rw-r--r--karbon/widgets/vgradientwidget.cpp2
-rw-r--r--karbon/widgets/vsmallpreview.cpp4
-rw-r--r--karbon/widgets/vstrokefillpreview.cpp2
10 files changed, 19 insertions, 19 deletions
diff --git a/karbon/core/vgradient.cpp b/karbon/core/vgradient.cpp
index 577d1373..1d8a6eaf 100644
--- a/karbon/core/vgradient.cpp
+++ b/karbon/core/vgradient.cpp
@@ -200,7 +200,7 @@ VGradient::saveOasis( KoGenStyles &mainStyles ) const
gradientStyle.addAttribute( "svg:spreadMethod", "pad" );
TQBuffer buffer;
buffer.open( IO_WriteOnly );
- KoXmlWriter elementWriter( TQT_TQIODEVICE(&buffer) ); // TODO pass indentation level
+ KoXmlWriter elementWriter( &buffer ); // TODO pass indentation level
// save stops
VColorStop* colorstop;
diff --git a/karbon/dockers/vdocumentdocker.cpp b/karbon/dockers/vdocumentdocker.cpp
index cf02d2cd..c999a059 100644
--- a/karbon/dockers/vdocumentdocker.cpp
+++ b/karbon/dockers/vdocumentdocker.cpp
@@ -175,7 +175,7 @@ VDocumentPreview::paintEvent( TQPaintEvent* )
{
delete m_docpixmap;
m_docpixmap = new TQPixmap( width(), height() );
- VKoPainter p( TQT_TQPAINTDEVICE(m_docpixmap), width(), height() );
+ VKoPainter p( m_docpixmap, width(), height() );
p.clear( TQColor( 195, 194, 193 ) );
p.setWorldMatrix( TQWMatrix( 1, 0, 0, -1, xoffset * scaleFactor, height() - yoffset * scaleFactor ) );
p.setZoomFactor( scaleFactor );
@@ -334,7 +334,7 @@ VObjectListViewItem::update()
// draw thumb preview (16x16)
TQPixmap preview;
preview.resize( 16, 16 );
- VKoPainter p( TQT_TQPAINTDEVICE(&preview), 16, 16, false );
+ VKoPainter p( &preview, 16, 16, false );
// Y mirroring
TQWMatrix mat;
mat.scale( 1, -1 );
@@ -390,7 +390,7 @@ VLayerListViewItem::update()
// draw thumb preview (16x16)
TQPixmap preview;
preview.resize( 16, 16 );
- VKoPainter p( TQT_TQPAINTDEVICE(&preview), 16, 16, false );
+ VKoPainter p( &preview, 16, 16, false );
// Y mirroring
TQWMatrix mat;
mat.scale( 1, -1 );
diff --git a/karbon/karbon_part.cpp b/karbon/karbon_part.cpp
index a34a4da1..e3abb201 100644
--- a/karbon/karbon_part.cpp
+++ b/karbon/karbon_part.cpp
@@ -377,7 +377,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
KTempFile contentTmpFile;
contentTmpFile.setAutoDelete( true );
TQFile* tmpFile = contentTmpFile.file();
- KoXmlWriter contentTmpWriter( TQT_TQIODEVICE(tmpFile), 1 );
+ KoXmlWriter contentTmpWriter( tmpFile, 1 );
contentTmpWriter.startElement( "office:body" );
contentTmpWriter.startElement( "office:drawing" );
@@ -398,7 +398,7 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
// And now we can copy over the contents from the tempfile to the real one
tmpFile->close();
- docWriter->addCompleteElement( TQT_TQIODEVICE(tmpFile) );
+ docWriter->addCompleteElement( tmpFile );
contentTmpFile.close();
docWriter->endElement(); // Root element
diff --git a/karbon/karbon_resourceserver.cpp b/karbon/karbon_resourceserver.cpp
index 2b31e4d7..c44d48e7 100644
--- a/karbon/karbon_resourceserver.cpp
+++ b/karbon/karbon_resourceserver.cpp
@@ -510,7 +510,7 @@ VClipartIconItem::VClipartIconItem( const VObject* clipart, double width, double
m_clipart->setState( VObject::normal );
m_pixmap.resize( 64, 64 );
- VKoPainter p( TQT_TQPAINTDEVICE(&m_pixmap), 64, 64 );
+ VKoPainter p( &m_pixmap, 64, 64 );
TQWMatrix mat( 64., 0, 0, 64., 0, 0 );
VTransformCmd trafo( 0L, mat );
@@ -524,7 +524,7 @@ VClipartIconItem::VClipartIconItem( const VObject* clipart, double width, double
p.end();
m_thumbPixmap.resize( 32, 32 );
- VKoPainter p2( TQT_TQPAINTDEVICE(&m_thumbPixmap), 32, 32 );
+ VKoPainter p2( &m_thumbPixmap, 32, 32 );
mat.setMatrix( 32., 0, 0, 32., 0, 0 );
trafo.setMatrix( mat );
diff --git a/karbon/karbon_view.cpp b/karbon/karbon_view.cpp
index 20e74fce..64fc0e53 100644
--- a/karbon/karbon_view.cpp
+++ b/karbon/karbon_view.cpp
@@ -177,8 +177,8 @@ KarbonView::KarbonView( KarbonPart* p, TQWidget* parent, const char* name )
// set up factory
m_painterFactory = new VPainterFactory;
- m_painterFactory->setPainter( TQT_TQPAINTDEVICE(canvasWidget()->pixmap()), width(), height() );
- m_painterFactory->setEditPainter( TQT_TQPAINTDEVICE(canvasWidget()->viewport()), width(), height() );
+ m_painterFactory->setPainter( canvasWidget()->pixmap(), width(), height() );
+ m_painterFactory->setEditPainter( canvasWidget()->viewport(), width(), height() );
if( shell() )
{
@@ -759,9 +759,9 @@ KarbonView::viewModeChanged()
canvasWidget()->pixmap()->fill();
if( m_viewAction->currentItem() == 1 )
- m_painterFactory->setWireframePainter( TQT_TQPAINTDEVICE(canvasWidget()->pixmap()), width(), height() );
+ m_painterFactory->setWireframePainter( canvasWidget()->pixmap(), width(), height() );
else
- m_painterFactory->setPainter( TQT_TQPAINTDEVICE(canvasWidget()->pixmap()), width(), height() );
+ m_painterFactory->setPainter( canvasWidget()->pixmap(), width(), height() );
m_canvas->repaintAll();
}
diff --git a/karbon/tools/vtexttool.cpp b/karbon/tools/vtexttool.cpp
index e7fa848d..e64a4cf9 100644
--- a/karbon/tools/vtexttool.cpp
+++ b/karbon/tools/vtexttool.cpp
@@ -112,7 +112,7 @@ ShadowPreview::paintEvent( TQPaintEvent* )
int a = 360 - m_parent->shadowAngle();
TQPixmap pm( w, h );
- VKoPainter p( TQT_TQPAINTDEVICE(&pm), w, h );
+ VKoPainter p( &pm, w, h );
VColor color( VColor::rgb );
VFill fill;
diff --git a/karbon/widgets/vgradienttabwidget.cpp b/karbon/widgets/vgradienttabwidget.cpp
index 5c57efab..1416262d 100644
--- a/karbon/widgets/vgradienttabwidget.cpp
+++ b/karbon/widgets/vgradienttabwidget.cpp
@@ -43,7 +43,7 @@ VGradientListItem::VGradientListItem( const VGradient& gradient, TQString filena
m_gradient = new VGradient( gradient );
m_pixmap.resize( 200, 16 );
- VKoPainter gp( TQT_TQPAINTDEVICE(&m_pixmap), m_pixmap.width(), m_pixmap.height() );
+ VKoPainter gp( &m_pixmap, m_pixmap.width(), m_pixmap.height() );
gp.setRasterOp( TQt::XorROP );
gp.newPath();
VGradient grad( *m_gradient );
@@ -114,7 +114,7 @@ VGradientPreview::~VGradientPreview()
void VGradientPreview::paintEvent( TQPaintEvent* )
{
TQPixmap pixmap( width(), height() );
- VKoPainter gp( TQT_TQPAINTDEVICE(&pixmap), width(), height() );
+ VKoPainter gp( &pixmap, width(), height() );
gp.setRasterOp( TQt::XorROP );
gp.newPath();
VGradient gradient( *m_gradient );
diff --git a/karbon/widgets/vgradientwidget.cpp b/karbon/widgets/vgradientwidget.cpp
index f76f1fed..0bc98b8e 100644
--- a/karbon/widgets/vgradientwidget.cpp
+++ b/karbon/widgets/vgradientwidget.cpp
@@ -96,7 +96,7 @@ void VGradientWidget::paintEvent( TQPaintEvent* )
int gh = h - ph; // gradient area height
TQPixmap pixmap( width(), height() );
- VKoPainter gp( TQT_TQPAINTDEVICE(&pixmap), width(), height() );
+ VKoPainter gp( &pixmap, width(), height() );
gp.setRasterOp( TQt::XorROP );
VGradient gradient( *m_gradient );
gradient.setType( VGradient::linear );
diff --git a/karbon/widgets/vsmallpreview.cpp b/karbon/widgets/vsmallpreview.cpp
index c422104e..b45ab1c6 100644
--- a/karbon/widgets/vsmallpreview.cpp
+++ b/karbon/widgets/vsmallpreview.cpp
@@ -97,7 +97,7 @@ VSmallPreview::drawFill( const VFill &f )
TQPixmap m_pixmap;
m_pixmap.resize( m_fillFrame->width(), m_fillFrame->height() );
- VKoPainter* m_painter = new VKoPainter( TQT_TQPAINTDEVICE(&m_pixmap), m_fillFrame->width(), m_fillFrame->height() );
+ VKoPainter* m_painter = new VKoPainter( &m_pixmap, m_fillFrame->width(), m_fillFrame->height() );
m_painter->begin();
m_painter->setPen( TQt::NoPen );
@@ -192,7 +192,7 @@ VSmallPreview::drawStroke( const VStroke &s )
TQPixmap m_pixmap;
m_pixmap.resize( m_fillFrame->width(), m_fillFrame->height() );
- VKoPainter* m_painter = new VKoPainter( TQT_TQPAINTDEVICE(&m_pixmap), m_fillFrame->width(), m_fillFrame->height() );
+ VKoPainter* m_painter = new VKoPainter( &m_pixmap, m_fillFrame->width(), m_fillFrame->height() );
m_painter->begin();
m_painter->setPen( TQt::NoPen );
diff --git a/karbon/widgets/vstrokefillpreview.cpp b/karbon/widgets/vstrokefillpreview.cpp
index c7b165f4..97fcb7c4 100644
--- a/karbon/widgets/vstrokefillpreview.cpp
+++ b/karbon/widgets/vstrokefillpreview.cpp
@@ -62,7 +62,7 @@ VStrokeFillPreview::VStrokeFillPreview(
installEventFilter( this );
m_pixmap.resize( int( PANEL_SIZEX ), int( PANEL_SIZEY ) );
- m_painter = new VKoPainter( TQT_TQPAINTDEVICE(&m_pixmap), uint( PANEL_SIZEX ), uint( PANEL_SIZEY ) );
+ m_painter = new VKoPainter( &m_pixmap, uint( PANEL_SIZEX ), uint( PANEL_SIZEY ) );
}
VStrokeFillPreview::~VStrokeFillPreview()
generated by cgit v1.2.1 (git 2.18.0) at 2025-01-12 06:26:08 +0000