From 33b2a9cc7dc561872d96ef9f42d894497e2e7c42 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 8 Aug 2023 12:22:12 +0900 Subject: [PATCH] Drop TQT_TQ*_OBJECT defines Signed-off-by: Michele Calgaro --- kmail/filehtmlwriter.cpp | 2 +- kmail/kmcomposewin.cpp | 4 ++-- ktnef/gui/attachpropertydialog.cpp | 2 +- ktnef/lib/ktnefmessage.cpp | 2 +- libkcal/incidenceformatter.cpp | 2 +- libtdepim/kdateedit.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/kmail/filehtmlwriter.cpp b/kmail/filehtmlwriter.cpp index abad6420..8c74ebb6 100644 --- a/kmail/filehtmlwriter.cpp +++ b/kmail/filehtmlwriter.cpp @@ -96,7 +96,7 @@ namespace KMail { if ( !mFile.open( IO_WriteOnly ) ) kdWarning( 5006 ) << "FileHtmlWriter: Cannot open file " << mFile.name() << endl; else - mStream.setDevice( &TQT_TQIODEVICE_OBJECT(mFile) ); + mStream.setDevice( &mFile ); } void FileHtmlWriter::embedPart( const TQCString & contentId, const TQString & url ) { diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 9125f56f..86358906 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -3304,7 +3304,7 @@ void KMComposeWin::compressAttach( int idx ) msgPart = mAtmList.at( i ); TQByteArray array; TQBuffer dev( array ); - KZip zip( &TQT_TQIODEVICE_OBJECT(dev) ); + KZip zip( &dev ); TQByteArray decoded = msgPart->bodyDecodedBinary(); if ( ! zip.open( IO_WriteOnly ) ) { KMessageBox::sorry(0, i18n("KMail could not compress the file.") ); @@ -3383,7 +3383,7 @@ void KMComposeWin::uncompressAttach( int idx ) msgPart = mAtmList.at( i ); TQBuffer dev( msgPart->bodyDecodedBinary() ); - KZip zip( &TQT_TQIODEVICE_OBJECT(dev) ); + KZip zip( &dev ); TQByteArray decoded; decoded = msgPart->bodyDecodedBinary(); diff --git a/ktnef/gui/attachpropertydialog.cpp b/ktnef/gui/attachpropertydialog.cpp index 73b20871..f8d8ce12 100644 --- a/ktnef/gui/attachpropertydialog.cpp +++ b/ktnef/gui/attachpropertydialog.cpp @@ -178,7 +178,7 @@ TQPixmap loadRenderingPixmap( KTNEFPropertySet *pSet, const TQColor& bgColor ) { pix.resize( w, h ); pix.fill( bgColor ); - wmfLoader.paint( &TQT_TQPAINTDEVICE_OBJECT(pix) ); + wmfLoader.paint( &pix ); } wmfBuffer.close(); } diff --git a/ktnef/lib/ktnefmessage.cpp b/ktnef/lib/ktnefmessage.cpp index 27f98606..320ce411 100644 --- a/ktnef/lib/ktnefmessage.cpp +++ b/ktnef/lib/ktnefmessage.cpp @@ -76,7 +76,7 @@ TQString KTNEFMessage::rtfString() TQByteArray rtf; TQBuffer input( prop.asByteArray() ), output( rtf ); if ( input.open( IO_ReadOnly ) && output.open( IO_WriteOnly ) ) - lzfu_decompress( &TQT_TQIODEVICE_OBJECT(input), &TQT_TQIODEVICE_OBJECT(output) ); + lzfu_decompress( &input, &output ); return TQString( rtf ); } } diff --git a/libkcal/incidenceformatter.cpp b/libkcal/incidenceformatter.cpp index da3a7aae..785a681b 100644 --- a/libkcal/incidenceformatter.cpp +++ b/libkcal/incidenceformatter.cpp @@ -2837,7 +2837,7 @@ TQString IncidenceFormatter::msTNEFToVPart( const TQByteArray& tnef ) ICalFormat calFormat; Event* event = new Event(); - if( parser.openDevice( &TQT_TQIODEVICE_OBJECT(buf) ) ) { + if( parser.openDevice( &buf ) ) { KTNEFMessage* tnefMsg = parser.message(); //TQMap props = parser.message()->properties(); diff --git a/libtdepim/kdateedit.cpp b/libtdepim/kdateedit.cpp index dd6b4e48..392e53ee 100644 --- a/libtdepim/kdateedit.cpp +++ b/libtdepim/kdateedit.cpp @@ -286,7 +286,7 @@ bool KDateEdit::eventFilter( TQObject *object, TQEvent *event ) case TQEvent::MouseButtonDblClick: case TQEvent::MouseButtonPress: { TQMouseEvent *mouseEvent = (TQMouseEvent*)event; - if ( !TQT_TQRECT_OBJECT(mPopup->rect()).contains( mouseEvent->pos() ) ) { + if ( !mPopup->rect().contains( mouseEvent->pos() ) ) { TQPoint globalPos = mPopup->mapToGlobal( mouseEvent->pos() ); if ( TQApplication::widgetAt( globalPos, true ) == this ) { // The date picker is being closed by a click on the