diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-21 20:32:02 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-07-21 20:32:02 +0000 |
commit | 9f5bdadaf2a5f5fa2f52b138db6be1e5f8170df0 (patch) | |
tree | f366c37811cb351c5bcb4c1c572d08490e33544d /kmymoney2/mymoney | |
parent | 9010b8c89b9fc5218efd40b4f5c759bea394c806 (diff) | |
download | kmymoney-9f5bdadaf2a5f5fa2f52b138db6be1e5f8170df0.tar.gz kmymoney-9f5bdadaf2a5f5fa2f52b138db6be1e5f8170df0.zip |
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
Diffstat (limited to 'kmymoney2/mymoney')
-rw-r--r-- | kmymoney2/mymoney/storage/mymoneystoragexml.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp index e8b79fd..6290962 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp @@ -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; |