From ec0b68a75672ad2413fefbed81ebe08c46080bd7 Mon Sep 17 00:00:00 2001
From: Olivier CHURLAUD <olivier@churlaud.com>
Date: Wed, 13 Jul 2016 20:58:30 +0200
Subject: [PATCH] Update deprecated KArchive method + remove unused variable in
 generator_pdf

Reviewer: sandsmark
---
 core/document.cpp                    | 6 ++++--
 generators/poppler/generator_pdf.cpp | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/document.cpp b/core/document.cpp
index edef21bd7..a59d2ea33 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -4583,8 +4583,10 @@ bool Document::saveDocumentArchive( const QString &fileName )
         return false;
 
     const QByteArray contentDocXml = contentDoc.toByteArray();
-    okularArchive.writeFile( QStringLiteral("content.xml"), user.loginName(), userGroup.name(),
-                             contentDocXml.constData(), contentDocXml.length() );
+    const mode_t perm = 0100644;
+    okularArchive.writeFile( QStringLiteral("content.xml"), contentDocXml, perm,
+                              user.loginName(), userGroup.name() );
+
 
     okularArchive.addLocalFile( docPath, docFileName );
     okularArchive.addLocalFile( metadataFile.fileName(), QStringLiteral("metadata.xml") );
diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp
index 3b53f4191..6ace7167d 100644
--- a/generators/poppler/generator_pdf.cpp
+++ b/generators/poppler/generator_pdf.cpp
@@ -1773,6 +1773,7 @@ bool PDFGenerator::supportsOption( SaveOption option ) const
 
 bool PDFGenerator::save( const QString &fileName, SaveOptions options, QString *errorText )
 {
+    Q_UNUSED(errorText);
     Poppler::PDFConverter *pdfConv = pdfdoc->pdfConverter();
 
     pdfConv->setOutputFileName( fileName );