TDE
/
tdegraphics
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 5

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3849f5c32c)
r14.1.x
Michele Calgaro 1 year ago
parent 1fe6cb7fd4
commit c9e40417ac
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
15 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

2
kcoloredit/paletteviewscrolledarea.cpp
Unescape View File

@ -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) {

4
kghostview/kpswidget.cpp
Unescape View File

@ -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 )

4
kolourpaint/kpdocument.cpp
Unescape View File

@ -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))

2
kolourpaint/kpdocumentsaveoptionswidget.cpp
Unescape View File

@ -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*/,

2
kolourpaint/kpselection.cpp
Unescape View File

@ -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);
}

8
kolourpaint/pixmapfx/kppixmapfx.cpp
Unescape View File

@ -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,

2
kpovmodeler/pmdialogeditbase.cpp
Unescape View File

@ -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 );

4
kpovmodeler/pmobjectdrag.cpp
Unescape View File

@ -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 )
{

2
kpovmodeler/pmparser.cpp
Unescape View File

@ -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( );

8
kpovmodeler/pmpart.cpp
Unescape View File

@ -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;

6
ksvg/core/KSVGLoader.cpp
Unescape View File

@ -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)
{

2
ksvg/impl/SVGScriptElementImpl.cpp
Unescape View File

@ -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();

4
ksvg/plugin/ksvg_plugin.cpp
Unescape View File

@ -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);
}

2
ksvg/plugin/svgcreator.cpp
Unescape View File

@ -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()));

2
ksvg/test/external/SVGTestWidget.cpp vendored
Unescape View File

@ -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;

Write Preview
Loading…
Cancel
Save