From ed9bbddacee29d5048e41c2761586e80e6a91989 Mon Sep 17 00:00:00 2001
From: John Layt <john@layt.net>
Date: Thu, 24 Dec 2009 14:39:49 +0000
Subject: [PATCH] Print correct number of copies using new Qt api

Add eror code if print to file fails

BUG: 155695

svn path=/trunk/KDE/kdegraphics/okular/; revision=1065863
---
 core/fileprinter.cpp | 10 +++++++---
 core/fileprinter.h   |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/core/fileprinter.cpp b/core/fileprinter.cpp
index cbcec8949..e8d28303a 100644
--- a/core/fileprinter.cpp
+++ b/core/fileprinter.cpp
@@ -80,7 +80,11 @@ int FilePrinter::doPrintFiles( QPrinter &printer, QStringList fileList, FileDele
 
         if ( inputFileInfo.suffix() == outputFileInfo.suffix() ) {
             int res = QFile::copy( fileList[0], printer.outputFileName() );
-            if ( res ) ret = 0;
+            if ( res ) {
+                ret = 0;
+            } else {
+                ret = -5;
+            }
         } else if ( inputFileInfo.suffix() == "ps" && outputFileInfo.suffix() == "pdf" && ps2pdfAvailable() ) {
             exe = "ps2pdf";
             argList << fileList[0] << printer.outputFileName();
@@ -150,6 +154,7 @@ QList<int> FilePrinter::pageList( QPrinter &printer, int lastPage, const QList<i
     for (int i = startPage; i <= endPage; i++ ) {
         list << i;
     }
+
     return list;
 }
 
@@ -336,8 +341,7 @@ QStringList FilePrinter::destination( QPrinter &printer, const QString &version
 
 QStringList FilePrinter::copies( QPrinter &printer, const QString &version )
 {
-    // If CUPS will always return 1 regardless what the user chooses.
-    int cp = printer.numCopies();
+    int cp = printer.actualNumCopies();
 
     if ( version == "lp" ) {
         return QStringList("-n") << QString("%1").arg( cp );
diff --git a/core/fileprinter.h b/core/fileprinter.h
index 44ae13f7f..be791130d 100644
--- a/core/fileprinter.h
+++ b/core/fileprinter.h
@@ -63,6 +63,7 @@ public:
      *          -8 if empty file name
      *          -7 if unable to find file
      *          -6 if invalid printer state
+     *          -5 if print to file copy failed
      *          -2 if the KProcess could not be started
      *          -1 if the KProcess crashed
      *          otherwise the KProcess exit code
@@ -87,6 +88,7 @@ public:
      *          -8 if empty file list
      *          -7 if unable to find a file
      *          -6 if invalid printer state
+     *          -5 if print to file copy failed
      *          -2 if the KProcess could not be started
      *          -1 if the KProcess crashed
      *          otherwise the KProcess exit code