diff --git a/aboutdata.h b/aboutdata.h index 8e1999a84..97d974693 100644 --- a/aboutdata.h +++ b/aboutdata.h @@ -14,6 +14,8 @@ #include "core/version.h" +#include + inline KAboutData okularAboutData() { KAboutData about( diff --git a/core/document.cpp b/core/document.cpp index fa3127966..a07e6de63 100644 --- a/core/document.cpp +++ b/core/document.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -50,7 +51,6 @@ #include #include #include -#include #include #include @@ -108,8 +108,8 @@ struct ArchiveData { } - KTemporaryFile document; - KTemporaryFile metadataFile; + QTemporaryFile document; + QTemporaryFile metadataFile; }; struct RunningSearch @@ -962,7 +962,7 @@ Document::OpenResult DocumentPrivate::openDocumentInternal( const KService::Ptr& } else { - m_tempFile = new KTemporaryFile(); + m_tempFile = new QTemporaryFile(); if ( !m_tempFile->open() ) { delete m_tempFile; @@ -1002,7 +1002,7 @@ Document::OpenResult DocumentPrivate::openDocumentInternal( const KService::Ptr& return openResult; } -bool DocumentPrivate::savePageDocumentInfo( KTemporaryFile *infoFile, int what ) const +bool DocumentPrivate::savePageDocumentInfo( QTemporaryFile *infoFile, int what ) const { if ( infoFile->open() ) { @@ -4190,7 +4190,7 @@ Document::OpenResult Document::openDocumentArchive( const QString & docFile, con std::auto_ptr< ArchiveData > archiveData( new ArchiveData() ); const int dotPos = documentFileName.indexOf( '.' ); if ( dotPos != -1 ) - archiveData->document.setSuffix( documentFileName.mid( dotPos ) ); + archiveData->document.setFileTemplate(QDir::tempPath() + QLatin1String("/okular_XXXXXX") + documentFileName.mid(dotPos)); if ( !archiveData->document.open() ) return OpenError; @@ -4205,7 +4205,7 @@ Document::OpenResult Document::openDocumentArchive( const QString & docFile, con if ( metadataEntry && metadataEntry->isFile() ) { std::auto_ptr< QIODevice > metadataEntryDevice( static_cast< const KZipFileEntry * >( metadataEntry )->createDevice() ); - archiveData->metadataFile.setSuffix( ".xml" ); + archiveData->metadataFile.setFileTemplate(QDir::tempPath() + QLatin1String("/okular_XXXXXX.xml")); if ( archiveData->metadataFile.open() ) { copyQIODevice( metadataEntryDevice.get(), &archiveData->metadataFile ); @@ -4276,7 +4276,7 @@ bool Document::saveDocumentArchive( const QString &fileName ) metadataFileNameNode.appendChild( contentDoc.createTextNode( "metadata.xml" ) ); // If the generator can save annotations natively, do it - KTemporaryFile modifiedFile; + QTemporaryFile modifiedFile; bool annotationsSavedNatively = false; if ( d->canAddAnnotationsNatively() ) { @@ -4298,7 +4298,7 @@ bool Document::saveDocumentArchive( const QString &fileName ) } } - KTemporaryFile metadataFile; + QTemporaryFile metadataFile; PageItems saveWhat = annotationsSavedNatively ? None : AnnotationPageItems; if ( !d->savePageDocumentInfo( &metadataFile, saveWhat ) ) return false; diff --git a/core/document_p.h b/core/document_p.h index 51632ecc7..0ed4e3f91 100644 --- a/core/document_p.h +++ b/core/document_p.h @@ -32,7 +32,7 @@ class QUndoStack; class QEventLoop; class QFile; class QTimer; -class KTemporaryFile; +class QTemporaryFile; struct AllocatedPixmap; struct ArchiveData; @@ -129,7 +129,7 @@ class DocumentPrivate ConfigInterface* generatorConfig( GeneratorInfo& info ); SaveInterface* generatorSave( GeneratorInfo& info ); Document::OpenResult openDocumentInternal( const KService::Ptr& offer, bool isstdin, const QString& docFile, const QByteArray& filedata, const QString& password ); - bool savePageDocumentInfo( KTemporaryFile *infoFile, int what ) const; + bool savePageDocumentInfo( QTemporaryFile *infoFile, int what ) const; DocumentViewport nextDocumentViewport() const; void notifyAnnotationChanges( int page ); bool canAddAnnotationsNatively() const; @@ -198,7 +198,7 @@ class DocumentPrivate // cached stuff QString m_docFileName; QString m_xmlFileName; - KTemporaryFile *m_tempFile; + QTemporaryFile *m_tempFile; qint64 m_docSize; // viewport stuff diff --git a/generators/djvu/generator_djvu.cpp b/generators/djvu/generator_djvu.cpp index 9338cf5f4..5190965fa 100644 --- a/generators/djvu/generator_djvu.cpp +++ b/generators/djvu/generator_djvu.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include static void recurseCreateTOC( QDomDocument &maindoc, const QDomNode &parent, QDomNode &parentDestination, KDjVu *djvu ) { @@ -186,8 +186,7 @@ bool DjVuGenerator::print( QPrinter& printer ) bool result = false; // Create tempfile to write to - KTemporaryFile tf; - tf.setSuffix( ".ps" ); + QTemporaryFile tf(QDir::tempPath() + QLatin1String("/okular_XXXXXX.ps")); if ( !tf.open() ) return false; diff --git a/generators/dvi/dviexport.cpp b/generators/dvi/dviexport.cpp index 32f079492..c8db452b7 100644 --- a/generators/dvi/dviexport.cpp +++ b/generators/dvi/dviexport.cpp @@ -220,7 +220,7 @@ DVIExportToPS::DVIExportToPS(dviRenderer& parent, if (!options.isEmpty() || dvi.suggestedPageSize != 0) { // Get a name for a temporary file. // Must open the QTemporaryFile to access the name. - KTemporaryFile tmpfile; + QTemporaryFile tmpfile; tmpfile.setAutoRemove(false); tmpfile.open(); tmpfile_name_ = tmpfile.fileName(); diff --git a/generators/dvi/generator_dvi.cpp b/generators/dvi/generator_dvi.cpp index 1690e90ff..0d555d4ec 100644 --- a/generators/dvi/generator_dvi.cpp +++ b/generators/dvi/generator_dvi.cpp @@ -25,16 +25,17 @@ #include "TeXFont.h" #include +#include #include #include #include #include +#include #include #include #include #include -#include #ifdef DVI_OPEN_BUSYLOOP #ifdef Q_OS_UNIX @@ -548,8 +549,7 @@ void DviGenerator::loadPages( QVector< Okular::Page * > &pagesVector ) bool DviGenerator::print( QPrinter& printer ) { // Create tempfile to write to - KTemporaryFile tf; - tf.setSuffix( ".ps" ); + QTemporaryFile tf(QDir::tempPath() + QLatin1String("/okular_XXXXXX.ps" )); if ( !tf.open() ) return false; diff --git a/generators/dvi/psgs.cpp b/generators/dvi/psgs.cpp index 3b0b9a2c4..13117c47f 100644 --- a/generators/dvi/psgs.cpp +++ b/generators/dvi/psgs.cpp @@ -160,9 +160,8 @@ void ghostscript_interface::gs_generate_graphics_file(const PageNumber& page, co // Generate a PNG-file // Step 1: Write the PostScriptString to a File - KTemporaryFile PSfile; + QTemporaryFile PSfile(QDir::tempPath() + QLatin1String("/okular_XXXXXX.ps")); PSfile.setAutoRemove(false); - PSfile.setSuffix(".ps"); PSfile.open(); const QString PSfileName = PSfile.fileName(); diff --git a/generators/poppler/generator_pdf.cpp b/generators/poppler/generator_pdf.cpp index 2b8a9e581..4140a5555 100644 --- a/generators/poppler/generator_pdf.cpp +++ b/generators/poppler/generator_pdf.cpp @@ -14,22 +14,23 @@ // qt/kde includes #include #include +#include #include #include #include #include #include #include +#include #include #include #include +#include #include #include #include #include -#include -#include #include #include @@ -1018,8 +1019,7 @@ bool PDFGenerator::print( QPrinter& printer ) } // Create the tempfile to send to FilePrinter, which will manage the deletion - KTemporaryFile tf; - tf.setSuffix( ".ps" ); + QTemporaryFile tf(QDir::tempPath() + QLatin1String("/okular_XXXXXX.ps")); if ( !tf.open() ) { lastPrintError = TemporaryFileOpenPrintError; diff --git a/generators/spectre/generator_ghostview.cpp b/generators/spectre/generator_ghostview.cpp index 493f12c7b..e951e4471 100644 --- a/generators/spectre/generator_ghostview.cpp +++ b/generators/spectre/generator_ghostview.cpp @@ -105,8 +105,7 @@ bool GSGenerator::print( QPrinter& printer ) bool result = false; // Create tempfile to write to - KTemporaryFile tf; - tf.setSuffix( ".ps" ); + QTemporaryFile tf(QDir::tempPath() + QLatin1String("/okular_XXXXXX.ps")); // Get list of pages to print QList pageList = Okular::FilePrinter::pageList( printer, @@ -119,7 +118,7 @@ bool GSGenerator::print( QPrinter& printer ) if ( printer.outputFileName().right(3) == "pdf" ) { exportFormat = SPECTRE_EXPORTER_FORMAT_PDF; - tf.setSuffix(".pdf"); + tf.setFileTemplate(QDir::tempPath() + QLatin1String("/okular_XXXXXX.pdf")); } if ( !tf.open() ) diff --git a/part.cpp b/part.cpp index c987fba58..a65c7f61d 100644 --- a/part.cpp +++ b/part.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -52,7 +53,6 @@ #include #include #include -#include #include #include #include @@ -128,12 +128,12 @@ class FileKeeper } } - KTemporaryFile* copyToTemporary() const + QTemporaryFile* copyToTemporary() const { if ( !m_handle ) return 0; - KTemporaryFile * retFile = new KTemporaryFile; + QTemporaryFile * retFile = new QTemporaryFile; retFile->open(); std::rewind( m_handle ); @@ -1165,8 +1165,7 @@ bool Part::slotImportPSFile() KUrl url = KFileDialog::getOpenUrl( KUrl(), "application/postscript", this->widget() ); if ( url.isLocalFile() ) { - KTemporaryFile tf; - tf.setSuffix( ".pdf" ); + QTemporaryFile tf(QDir::tempPath() + QLatin1String("/okular_XXXXXX.pdf")); tf.setAutoRemove( false ); if ( !tf.open() ) return false; @@ -2204,7 +2203,7 @@ void Part::slotSaveFileAs() bool Part::saveAs( const QUrl & saveUrl ) { - KTemporaryFile tf; + QTemporaryFile tf; QString fileName; if ( !tf.open() ) { @@ -2260,7 +2259,7 @@ void Part::slotSaveCopyAs() // make use of the already downloaded (in case of remote URLs) file, // no point in downloading that again KUrl srcUrl = KUrl::fromPath( localFilePath() ); - KTemporaryFile * tempFile = 0; + QTemporaryFile * tempFile = 0; // duh, our local file disappeared... if ( !QFile::exists( localFilePath() ) ) { @@ -2375,9 +2374,8 @@ void Part::slotPrintPreview() else { // Generate a temp filename for Print to File, then release the file so generator can write to it - KTemporaryFile tf; + QTemporaryFile tf(QDir::tempPath() + QLatin1String("/okular_XXXXXX.ps")); tf.setAutoRemove( true ); - tf.setSuffix( ".ps" ); tf.open(); printer.setOutputFileName( tf.fileName() ); tf.close(); @@ -2845,7 +2843,7 @@ bool Part::handleCompressed( QString &destpath, const QString &path, const QStri // we are working with a compressed file, decompressing // temporary file for decompressing - KTemporaryFile *newtempfile = new KTemporaryFile(); + QTemporaryFile *newtempfile = new QTemporaryFile(); newtempfile->setAutoRemove(true); if ( !newtempfile->open() ) diff --git a/part.h b/part.h index c8cfa19d6..30aa654e1 100644 --- a/part.h +++ b/part.h @@ -47,7 +47,7 @@ class KToggleAction; class KToggleFullScreenAction; class KSelectAction; class KAboutData; -class KTemporaryFile; +class QTemporaryFile; class QAction; namespace KParts { class GUIActivateEvent; } @@ -252,7 +252,7 @@ class OKULAR_PART_EXPORT Part : public KParts::ReadWritePart, public Okular::Doc static int numberOfParts; - KTemporaryFile *m_tempfile; + QTemporaryFile *m_tempfile; // the document Okular::Document * m_document; diff --git a/ui/latexrenderer.cpp b/ui/latexrenderer.cpp index ded410020..32c03fb09 100644 --- a/ui/latexrenderer.cpp +++ b/ui/latexrenderer.cpp @@ -15,12 +15,12 @@ #include #include #include -#include #include #include #include #include +#include #include #include @@ -118,9 +118,7 @@ LatexRenderer::Error LatexRenderer::handleLatex( QString& fileName, const QStrin KProcess latexProc; KProcess dvipngProc; - KTemporaryFile *tempFile = new KTemporaryFile(); - tempFile->setPrefix("kdelatex-"); - tempFile->setSuffix(".tex"); + QTemporaryFile *tempFile = new QTemporaryFile(QDir::tempPath() + QLatin1String("/okular_kdelatex-XXXXXX.tex")); tempFile->open(); QString tempFileName = tempFile->fileName(); QFileInfo *tempFileInfo = new QFileInfo(tempFileName);