author | erik <erik> | 2007-01-29 22:00:04 (UTC) |
---|---|---|
committer | erik <erik> | 2007-01-29 22:00:04 (UTC) |
commit | 9a3875c32922a322d991e67b13e89242f71a862c (patch) (unidiff) | |
tree | 4f5c7c79f7e1ee70f19b5cc3d75131b8151ad9cd /noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp | |
parent | 02ef45be75a3024df11365956e1cce6392d9103c (diff) | |
download | opie-9a3875c32922a322d991e67b13e89242f71a862c.zip opie-9a3875c32922a322d991e67b13e89242f71a862c.tar.gz opie-9a3875c32922a322d991e67b13e89242f71a862c.tar.bz2 |
Each file in this commit exhibits a problem where a variable is made in
some way but never used. This is a tricky problem with Qt since almost all
UI forms are made but not used (like QLabel). But I am pretty confident that
these changes are correct and do not have any aspect of a change to the UI.
In most cases, there are just variables that are made and then copied over
(like in iteration over lists or assignment of pointers based on
conditionals).
Diffstat (limited to 'noncore/graphics/opie-eye/impl/dcim/dcim_lister.cpp') (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 | |||
@@ -97,56 +97,53 @@ QString DCIM_DirLister::dirUp( const QString& p )const { | |||
97 | break; | 97 | break; |
98 | case ListingFolder: | 98 | case ListingFolder: |
99 | m_mode = ListingStart; | 99 | m_mode = ListingStart; |
100 | break; | 100 | break; |
101 | case ListingUnknown: | 101 | case ListingUnknown: |
102 | case ListingStart: | 102 | case ListingStart: |
103 | default: | 103 | default: |
104 | break; | 104 | break; |
105 | } | 105 | } |
106 | 106 | ||
107 | /* down cases */ | 107 | /* down cases */ |
108 | owarn << " New String " << str << " old path " << m_mode << oendl; | 108 | owarn << " New String " << str << " old path " << m_mode << oendl; |
109 | m_path = str; | 109 | m_path = str; |
110 | return str; | 110 | return str; |
111 | } | 111 | } |
112 | 112 | ||
113 | 113 | ||
114 | QStringList DCIM_DirLister::findCameras()const { | 114 | QStringList DCIM_DirLister::findCameras()const { |
115 | QStringList lst; | 115 | QStringList lst; |
116 | StorageInfo inf; | 116 | StorageInfo inf; |
117 | 117 | ||
118 | m_map.clear(); | 118 | m_map.clear(); |
119 | 119 | ||
120 | const QList<FileSystem> &list = inf.fileSystems(); | 120 | const QList<FileSystem> &list = inf.fileSystems(); |
121 | QListIterator<FileSystem> it( list ); | ||
122 | 121 | ||
123 | 122 | for ( QListIterator<FileSystem> it( list ); it.current()!=0 ; ++it ) | |
124 | FileSystem *sys; | 123 | if ( QFileInfo( it.current()->path() + "/dcim/" ).exists() ) { |
125 | for ( sys = it.current(); (sys=it.current())!=0 ; ++it ) | 124 | lst << it.current()->name(); |
126 | if ( QFileInfo( sys->path() + "/dcim/" ).exists() ) { | 125 | m_map.insert( it.current()->name(), it.current()->path() ); |
127 | lst << sys->name(); | ||
128 | m_map.insert( sys->name(), sys->path() ); | ||
129 | } | 126 | } |
130 | 127 | ||
131 | if ( lst.isEmpty() ) { | 128 | if ( lst.isEmpty() ) { |
132 | m_mode = ListingUnknown; | 129 | m_mode = ListingUnknown; |
133 | lst << QObject::tr("Error no Camera Dir found"); | 130 | lst << QObject::tr("Error no Camera Dir found"); |
134 | }else | 131 | }else |
135 | m_mode = ListingStart; | 132 | m_mode = ListingStart; |
136 | 133 | ||
137 | return lst; | 134 | return lst; |
138 | } | 135 | } |
139 | 136 | ||
140 | QStringList DCIM_DirLister::findAlbums()const { | 137 | QStringList DCIM_DirLister::findAlbums()const { |
141 | QStringList lst = QDir( m_path ).entryList( QDir::Dirs ); | 138 | QStringList lst = QDir( m_path ).entryList( QDir::Dirs ); |
142 | lst.remove( "." ); | 139 | lst.remove( "." ); |
143 | lst.remove( ".." ); | 140 | lst.remove( ".." ); |
144 | 141 | ||
145 | return lst; | 142 | return lst; |
146 | } | 143 | } |
147 | 144 | ||
148 | QStringList DCIM_DirLister::findImages()const { | 145 | QStringList DCIM_DirLister::findImages()const { |
149 | return QDir( m_path ).entryList("*.jpg *.jpeg *.png", QDir::Files ); | 146 | return QDir( m_path ).entryList("*.jpg *.jpeg *.png", QDir::Files ); |
150 | } | 147 | } |
151 | 148 | ||
152 | void DCIM_DirLister::deleteImage( const QString& fl ) { | 149 | void DCIM_DirLister::deleteImage( const QString& fl ) { |