diff options
Diffstat (limited to 'kmymoney2/mymoney')
-rw-r--r-- | kmymoney2/mymoney/mymoneyaccount.cpp | 6 | ||||
-rw-r--r-- | kmymoney2/mymoney/storage/mymoneystoragexml.cpp | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp index d8139d3..ddf4b65 100644 --- a/kmymoney2/mymoney/mymoneyaccount.cpp +++ b/kmymoney2/mymoney/mymoneyaccount.cpp @@ -676,13 +676,13 @@ TQPixmap MyMoneyAccount::accountPixmap(bool reconcileFlag, int size) const TQPixmap result = DesktopIcon(icon, size); if(isClosed()) { TQPixmap ovly = DesktopIcon("account-types_closed", size); - bitBlt(TQT_TQPAINTDEVICE(&result), 0, 0, TQT_TQPAINTDEVICE(&ovly), 0, 0, ovly.width(), ovly.height(), TQt::CopyROP, false); + bitBlt(&result, 0, 0, &ovly, 0, 0, ovly.width(), ovly.height(), TQt::CopyROP, false); } else if(reconcileFlag) { TQPixmap ovly = DesktopIcon("account-types_reconcile.png", size); - bitBlt(TQT_TQPAINTDEVICE(&result), 0, 0, TQT_TQPAINTDEVICE(&ovly), 0, 0, ovly.width(), ovly.height(), TQt::CopyROP, false); + bitBlt(&result, 0, 0, &ovly, 0, 0, ovly.width(), ovly.height(), TQt::CopyROP, false); } else if(!onlineBankingSettings().value("provider").isEmpty()) { TQPixmap ovly = DesktopIcon("account-types_online.png", size); - bitBlt(TQT_TQPAINTDEVICE(&result), 0, 0, TQT_TQPAINTDEVICE(&ovly), 0, 0, ovly.width(), ovly.height(), TQt::CopyROP, false); + bitBlt(&result, 0, 0, &ovly, 0, 0, ovly.width(), ovly.height(), TQt::CopyROP, false); } return result; } diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp index d7f0b6d..a68515f 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp @@ -868,14 +868,14 @@ void MyMoneyStorageXML::signalProgress(int current, int total, const TQString& m */ TQByteArray TQIODevice::readAll() { - if ( TQT_TQIODEVICE(this)->isDirectAccess() ) { + if ( this->isDirectAccess() ) { // we know the size - int n = size()-TQT_TQIODEVICE(this)->at(); // ### fix for 64-bit or large files? + int n = size()-this->at(); // ### fix for 64-bit or large files? int totalRead = 0; TQByteArray ba( n ); char* c = ba.data(); while ( n ) { - int r = TQT_TQIODEVICE(this)->readBlock( c, n ); + int r = this->readBlock( c, n ); if ( r < 0 ) return TQByteArray(); n -= r; @@ -897,7 +897,7 @@ TQByteArray TQIODevice::readAll() int r = 1; while ( !atEnd() && r != 0) { ba.resize( nread + blocksize ); - r = TQT_TQIODEVICE(this)->readBlock( ba.data()+nread, blocksize ); + r = this->readBlock( ba.data()+nread, blocksize ); if ( r < 0 ) return TQByteArray(); nread += r; |