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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit db4bf05cd96da34f3947fd7a554c6746e0b9bc42)

3 files changed, 10 insertions, 10 deletions

diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp
index 9f771d51..bcffbd21 100644
--- a/tdecachegrind/tdecachegrind/treemap.cpp
+++ b/tdecachegrind/tdecachegrind/treemap.cpp
@@ -2173,7 +2173,7 @@ void TreeMapWidget::drawTreeMap()
     _needsRefresh = 0;
   }
 
-  bitBlt( TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&_pixmap), 0, 0,
+  bitBlt( this, 0, 0, &_pixmap, 0, 0,
           TQWidget::width(), TQWidget::height(), CopyROP, true);
 
   if (hasFocus()) {
diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
index a012b703..7f3f8194 100644
--- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp
+++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp
@@ -99,7 +99,7 @@ TDEIO::Job* DocbookGenerator::generateDocbookForProjectInto(const KURL& destDir)
     KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(tmpfile.name()), i18n("Save Error"));
     return 0;
   }
-  umlDoc->saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
+  umlDoc->saveToXMI(file); // save the xmi stuff to it
   file.close();
   tmpfile.close();
 
diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp
index 7e0ba7ec..fd9eedb9 100644
--- a/umbrello/umbrello/umldoc.cpp
+++ b/umbrello/umbrello/umldoc.cpp
@@ -451,7 +451,7 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
                 newDocument();
                 return false;
             }
-            status = loadFromXMI( *TQT_TQIODEVICE(&xmi_file), ENC_UNKNOWN );
+            status = loadFromXMI( xmi_file, ENC_UNKNOWN );
 
             // close the extracted file and the temporary directory
             xmi_file.close();
@@ -476,9 +476,9 @@ bool UMLDoc::openDocument(const KURL& url, const char* /*format =0*/) {
             return false;
         }
         if (filetype.endsWith(".mdl"))
-            status = Import_Rose::loadFromMDL(*TQT_TQIODEVICE(&file));
+            status = Import_Rose::loadFromMDL(file);
         else
-            status = loadFromXMI( *TQT_TQIODEVICE(&file), ENC_UNKNOWN );
+            status = loadFromXMI( file, ENC_UNKNOWN );
     }
 
     file.close();
@@ -565,7 +565,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
             KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
-        saveToXMI(*TQT_TQIODEVICE(&file)); // save XMI to this file...
+        saveToXMI(file); // save XMI to this file...
         file.close(); // ...and close it
 
         // now add this file to the archive, but without the extension
@@ -620,7 +620,7 @@ bool UMLDoc::saveDocument(const KURL& url, const char * /* format */) {
             KMessageBox::error(0, i18n("There was a problem saving file: %1").arg(d.path()), i18n("Save Error"));
             return false;
         }
-        saveToXMI(*TQT_TQIODEVICE(&file)); // save the xmi stuff to it
+        saveToXMI(file); // save the xmi stuff to it
         file.close();
         tmpfile.close();
 
@@ -2148,7 +2148,7 @@ void UMLDoc::addToUndoStack() {
         buffer->open(IO_WriteOnly);
         TQDataStream* undoData = new TQDataStream();
         undoData->setDevice(buffer);
-        saveToXMI(*TQT_TQIODEVICE(buffer));
+        saveToXMI(*buffer);
         buffer->close();
         undoStack.prepend(undoData);
 
@@ -2196,7 +2196,7 @@ void UMLDoc::loadUndoData() {
     TQDataStream* undoData = undoStack.getFirst();
     TQBuffer* buffer = static_cast<TQBuffer*>( undoData->device() );
     buffer->open(IO_ReadOnly);
-    loadFromXMI(*TQT_TQIODEVICE(buffer));
+    loadFromXMI(*buffer);
     buffer->close();
 
     setModified(true, false);
@@ -2235,7 +2235,7 @@ void UMLDoc::loadRedoData() {
         redoStack.removeFirst();
         TQBuffer* buffer = static_cast<TQBuffer*>( redoData->device() );
         buffer->open(IO_ReadOnly);
-        loadFromXMI(*TQT_TQIODEVICE(buffer));
+        loadFromXMI(*buffer);
         buffer->close();
 
         setModified(true, false);