[Okular-devel] KDE/kdegraphics/okular
Pino Toscano
toscano.pino at tiscali.it
Mon Oct 8 18:46:52 CEST 2007
SVN commit 723046 by pino:
Rename the virtual closeDocument() to doCloseDocument(), and make it protected.
Added a non-virtual closeDocument() in the base Generator class: this way, particular closing routines can be implemented in the "low level" of a generator.
Apart the renaming, the logic of doCloseDocument() remains the same.
CCMAIL: okular-devel at kde.org
M +5 -0 core/generator.cpp
M +9 -1 core/generator.h
M +1 -1 core/textdocumentgenerator.cpp
M +1 -1 core/textdocumentgenerator.h
M +1 -1 generators/chm/generator_chm.cpp
M +1 -1 generators/chm/generator_chm.h
M +1 -1 generators/comicbook/generator_comicbook.cpp
M +1 -1 generators/comicbook/generator_comicbook.h
M +1 -1 generators/djvu/generator_djvu.cpp
M +1 -1 generators/djvu/generator_djvu.h
M +1 -1 generators/dvi/generator_dvi.cpp
M +1 -1 generators/dvi/generator_dvi.h
M +1 -1 generators/ghostview/generator_ghostview.cpp
M +3 -1 generators/ghostview/generator_ghostview.h
M +1 -1 generators/kimgio/generator_kimgio.cpp
M +1 -1 generators/kimgio/generator_kimgio.h
M +1 -1 generators/plucker/generator_plucker.cpp
M +3 -1 generators/plucker/generator_plucker.h
M +1 -1 generators/poppler/generator_pdf.cpp
M +1 -1 generators/poppler/generator_pdf.h
M +1 -1 generators/tiff/generator_tiff.cpp
M +1 -1 generators/tiff/generator_tiff.h
M +1 -1 generators/xps/generator_xps.cpp
M +2 -1 generators/xps/generator_xps.h
--- trunk/KDE/kdegraphics/okular/core/generator.cpp #723045:723046
@@ -123,6 +123,11 @@
return false;
}
+bool Generator::closeDocument()
+{
+ return doCloseDocument();
+}
+
bool Generator::canGeneratePixmap() const
{
Q_D( const Generator );
--- trunk/KDE/kdegraphics/okular/core/generator.h #723045:723046
@@ -233,7 +233,7 @@
*
* @returns true on success, false otherwise.
*/
- virtual bool closeDocument() = 0;
+ bool closeDocument();
/**
* This method returns whether the generator is ready to
@@ -392,6 +392,14 @@
void signalPixmapRequestDone( PixmapRequest * request );
/**
+ * This method is called when the document is closed and not used
+ * any longer.
+ *
+ * @returns true on success, false otherwise.
+ */
+ virtual bool doCloseDocument() = 0;
+
+ /**
* Returns the image of the page as specified in
* the passed pixmap @p request.
*
--- trunk/KDE/kdegraphics/okular/core/textdocumentgenerator.cpp #723045:723046
@@ -260,7 +260,7 @@
return true;
}
-bool TextDocumentGenerator::closeDocument()
+bool TextDocumentGenerator::doCloseDocument()
{
Q_D( TextDocumentGenerator );
delete d->mDocument;
--- trunk/KDE/kdegraphics/okular/core/textdocumentgenerator.h #723045:723046
@@ -130,7 +130,6 @@
// [INHERITED] load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
- bool closeDocument();
// [INHERITED] perform actions on document / pages
bool canGeneratePixmap() const;
@@ -147,6 +146,7 @@
const Okular::DocumentSynopsis* generateDocumentSynopsis();
protected:
+ bool doCloseDocument();
Okular::TextPage* textPage( Okular::Page *page );
private:
--- trunk/KDE/kdegraphics/okular/generators/chm/generator_chm.cpp #723045:723046
@@ -87,7 +87,7 @@
return true;
}
-bool CHMGenerator::closeDocument()
+bool CHMGenerator::doCloseDocument()
{
// delete the document information of the old document
delete m_docInfo;
--- trunk/KDE/kdegraphics/okular/generators/chm/generator_chm.h #723045:723046
@@ -31,7 +31,6 @@
CHMGenerator();
~CHMGenerator();
bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector );
- bool closeDocument();
const Okular::DocumentInfo * generateDocumentInfo();
const Okular::DocumentSynopsis * generateDocumentSynopsis();
@@ -46,6 +45,7 @@
void slotCompleted();
protected:
+ bool doCloseDocument();
Okular::TextPage* textPage( Okular::Page *page );
private:
--- trunk/KDE/kdegraphics/okular/generators/comicbook/generator_comicbook.cpp #723045:723046
@@ -52,7 +52,7 @@
return true;
}
-bool ComicBookGenerator::closeDocument()
+bool ComicBookGenerator::doCloseDocument()
{
return true;
}
--- trunk/KDE/kdegraphics/okular/generators/comicbook/generator_comicbook.h #723045:723046
@@ -24,12 +24,12 @@
// [INHERITED] load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
- bool closeDocument();
// [INHERITED] print document using already configured kprinter
bool print( KPrinter& printer );
protected:
+ bool doCloseDocument();
QImage image( Okular::PixmapRequest * request );
private:
--- trunk/KDE/kdegraphics/okular/generators/djvu/generator_djvu.cpp #723045:723046
@@ -99,7 +99,7 @@
return true;
}
-bool DjVuGenerator::closeDocument()
+bool DjVuGenerator::doCloseDocument()
{
userMutex()->lock();
m_djvu->closeFile();
--- trunk/KDE/kdegraphics/okular/generators/djvu/generator_djvu.h #723045:723046
@@ -28,7 +28,6 @@
DjVuGenerator();
~DjVuGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
- bool closeDocument();
// document information
const Okular::DocumentInfo * generateDocumentInfo();
@@ -40,6 +39,7 @@
QVariant metaData( const QString & key, const QVariant & option ) const;
protected:
+ bool doCloseDocument();
// pixmap generation
QImage image( Okular::PixmapRequest *request );
Okular::TextPage* textPage( Okular::Page *page );
--- trunk/KDE/kdegraphics/okular/generators/dvi/generator_dvi.cpp #723045:723046
@@ -55,7 +55,7 @@
return true;
}
-bool DviGenerator::closeDocument()
+bool DviGenerator::doCloseDocument()
{
delete m_docInfo;
m_docInfo = 0;
--- trunk/KDE/kdegraphics/okular/generators/dvi/generator_dvi.h #723045:723046
@@ -27,7 +27,6 @@
public:
DviGenerator();
bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector );
- bool closeDocument();
bool canGeneratePixmap() const;
void generatePixmap( Okular::PixmapRequest * request );
@@ -39,6 +38,7 @@
const Okular::DocumentSynopsis *generateDocumentSynopsis();
protected:
+ bool doCloseDocument();
Okular::TextPage* textPage( Okular::Page *page );
private:
--- trunk/KDE/kdegraphics/okular/generators/ghostview/generator_ghostview.cpp #723045:723046
@@ -199,7 +199,7 @@
return loadDocumentWithDSC(name,pagesVector,ps);
}
-bool GSGenerator::closeDocument()
+bool GSGenerator::doCloseDocument()
{
delete internalDoc;
internalDoc = 0;
--- trunk/KDE/kdegraphics/okular/generators/ghostview/generator_ghostview.h #723045:723046
@@ -29,7 +29,6 @@
/** virtual methods to reimplement **/
// load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector< Okular::Page * > & pagesVector );
- bool closeDocument();
// Document description and Table of contents
const Okular::DocumentInfo * generateDocumentInfo();
@@ -62,6 +61,9 @@
public slots:
void slotImageGenerated(QImage *img, Okular::PixmapRequest *request);
+ protected:
+ bool doCloseDocument();
+
private:
// conversion handling
bool m_converted;
--- trunk/KDE/kdegraphics/okular/generators/kimgio/generator_kimgio.cpp #723045:723046
@@ -100,7 +100,7 @@
return true;
}
-bool KIMGIOGenerator::closeDocument()
+bool KIMGIOGenerator::doCloseDocument()
{
m_img = QImage();
--- trunk/KDE/kdegraphics/okular/generators/kimgio/generator_kimgio.h #723045:723046
@@ -26,12 +26,12 @@
// [INHERITED] load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
bool loadDocumentFromData( const QByteArray & fileData, QVector<Okular::Page*> & pagesVector );
- bool closeDocument();
// [INHERITED] print document using already configured kprinter
bool print( KPrinter& printer );
protected:
+ bool doCloseDocument();
QImage image( Okular::PixmapRequest * request );
private slots:
--- trunk/KDE/kdegraphics/okular/generators/plucker/generator_plucker.cpp #723045:723046
@@ -94,7 +94,7 @@
return true;
}
-bool PluckerGenerator::closeDocument()
+bool PluckerGenerator::doCloseDocument()
{
mLinkAdded.clear();
mLinks.clear();
--- trunk/KDE/kdegraphics/okular/generators/plucker/generator_plucker.h #723045:723046
@@ -29,7 +29,6 @@
// [INHERITED] load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
- bool closeDocument();
// [INHERITED] document information
const Okular::DocumentInfo * generateDocumentInfo();
@@ -44,6 +43,9 @@
// [INHERITED] print document using already configured kprinter
bool print( KPrinter& printer );
+ protected:
+ bool doCloseDocument();
+
private:
QList<QTextDocument*> mPages;
QSet<int> mLinkAdded;
--- trunk/KDE/kdegraphics/okular/generators/poppler/generator_pdf.cpp #723045:723046
@@ -442,7 +442,7 @@
return true;
}
-bool PDFGenerator::closeDocument()
+bool PDFGenerator::doCloseDocument()
{
// remove internal objects
userMutex()->lock();
--- trunk/KDE/kdegraphics/okular/generators/poppler/generator_pdf.h #723045:723046
@@ -55,7 +55,6 @@
// [INHERITED] load a document and fill up the pagesVector
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
bool loadDocumentFromData( const QByteArray & fileData, QVector<Okular::Page*> & pagesVector );
- bool closeDocument();
void loadPages(QVector<Okular::Page*> &pagesVector, int rotation=-1, bool clear=false);
// [INHERITED] document information
const Okular::DocumentInfo * generateDocumentInfo();
@@ -89,6 +88,7 @@
KPrintDialogPage* printConfigurationWidget() const;
protected:
+ bool doCloseDocument();
Okular::TextPage* textPage( Okular::Page *page );
private slots:
--- trunk/KDE/kdegraphics/okular/generators/tiff/generator_tiff.cpp #723045:723046
@@ -86,7 +86,7 @@
return true;
}
-bool TIFFGenerator::closeDocument()
+bool TIFFGenerator::doCloseDocument()
{
// closing the old document
if ( d->tiff )
--- trunk/KDE/kdegraphics/okular/generators/tiff/generator_tiff.h #723045:723046
@@ -20,13 +20,13 @@
virtual ~TIFFGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
- bool closeDocument();
const Okular::DocumentInfo * generateDocumentInfo();
bool print( KPrinter& printer );
protected:
+ bool doCloseDocument();
QImage image( Okular::PixmapRequest * request );
private:
--- trunk/KDE/kdegraphics/okular/generators/xps/generator_xps.cpp #723045:723046
@@ -1376,7 +1376,7 @@
return true;
}
-bool XpsGenerator::closeDocument()
+bool XpsGenerator::doCloseDocument()
{
m_xpsFile->closeDocument();
delete m_xpsFile;
--- trunk/KDE/kdegraphics/okular/generators/xps/generator_xps.h #723045:723046
@@ -266,14 +266,15 @@
virtual ~XpsGenerator();
bool loadDocument( const QString & fileName, QVector<Okular::Page*> & pagesVector );
- bool closeDocument();
const Okular::DocumentInfo * generateDocumentInfo();
const Okular::DocumentSynopsis * generateDocumentSynopsis();
Okular::ExportFormat::List exportFormats() const;
bool exportTo( const QString &fileName, const Okular::ExportFormat &format );
+
protected:
+ bool doCloseDocument();
QImage image( Okular::PixmapRequest *page );
Okular::TextPage* textPage( Okular::Page * page );
More information about the Okular-devel
mailing list