Diffstat (limited to 'noncore/graphics/opie-eye/impl/dcim') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp index 147eb9c..d4f9943 100644 --- a/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp +++ b/noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp @@ -73,104 +73,101 @@ QStringList DCIM_DirLister::folders()const { lst = findAlbums(); break; case ListingFiles: default: break; } return lst; } QStringList DCIM_DirLister::files()const { if ( m_mode != ListingFiles ) return QStringList(); else return findImages(); } QString DCIM_DirLister::dirUp( const QString& p )const { QString str; switch( m_mode ) { case ListingFiles: m_mode = ListingReFolder; str = PDirLister::dirUp( p ); break; case ListingFolder: m_mode = ListingStart; break; case ListingUnknown: case ListingStart: default: break; } /* down cases */ owarn << " New String " << str << " old path " << m_mode << oendl; m_path = str; return str; } QStringList DCIM_DirLister::findCameras()const { QStringList lst; StorageInfo inf; m_map.clear(); const QList<FileSystem> &list = inf.fileSystems(); - QListIterator<FileSystem> it( list ); - - FileSystem *sys; - for ( sys = it.current(); (sys=it.current())!=0 ; ++it ) - if ( QFileInfo( sys->path() + "/dcim/" ).exists() ) { - lst << sys->name(); - m_map.insert( sys->name(), sys->path() ); + for ( QListIterator<FileSystem> it( list ); it.current()!=0 ; ++it ) + if ( QFileInfo( it.current()->path() + "/dcim/" ).exists() ) { + lst << it.current()->name(); + m_map.insert( it.current()->name(), it.current()->path() ); } if ( lst.isEmpty() ) { m_mode = ListingUnknown; lst << QObject::tr("Error no Camera Dir found"); }else m_mode = ListingStart; return lst; } QStringList DCIM_DirLister::findAlbums()const { QStringList lst = QDir( m_path ).entryList( QDir::Dirs ); lst.remove( "." ); lst.remove( ".." ); return lst; } QStringList DCIM_DirLister::findImages()const { return QDir( m_path ).entryList("*.jpg *.jpeg *.png", QDir::Files ); } void DCIM_DirLister::deleteImage( const QString& fl ) { QFileInfo inf( fl ); QFile::remove( fl ); QFile::remove( inf.dirPath ()+"/preview/"+ inf.fileName() ); } void DCIM_DirLister::thumbNail( const QString& _str, int w, int h ) { QFileInfo inf( _str ); QString str = QFileInfo( inf.dirPath()+"/preview"+ inf.fileName() ).exists() ? inf.dirPath()+"/preview"+ inf.fileName() : _str; SlaveMaster::self()->thumbNail( str, w, h ); } QImage DCIM_DirLister::image( const QString& str, Factor f, int m ) { return SlaveMaster::self()->image( str, f, m ); } void DCIM_DirLister::imageInfo( const QString& str ) { SlaveMaster::self()->thumbInfo( str ); } void DCIM_DirLister::fullImageInfo( const QString& str ) { SlaveMaster::self()->imageInfo( str ); |