From 3849f5c32c10eba032a6738fd47331c0fa6afe1c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 3 Dec 2023 00:48:24 +0900 Subject: Replaced various '#define' with actual strings - part 5 Signed-off-by: Michele Calgaro --- kolourpaint/kpdocument.cpp | 4 ++-- kolourpaint/kpdocumentsaveoptionswidget.cpp | 2 +- kolourpaint/kpselection.cpp | 2 +- kolourpaint/pixmapfx/kppixmapfx.cpp | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'kolourpaint') 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(&srcPixmap)), + const_cast(&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(srcPixmap.mask ())), + const_cast(srcPixmap.mask ()), 0, 0, destRect.width (), destRect.height (), TQt::CopyROP, -- cgit v1.2.1