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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

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

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;

kmymoney2/plugins/ofximport/ofxpartner.cpp

@@ -396,7 +396,7 @@ OfxHttpRequest::OfxHttpRequest(const TQString& type, const KURL &url, const TQBy
       header.setValue(it.key(), *it);
     }
 
-    m_job->request(header, postData, TQT_TQIODEVICE(&f));
+    m_job->request(header, postData, &f);
 
     connect(m_job, TQT_SIGNAL(requestFinished(int, bool)),
             this, TQT_SLOT(slotOfxFinished(int, bool)));

kmymoney2/views/kmymoneyview.cpp

@@ -632,16 +632,16 @@ bool KMyMoneyView::readFile(const KURL& url)
         ::timetrace("detected GPG");
         if(KGPGFile::GPGAvailable()) {
           ::timetrace("have GPG");
-          qfile = TQT_TQIODEVICE(new KGPGFile(filename));
+          qfile = new KGPGFile(filename);
           haveAt = false;
           isEncrypted = true;
         } else {
           KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("GPG is not available for decryption of file <b>%1</b>").arg(filename)));
-          qfile = TQT_TQIODEVICE(new TQFile(file.name()));
+          qfile = new TQFile(file.name());
         }
       } else {
         // we can't use file directly, as we delete qfile later on
-        qfile = TQT_TQIODEVICE(new TQFile(file.name()));
+        qfile = new TQFile(file.name());
       }
 
       ::timetrace("open file");
@@ -969,7 +969,7 @@ bool KMyMoneyView::initializeStorage()
 
 void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter, bool plaintext, const TQString& keyList)
 {
-  TQIODevice *dev = TQT_TQIODEVICE(qfile);
+  TQIODevice *dev = qfile;
   KFilterBase *base = 0;
   TQIODevice *statusDevice = dev;
 
@@ -1027,7 +1027,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
       }
       MyMoneyFile::instance()->setValue("kmm-encryption-key", keyList);
     }
-    statusDevice = dev = TQT_TQIODEVICE(kgpg);
+    statusDevice = dev = kgpg;
     if(!dev || !dev->open(IO_WriteOnly)) {
       MyMoneyFile::instance()->blockSignals(blocked);
       delete dev;
@@ -1039,7 +1039,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
     base = KFilterBase::findFilterByMimeType( COMPRESSION_MIME_TYPE );
     if(base) {
       qfile->close();
-      base->setDevice(TQT_TQIODEVICE(qfile), false);
+      base->setDevice(qfile, false);
       // we need to reopen the file to set the mode inside the filter stuff
       dev = new KFilterDev(base, true);
       if(!dev || !dev->open(IO_WriteOnly)) {