@@ -1,5 +1,5 @@ /* poppler-base-converter.cc: qt interface to poppler - * Copyright (C) 2007, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2007, 2009, Albert Astals Cid <aacid@kde.org> * Copyright (C) 2008, Pino Toscano <pino@kde.org> * * This program is free software; you can redistribute it and/or modify @@ -96,4 +96,10 @@ void BaseConverter::setOutputDevice(QIODevice *device) d->ownIodev = false; } +BaseConverter::Error BaseConverter::lastError() const +{ + Q_D(const BaseConverter); + return d->lastError; +} + } qt4/src/poppler-base-converter.cc @@ -1,5 +1,5 @@ /* poppler-converter-private.h: Qt4 interface to poppler - * Copyright (C) 2007, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2007, 2009, Albert Astals Cid <aacid@kde.org> * Copyright (C) 2008, Pino Toscano <pino@kde.org> * * This program is free software; you can redistribute it and/or modify @@ -41,6 +41,7 @@ class BaseConverterPrivate QString outputFileName; QIODevice *iodev; bool ownIodev : 1; + BaseConverter::Error lastError; }; } qt4/src/poppler-converter-private.h @@ -1,6 +1,6 @@ /* poppler-pdf-converter.cc: qt4 interface to poppler * Copyright (C) 2008, Pino Toscano <pino@kde.org> - * Copyright (C) 2008, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2008, 2009, Albert Astals Cid <aacid@kde.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -69,13 +69,20 @@ PDFConverter::PDFOptions PDFConverter::pdfOptions() const bool PDFConverter::convert() { Q_D(PDFConverter); + d->lastError = NoError; if (d->document->locked) + { + d->lastError = FileLockedError; return false; + } QIODevice *dev = d->openDevice(); if (!dev) + { + d->lastError = OpenOutputError; return false; + } bool deleteFile = false; if (QFile *file = qobject_cast<QFile*>(dev)) @@ -98,6 +105,8 @@ bool PDFConverter::convert() { qobject_cast<QFile*>(dev)->remove(); } + if (errorCode == errOpenFile) d->lastError = OpenOutputError; + else d->lastError = NotSupportedInputFileError; } return (errorCode == errNone); qt4/src/poppler-pdf-converter.cc @@ -1,5 +1,5 @@ /* poppler-document.cc: qt interface to poppler - * Copyright (C) 2007, Albert Astals Cid <aacid@kde.org> + * Copyright (C) 2007, 2009, Albert Astals Cid <aacid@kde.org> * Copyright (C) 2008, Pino Toscano <pino@kde.org> * * This program is free software; you can redistribute it and/or modify @@ -169,6 +169,7 @@ PSConverter::PSOptions PSConverter::psOptions() const bool PSConverter::convert() { Q_D(PSConverter); + d->lastError = NoError; Q_ASSERT(!d->pageList.isEmpty()); Q_ASSERT(d->paperWidth != -1); @@ -176,7 +177,10 @@ bool PSConverter::convert() QIODevice *dev = d->openDevice(); if (!dev) + { + d->lastError = OpenOutputError; return false; + } QByteArray pstitle8Bit = d->title.toLocal8Bit(); char* pstitlechar; qt4/src/poppler-ps-converter.cc @@ -1227,6 +1227,20 @@ QString subject = m_doc->info("Subject"); \return whether the conversion succeeded */ virtual bool convert() = 0; + + enum Error + { + NoError, + FileLockedError, + OpenOutputError, + NotSupportedInputFileError + }; + + /** + Returns the last error + \since 0.12.1 + */ + Error lastError() const; protected: /// \cond PRIVATE qt4/src/poppler-qt4.h bb21f825fcaa49e149cc7a7eb9c68f15f11fff1d Albert Astals Cid aacid@kde.org http://github.com/giddie/poppler-qt4-cairo-backend/commit/dbd5ba680d846d6a57e3fb7618a64202441c6e76 dbd5ba680d846d6a57e3fb7618a64202441c6e76 2009-10-16T15:50:43-07:00 2009-10-16T15:47:34-07:00 Add a way for converters to return more exact errors they had when converting 8f47729dcef81190a230c65f44e6993cae4ba778 Albert Astals Cid aacid@kde.org