[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kpdf/core
From:       Enrico Ros <rosenric () dei ! unipd ! it>
Date:       2005-01-13 11:03:48
Message-ID: 20050113110348.87BCB1CFBA () office ! kde ! org
[Download RAW message or body]

CVS commit by eros: 

mini cleanup 1; starting to work seriously on memory management and contour
stuff.


  M +21 -29    document.cpp   1.14


--- kdegraphics/kpdf/core/document.cpp  #1.13:1.14
@@ -49,13 +49,14 @@ class KPDFDocumentPrivate
         // cached stuff
         DocumentViewport viewport;
+        QString docFileName;
+        QString xmlFileName;
 
-        // memory check/free timer
-        QTimer * memCheckTimer;
+        // observers / requests stuff
+        QMap< int, class ObserverData* > observers;
+        //QValueList< PixmapRequest * > asyncRequestsQueue;
 
-        // bookmark saver timer
+        // timers (memory checking / info saver)
+        QTimer * memCheckTimer;
         QTimer * saveBookmarksTimer;
-
-        // observers related (note: won't delete oservers)
-        QMap< int, class ObserverData* > observers;
 };
 
@@ -98,8 +99,13 @@ bool KPDFDocument::openDocument( const Q
     if ( !fileReadTest.open( IO_ReadOnly ) )
     {
-        documentFileName = QString::null;
+        d->docFileName = QString::null;
         return false;
     }
+    // determine the related "xml document-info" filename
+    d->docFileName = docFile;
+    QString fn = docFile.contains('/') ? docFile.section('/', -1, -1) : docFile;
+    fn = "kpdf/" + QString::number(fileReadTest.size()) + "." + fn + ".xml";
     fileReadTest.close();
+    d->xmlFileName = locateLocal( "data", fn );
 
     // create the generator based on the file's mimetype
@@ -120,5 +126,4 @@ bool KPDFDocument::openDocument( const Q
 
     // 1. load Document (and set busy cursor while loading)
-    documentFileName = docFile;
     QApplication::setOverrideCursor( waitCursor );
     bool openOk = generator->loadDocument( docFile, pages_vector );
@@ -695,13 +700,6 @@ void KPDFDocument::loadDocumentInfo()
 // are still uninitialized at this point so don't access them
 {
-    QFile fileReadTest( documentFileName );
-    fileReadTest.open( IO_ReadOnly );
-
-    QString fileName = documentFileName.contains('/') ? \
                documentFileName.section('/', -1, -1) : documentFileName;
-    fileName = "kpdf/" + QString::number(fileReadTest.size()) + "." + fileName + \
                ".xml";
-    fileReadTest.close();
-    QString localFN = locateLocal( "data", fileName );
-    //kdDebug() << "Using '" << localFN << "' as document info file." << endl;
-    QFile infoFile( localFN );
+    //kdDebug() << "Using '" << d->xmlFileName << "' as document info file." << \
endl; +    QFile infoFile( d->xmlFileName );
     if (infoFile.exists() && infoFile.open( IO_ReadOnly ) )
     {
@@ -767,9 +765,9 @@ void KPDFDocument::loadDocumentInfo()
 QString KPDFDocument::giveAbsolutePath( const QString & fileName )
 {
-    if ( documentFileName.isEmpty() )
+    if ( d->docFileName.isEmpty() )
         return QString::null;
 
     // convert the pdf fileName to absolute using current pdf path
-    QFileInfo currentInfo( documentFileName );
+    QFileInfo currentInfo( d->docFileName );
     return currentInfo.dir().absFilePath( fileName );
 }
@@ -833,15 +831,9 @@ void KPDFDocument::unHilightPages()
 void KPDFDocument::saveDocumentInfo() const
 {
-    if (documentFileName.isNull()) return;
-
-    QFile fileReadTest( documentFileName );
-    fileReadTest.open( IO_ReadOnly );
+    if ( d->docFileName.isNull() )
+        return;
 
-    QString fileName = documentFileName.contains('/') ? \
                documentFileName.section('/', -1, -1) : documentFileName;
-    fileName = "kpdf/" + QString::number(fileReadTest.size()) + "." + fileName + \
                ".xml";
-    fileReadTest.close();
-    QString localFN = locateLocal( "data", fileName );
-    //kdDebug() << "Using '" << localFN << "' as document info file for saving." << \
                endl;
-    QFile infoFile( localFN );
+    //kdDebug() << "Using '" << d->xmlFileName << "' as document info file for \
saving." << endl; +    QFile infoFile( d->xmlFileName );
     if (infoFile.open( IO_WriteOnly | IO_Truncate) )
     {


[prev in list] [next in list] [prev in thread] [next in thread]