Fix kmymoney FTBFS under Qt4 with a series of nasty hacks

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kmymoney@1242563 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 14 years ago
parent 9010b8c89b
commit 9f5bdadaf2

@ -865,16 +865,16 @@ void MyMoneyStorageXML::signalProgress(int current, int total, const TQString& m
atEnd() status in certain circumstances which caused our
application to lock at startup.
*/
TQByteArray TQIODevice::readAll()
QByteArray QIODevice::readAll()
{
if ( isDirectAccess() ) {
if ( TQT_TQIODEVICE(this)->isDirectAccess() ) {
// we know the size
int n = size()-at(); // ### fix for 64-bit or large files?
int n = size()-TQT_TQIODEVICE(this)->at(); // ### fix for 64-bit or large files?
int totalRead = 0;
TQByteArray ba( n );
char* c = ba.data();
while ( n ) {
int r = readBlock( c, n );
int r = TQT_TQIODEVICE(this)->readBlock( c, n );
if ( r < 0 )
return TQByteArray();
n -= r;
@ -896,7 +896,7 @@ TQByteArray TQIODevice::readAll()
int r = 1;
while ( !atEnd() && r != 0) {
ba.resize( nread + blocksize );
r = readBlock( ba.data()+nread, blocksize );
r = TQT_TQIODEVICE(this)->readBlock( ba.data()+nread, blocksize );
if ( r < 0 )
return TQByteArray();
nread += r;

Loading…
Cancel
Save