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

List:       kde-commits
Subject:    KDE/kdegraphics/okular/generators/tiff
From:       Pino Toscano <pino () kde ! org>
Date:       2008-11-30 18:25:22
Message-ID: 1228069522.146032.20243.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 890968 by pino:

simplier way to get a file name


 M  +2 -11     generator_tiff.cpp  


--- trunk/KDE/kdegraphics/okular/generators/tiff/generator_tiff.cpp #890967:890968
@@ -9,10 +9,10 @@
 
 #include "generator_tiff.h"
 
-#include <qabstractfileengine.h>
 #include <qbuffer.h>
 #include <qdatetime.h>
 #include <qfile.h>
+#include <qfileinfo.h>
 #include <qimage.h>
 #include <qlist.h>
 #include <qpainter.h>
@@ -203,16 +203,7 @@
     QFile* qfile = new QFile( fileName );
     qfile->open( QIODevice::ReadOnly );
     d->dev = qfile;
-    QAbstractFileEngine *fileEngine = QAbstractFileEngine::create( fileName );
-    if ( fileEngine )
-    {
-        d->data = QFile::encodeName( fileEngine->fileName( QAbstractFileEngine::BaseName ) );
-        delete fileEngine;
-    }
-    else
-    {
-        d->data = QByteArray( "okular.tiff" );
-    }
+    d->data = QFile::encodeName( QFileInfo( *qfile ).fileName() );
     d->tiff = TIFFClientOpen( d->data.constData(), "r", d->dev,
                   okular_tiffReadProc, okular_tiffWriteProc, okular_tiffSeekProc,
                   okular_tiffCloseProc, okular_tiffSizeProc,
[prev in list] [next in list] [prev in thread] [next in thread]