Changeset 574 for trunk/src

Timestamp:

Feb 17, 2010, 9:58:24 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

gui: Printing/CUPS: Fixed: Temporary files created by CUPS on request were not always deleted.

Location:

trunk/src/gui/painting

Files:

• qcups.cpp (modified) (1 diff)
• qpdf.cpp (modified) (1 diff)

trunk/src/gui/painting/qcups.cpp

@@ -377 +377 @@
     if (!isAvailable())
         return false;
-    return _cupsGetPPD(printerName) != 0;
+    const char *ppdFile = _cupsGetPPD(printerName);
+    if (ppdFile != 0)
+        unlink(ppdFile);
+    return ppdFile != 0;
 }
 

trunk/src/gui/painting/qpdf.cpp

@@ -1684 +1684 @@
         outDevice = new QFile();
         static_cast<QFile *>(outDevice)->open(ret.first, QIODevice::WriteOnly);
+        // save fd to get the temporary file closed in closePrintDevice()
+        fd = ret.first;
 #endif
 #ifndef QT_NO_LPR