author | alwin <alwin> | 2004-04-21 20:43:51 (UTC) |
---|---|---|
committer | alwin <alwin> | 2004-04-21 20:43:51 (UTC) |
commit | 8269dfa474065b986375de7c4fd380cbda837a12 (patch) (unidiff) | |
tree | 0c73c9457032d5cf3957092a6ad1153a86eb2f29 /noncore/graphics/opie-eye/impl | |
parent | 81cd1a4a916fb00b6c8867bdc1d945db155b12c0 (diff) | |
download | opie-8269dfa474065b986375de7c4fd380cbda837a12.zip opie-8269dfa474065b986375de7c4fd380cbda837a12.tar.gz opie-8269dfa474065b986375de7c4fd380cbda837a12.tar.bz2 |
some performance issues
fixed a crasher in mainwindow
Diffstat (limited to 'noncore/graphics/opie-eye/impl') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | 40 | ||||
-rw-r--r-- | noncore/graphics/opie-eye/impl/doc/doc_lister.h | 1 |
2 files changed, 22 insertions, 19 deletions
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp index f695a76..73b2863 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.cpp | |||
@@ -31,32 +31,31 @@ Doc_DirLister::Doc_DirLister() | |||
31 | connect( master, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)), | 31 | connect( master, SIGNAL(sig_thumbNail(const QString&, const QPixmap&)), |
32 | this, SLOT(slotThumbNail(const QString&, const QPixmap&)) ); | 32 | this, SLOT(slotThumbNail(const QString&, const QPixmap&)) ); |
33 | 33 | ||
34 | m_namemap.clear(); | ||
35 | m_filemap.clear(); | ||
34 | } | 36 | } |
35 | 37 | ||
36 | QString Doc_DirLister::defaultPath()const { | 38 | QString Doc_DirLister::defaultPath()const { |
37 | return ""; QPEApplication::documentDir(); | 39 | return ""; QPEApplication::documentDir(); |
38 | } | 40 | } |
39 | 41 | ||
40 | QString Doc_DirLister::setStartPath( const QString& path ) { | 42 | QString Doc_DirLister::setStartPath(const QString&) { |
41 | m_namemap.clear(); | ||
42 | m_out.clear(); | ||
43 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); | 43 | static const QString Mtype_str("image/jpeg;image/gif;image/bmp;image/png"); |
44 | owarn << "Set start path" << oendl; | 44 | if (m_namemap.isEmpty()) { |
45 | DocLnkSet ds; | 45 | DocLnkSet ds; |
46 | Global::findDocuments(&ds,Mtype_str); | 46 | Global::findDocuments(&ds,Mtype_str); |
47 | QListIterator<DocLnk> dit(ds.children()); | 47 | QListIterator<DocLnk> dit(ds.children()); |
48 | for( ; dit.current(); ++dit) { | 48 | for( ; dit.current(); ++dit) { |
49 | owarn << (*dit)->file() << oendl; | 49 | owarn << (*dit)->file() << oendl; |
50 | m_namemap[(*dit)->name()]=(*dit)->file(); | 50 | m_namemap[(*dit)->name()]=(*dit)->file(); |
51 | m_filemap[(*dit)->file()]=(*dit)->name(); | 51 | m_filemap[(*dit)->file()]=(*dit)->name(); |
52 | m_out.append((*dit)->name()); | 52 | } |
53 | } | 53 | } |
54 | owarn << "Set start path end" << oendl; | 54 | return QString::null; |
55 | return ""; | ||
56 | } | 55 | } |
57 | 56 | ||
58 | QString Doc_DirLister::currentPath()const { | 57 | QString Doc_DirLister::currentPath()const { |
59 | return ""; | 58 | return QString::null; |
60 | } | 59 | } |
61 | 60 | ||
62 | 61 | ||
@@ -65,10 +64,16 @@ QStringList Doc_DirLister::folders()const { | |||
65 | } | 64 | } |
66 | 65 | ||
67 | QStringList Doc_DirLister::files()const { | 66 | QStringList Doc_DirLister::files()const { |
68 | return m_out; | 67 | QStringList out; |
68 | QMap<QString,QString>::ConstIterator it; | ||
69 | for (it = m_namemap.begin();it != m_namemap.end();++it) { | ||
70 | out.append(it.key()); | ||
71 | } | ||
72 | return out; | ||
69 | } | 73 | } |
70 | 74 | ||
71 | void Doc_DirLister::deleteImage( const QString& ) { | 75 | void Doc_DirLister::deleteImage( const QString& ) |
76 | { | ||
72 | } | 77 | } |
73 | 78 | ||
74 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) { | 79 | void Doc_DirLister::thumbNail( const QString& str, int w, int h) { |
@@ -95,7 +100,6 @@ void Doc_DirLister::imageInfo( const QString& str) { | |||
95 | return; | 100 | return; |
96 | } | 101 | } |
97 | QString fname = m_namemap[str]; | 102 | QString fname = m_namemap[str]; |
98 | owarn << "Image info: " << fname << oendl; | ||
99 | SlaveMaster::self()->thumbInfo( fname ); | 103 | SlaveMaster::self()->thumbInfo( fname ); |
100 | } | 104 | } |
101 | 105 | ||
diff --git a/noncore/graphics/opie-eye/impl/doc/doc_lister.h b/noncore/graphics/opie-eye/impl/doc/doc_lister.h index d89b579..a65b616 100644 --- a/noncore/graphics/opie-eye/impl/doc/doc_lister.h +++ b/noncore/graphics/opie-eye/impl/doc/doc_lister.h | |||
@@ -32,7 +32,6 @@ public: | |||
32 | 32 | ||
33 | private: | 33 | private: |
34 | QMap<QString,QString> m_namemap,m_filemap; | 34 | QMap<QString,QString> m_namemap,m_filemap; |
35 | QStringList m_out; | ||
36 | protected slots: | 35 | protected slots: |
37 | virtual void slotFullInfo(const QString&, const QString&); | 36 | virtual void slotFullInfo(const QString&, const QString&); |
38 | virtual void slotThumbInfo(const QString&, const QString&); | 37 | virtual void slotThumbInfo(const QString&, const QString&); |