summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kcoloredit/paletteviewscrolledarea.cpp2
-rw-r--r--kghostview/kpswidget.cpp4
-rw-r--r--kolourpaint/kpdocument.cpp4
-rw-r--r--kolourpaint/kpdocumentsaveoptionswidget.cpp2
-rw-r--r--kolourpaint/kpselection.cpp2
-rw-r--r--kolourpaint/pixmapfx/kppixmapfx.cpp8
-rw-r--r--kpovmodeler/pmdialogeditbase.cpp2
-rw-r--r--kpovmodeler/pmobjectdrag.cpp4
-rw-r--r--kpovmodeler/pmparser.cpp2
-rw-r--r--kpovmodeler/pmpart.cpp8
-rw-r--r--ksvg/core/KSVGLoader.cpp6
-rw-r--r--ksvg/impl/SVGScriptElementImpl.cpp2
-rw-r--r--ksvg/plugin/ksvg_plugin.cpp4
-rw-r--r--ksvg/plugin/svgcreator.cpp2
-rw-r--r--ksvg/test/external/SVGTestWidget.cpp2
15 files changed, 27 insertions, 27 deletions
diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp
index 3a70aacc..3b4c7014 100644
--- a/kcoloredit/paletteviewscrolledarea.cpp
+++ b/kcoloredit/paletteviewscrolledarea.cpp
@@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) {
setCellsSizes();
TQPixmap pixmap(size());
TQPainter painter;
- painter.begin(TQT_TQPAINTDEVICE(&pixmap), this);
+ painter.begin(&pixmap, this);
TQFontMetrics fontMetrics = painter.fontMetrics();
int maxLineWidth;
if(viewColorNames) {
diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp
index cdce1dbb..b974bb41 100644
--- a/kghostview/kpswidget.cpp
+++ b/kghostview/kpswidget.cpp
@@ -279,8 +279,8 @@ void KPSWidget::setupWidget()
Q_ASSERT( orientation() != CDSC_ORIENT_UNKNOWN );
- const float dpiX = _magnification * TQT_TQPAINTDEVICE(this)->x11AppDpiX();
- const float dpiY = _magnification * TQT_TQPAINTDEVICE(this)->x11AppDpiY();
+ const float dpiX = _magnification * this->x11AppDpiX();
+ const float dpiY = _magnification * this->x11AppDpiY();
int newWidth = 0, newHeight = 0;
if( orientation() == CDSC_PORTRAIT || orientation() == CDSC_UPSIDEDOWN )
diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp
index 018dbb9c..2ba20cc3 100644
--- a/kolourpaint/kpdocument.cpp
+++ b/kolourpaint/kpdocument.cpp
@@ -686,7 +686,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
}
// Write to local temporary file.
- if (!savePixmapToDevice (pixmap, TQT_TQIODEVICE(atomicFileWriter.file ()),
+ if (!savePixmapToDevice (pixmap, atomicFileWriter.file (),
saveOptions, metaInfo,
false/*no lossy prompt*/,
parent))
@@ -746,7 +746,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
return false;
}
- if (!savePixmapToDevice (pixmap, TQT_TQIODEVICE(&file),
+ if (!savePixmapToDevice (pixmap, &file,
saveOptions, metaInfo,
false/*no lossy prompt*/,
parent))
diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp
index 21b8f11e..422ca416 100644
--- a/kolourpaint/kpdocumentsaveoptionswidget.cpp
+++ b/kolourpaint/kpdocumentsaveoptionswidget.cpp
@@ -898,7 +898,7 @@ void kpDocumentSaveOptionsWidget::updatePreview ()
TQBuffer buffer (data);
buffer.open (IO_WriteOnly);
kpDocument::savePixmapToDevice (*m_documentPixmap,
- TQT_TQIODEVICE(&buffer),
+ &buffer,
documentSaveOptions (),
m_documentMetaInfo,
false/*no lossy prompt*/,
diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp
index 8c0459bb..32434e9d 100644
--- a/kolourpaint/kpselection.cpp
+++ b/kolourpaint/kpselection.cpp
@@ -1435,7 +1435,7 @@ void kpSelection::flip (bool horiz, bool vert)
#if DEBUG_KP_SELECTION && 1
kdDebug () << "\thave transparency mask - flipping that" << endl;
#endif
- kpPixmapFX::flip (TQT_TQPIXMAP(&m_transparencyMask), horiz, vert);
+ kpPixmapFX::flip (&m_transparencyMask, horiz, vert);
}
diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp
index ac5fca44..cbc69b1d 100644
--- a/kolourpaint/pixmapfx/kppixmapfx.cpp
+++ b/kolourpaint/pixmapfx/kppixmapfx.cpp
@@ -694,9 +694,9 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
0, 0,
destRect.width (), destRect.height ());
#else
- bitBlt (TQT_TQPAINTDEVICE(destPixmapPtr),
+ bitBlt (destPixmapPtr,
destRect.x (), destRect.y (),
- TQT_TQPAINTDEVICE(const_cast<TQPixmap*>(&srcPixmap)),
+ const_cast<TQPixmap*>(&srcPixmap),
0, 0,
destRect.width (), destRect.height (),
TQt::CopyROP,
@@ -705,9 +705,9 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
if (srcPixmap.mask ())
{
TQBitmap mask = getNonNullMask (*destPixmapPtr);
- bitBlt (TQT_TQPAINTDEVICE(&mask),
+ bitBlt (&mask,
destRect.x (), destRect.y (),
- TQT_TQPAINTDEVICE(const_cast<TQBitmap*>(srcPixmap.mask ())),
+ const_cast<TQBitmap*>(srcPixmap.mask ()),
0, 0,
destRect.width (), destRect.height (),
TQt::CopyROP,
diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp
index 45b5c828..b958652c 100644
--- a/kpovmodeler/pmdialogeditbase.cpp
+++ b/kpovmodeler/pmdialogeditbase.cpp
@@ -390,7 +390,7 @@ void PMDialogEditBase::slotTexturePreview( )
buffer.open( IO_WriteOnly );
TQTextStream str( &buffer );
PMPovray31Format format;
- PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* dev = format.newSerializer( &buffer );
PMRenderMode mode;
PMObjectList neededDeclares, objectsToCheck;
TQPtrDict<PMObject> objectsToSerialize( 101 );
diff --git a/kpovmodeler/pmobjectdrag.cpp b/kpovmodeler/pmobjectdrag.cpp
index 23631df0..cd1ee6da 100644
--- a/kpovmodeler/pmobjectdrag.cpp
+++ b/kpovmodeler/pmobjectdrag.cpp
@@ -73,7 +73,7 @@ PMObjectDrag::PMObjectDrag( PMPart* part, PMObject* object, TQWidget* dragSource
TQBuffer buffer( data );
buffer.open( IO_WriteOnly );
- PMSerializer* ser = it.current( )->newSerializer( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* ser = it.current( )->newSerializer( &buffer );
if( ser )
{
@@ -143,7 +143,7 @@ PMObjectDrag::PMObjectDrag( PMPart* part, const PMObjectList& objList, TQWidget*
TQBuffer buffer( data );
buffer.open( IO_WriteOnly );
- PMSerializer* ser = fit.current( )->newSerializer( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* ser = fit.current( )->newSerializer( &buffer );
if( ser )
{
diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp
index ef921734..4a5f64b0 100644
--- a/kpovmodeler/pmparser.cpp
+++ b/kpovmodeler/pmparser.cpp
@@ -48,7 +48,7 @@ PMParser::PMParser( PMPart* part, const TQByteArray& array )
m_pPart = part;
TQBuffer* buffer = new TQBuffer( array );
buffer->open( IO_ReadOnly );
- m_pDevice = TQT_TQIODEVICE(buffer);
+ m_pDevice = buffer;
m_bDeviceCreated = true;
init( );
diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp
index 8198a9d7..452f2bac 100644
--- a/kpovmodeler/pmpart.cpp
+++ b/kpovmodeler/pmpart.cpp
@@ -951,7 +951,7 @@ bool PMPart::exportPovray( const KURL& url )
if( ok )
{
PMPovray35Format format;
- PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(file) );
+ PMSerializer* dev = format.newSerializer( file );
dev->serialize( m_pScene );
delete dev;
@@ -1369,7 +1369,7 @@ void PMPart::slotFileImport( )
TQFile file( fileName );
if( file.open( IO_ReadOnly ) )
{
- PMParser* newParser = selectedFormat->newParser( this, TQT_TQIODEVICE(&file) );
+ PMParser* newParser = selectedFormat->newParser( this, &file );
if( newParser )
{
if( m_pActiveObject )
@@ -1404,7 +1404,7 @@ void PMPart::slotFileExport( )
TQBuffer buffer( baData );
buffer.open( IO_WriteOnly );
- PMSerializer* newSer = selectedFormat->newSerializer( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* newSer = selectedFormat->newSerializer( &buffer );
if( newSer )
{
newSer->serialize( m_pScene );
@@ -2713,7 +2713,7 @@ void PMPart::slotRender( )
TQBuffer buffer( a );
buffer.open( IO_WriteOnly );
PMPovray35Format format;
- PMSerializer* dev = format.newSerializer( TQT_TQIODEVICE(&buffer) );
+ PMSerializer* dev = format.newSerializer( &buffer );
dev->serialize( m_pScene );
delete dev;
diff --git a/ksvg/core/KSVGLoader.cpp b/ksvg/core/KSVGLoader.cpp
index f075d2ff..91fdc0fb 100644
--- a/ksvg/core/KSVGLoader.cpp
+++ b/ksvg/core/KSVGLoader.cpp
@@ -128,14 +128,14 @@ void KSVGLoader::slotResult(TDEIO::Job *job)
if(check.contains(".svgz") || check.contains(".svg.gz"))
{
// decode the gzipped svg and emit it
- TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(new TQBuffer(m_data)), "application/x-gzip");
+ TQIODevice *dev = KFilterDev::device(new TQBuffer(m_data), "application/x-gzip");
dev->open(IO_ReadOnly);
emit gotResult(dev);
}
else
{
m_job = 0;
- emit gotResult(TQT_TQIODEVICE(new TQBuffer(m_data)));
+ emit gotResult(new TQBuffer(m_data));
m_data.resize(0);
}
}
@@ -162,7 +162,7 @@ void KSVGLoader::slotResult(TDEIO::Job *job)
if(buffer.open(IO_ReadOnly))
{
- const char *imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&buffer));
+ const char *imageFormat = TQImageIO::imageFormat(&buffer);
if(imageFormat != 0)
{
diff --git a/ksvg/impl/SVGScriptElementImpl.cpp b/ksvg/impl/SVGScriptElementImpl.cpp
index f97ebf89..cecf7fb2 100644
--- a/ksvg/impl/SVGScriptElementImpl.cpp
+++ b/ksvg/impl/SVGScriptElementImpl.cpp
@@ -95,7 +95,7 @@ void SVGScriptElementImpl::slotResult(TDEIO::Job *)
m_data[m_data.size() - 1] = '\0';
TQBuffer buf(m_data);
- TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(&buf), "application/x-gzip", false);
+ TQIODevice *dev = KFilterDev::device(&buf, "application/x-gzip", false);
TQByteArray contents;
if(dev->open(IO_ReadOnly))
contents = dev->readAll();
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 48cf6d56..6ad05900 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -110,7 +110,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const
if(!ksvgd->canvas)
return;
- ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window));
+ ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window);
ksvgd->zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection());
ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection());
@@ -299,7 +299,7 @@ void KSVGPlugin::slotRenderingBackend()
if(!ksvgd->canvas)
return;
- ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window));
+ ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window);
openURL(m_url);
}
diff --git a/ksvg/plugin/svgcreator.cpp b/ksvg/plugin/svgcreator.cpp
index 60328855..9eecc993 100644
--- a/ksvg/plugin/svgcreator.cpp
+++ b/ksvg/plugin/svgcreator.cpp
@@ -59,7 +59,7 @@ bool SVGCreator::create(const TQString &path, int width, int height, TQImage &im
pix.fill(TQt::white);
KSVG::KSVGCanvas *c = KSVG::CanvasFactory::self()->loadCanvas(width, height);
- c->setup(TQT_TQPAINTDEVICE(&pix), TQT_TQPAINTDEVICE(&pix));
+ c->setup(&pix, &pix);
doc->attach(c);
connect(doc, TQT_SIGNAL(finishedRendering()), TQT_SLOT(slotFinished()));
diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp
index 0e0d5f9d..a42d4da6 100644
--- a/ksvg/test/external/SVGTestWidget.cpp
+++ b/ksvg/test/external/SVGTestWidget.cpp
@@ -29,7 +29,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url)
if(!m_canvas)
return;
- m_canvas->setup(TQT_TQPAINTDEVICE(this), TQT_TQPAINTDEVICE(this));
+ m_canvas->setup(this, this);
if(!DocumentFactory::self()->attachCanvas(m_canvas, m_doc))
return;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 06:27:39 +0000