author | alwin <alwin> | 2005-03-07 12:20:41 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-07 12:20:41 (UTC) |
commit | 4515ff72db76ba63dcf3b29b19d930b7e083d508 (patch) (unidiff) | |
tree | 633264a5352e27dd77107f6713a5c4a8872608bf | |
parent | d6fc7417f752867c14a0b6555c32f2d768736fe8 (diff) | |
download | opie-4515ff72db76ba63dcf3b29b19d930b7e083d508.zip opie-4515ff72db76ba63dcf3b29b19d930b7e083d508.tar.gz opie-4515ff72db76ba63dcf3b29b19d930b7e083d508.tar.bz2 |
docLnk->isValid returns if the .doclnk file exists
so its sensless here - we want the check if the real
file exists.
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp index 5281b75..d4da266 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | |||
@@ -54,65 +54,66 @@ QString Doc_DirLister::defaultPath()const { | |||
54 | bool Doc_DirLister::matchCat(const AppLnk* app)const | 54 | bool Doc_DirLister::matchCat(const AppLnk* app)const |
55 | { | 55 | { |
56 | if (!app) return false; | 56 | if (!app) return false; |
57 | if (m_catFilter==0 || app->categories().contains(m_catFilter) || m_catFilter == -1 && app->categories().count() == 0 ) { | 57 | if (m_catFilter==0 || app->categories().contains(m_catFilter) || m_catFilter == -1 && app->categories().count() == 0 ) { |
58 | return true; | 58 | return true; |
59 | } | 59 | } |
60 | return false; | 60 | return false; |
61 | } | 61 | } |
62 | 62 | ||
63 | QString Doc_DirLister::setStartPath(const QString&) { | 63 | QString Doc_DirLister::setStartPath(const QString&) { |
64 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); | 64 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); |
65 | if (!m_docreads) { | 65 | if (!m_docreads) { |
66 | Global::findDocuments(&m_ds,Mtype_str); | 66 | Global::findDocuments(&m_ds,Mtype_str); |
67 | m_docreads = true; | 67 | m_docreads = true; |
68 | } | 68 | } |
69 | return QString::null; | 69 | return QString::null; |
70 | } | 70 | } |
71 | 71 | ||
72 | QString Doc_DirLister::currentPath()const | 72 | QString Doc_DirLister::currentPath()const |
73 | { | 73 | { |
74 | return QString::null; | 74 | return QString::null; |
75 | } | 75 | } |
76 | 76 | ||
77 | 77 | ||
78 | QStringList Doc_DirLister::folders()const { | 78 | QStringList Doc_DirLister::folders()const { |
79 | return QStringList(); | 79 | return QStringList(); |
80 | } | 80 | } |
81 | 81 | ||
82 | QStringList Doc_DirLister::files()const { | 82 | QStringList Doc_DirLister::files()const { |
83 | QStringList out; | 83 | QStringList out; |
84 | QListIterator<DocLnk> dit(m_ds.children()); | 84 | QListIterator<DocLnk> dit(m_ds.children()); |
85 | for( ; dit.current(); ++dit) { | 85 | for( ; dit.current(); ++dit) { |
86 | if (!(*dit)->isValid()) continue; | 86 | /* check if the real file exists! */ |
87 | if (!(*dit)->fileKnown()||!QFile::exists( (*dit)->file())) continue; | ||
87 | if (!matchCat((*dit))) continue; | 88 | if (!matchCat((*dit))) continue; |
88 | QString s = (*dit)->name(); | 89 | QString s = (*dit)->name(); |
89 | s+=char(0); | 90 | s+=char(0); |
90 | s+=(*dit)->file(); | 91 | s+=(*dit)->file(); |
91 | out.append(s); | 92 | out.append(s); |
92 | } | 93 | } |
93 | return out; | 94 | return out; |
94 | } | 95 | } |
95 | 96 | ||
96 | void Doc_DirLister::deleteImage( const QString& f) | 97 | void Doc_DirLister::deleteImage( const QString& f) |
97 | { | 98 | { |
98 | /* | 99 | /* |
99 | * find the file in the set of doclnks | 100 | * find the file in the set of doclnks |
100 | */ | 101 | */ |
101 | QListIterator<DocLnk> dit(m_ds.children()); | 102 | QListIterator<DocLnk> dit(m_ds.children()); |
102 | for( ; dit.current(); ++dit) { | 103 | for( ; dit.current(); ++dit) { |
103 | if ( f == (*dit)->file() ) { | 104 | if ( f == (*dit)->file() ) { |
104 | (*dit)->removeFiles(); | 105 | (*dit)->removeFiles(); |
105 | return; | 106 | return; |
106 | } | 107 | } |
107 | } | 108 | } |
108 | } | 109 | } |
109 | 110 | ||
110 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) | 111 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) |
111 | { | 112 | { |
112 | SlaveMaster::self()->thumbNail( str, w, h ); | 113 | SlaveMaster::self()->thumbNail( str, w, h ); |
113 | } | 114 | } |
114 | 115 | ||
115 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) | 116 | QImage Doc_DirLister::image( const QString& str, Factor f, int m) |
116 | { | 117 | { |
117 | return SlaveMaster::self()->image(str, f, m ); | 118 | return SlaveMaster::self()->image(str, f, m ); |
118 | } | 119 | } |