author | zecke <zecke> | 2002-09-10 14:21:14 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 14:21:14 (UTC) |
commit | 8b59b498892b0e345d977ccd520087b660a91437 (patch) (unidiff) | |
tree | 4b9fef30cc51cce8e50c072038d15d8e10b29fb2 | |
parent | 4aad041a733e2478ff29330e1544e5fefcfb5cde (diff) | |
download | opie-8b59b498892b0e345d977ccd520087b660a91437.zip opie-8b59b498892b0e345d977ccd520087b660a91437.tar.gz opie-8b59b498892b0e345d977ccd520087b660a91437.tar.bz2 |
AppLnk fix QArray -> QMAp
-rw-r--r-- | library/applnk.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/library/applnk.cpp b/library/applnk.cpp index 298581a..41b3008 100644 --- a/library/applnk.cpp +++ b/library/applnk.cpp | |||
@@ -34,102 +34,105 @@ | |||
34 | #include <qpe/mimetype.h> | 34 | #include <qpe/mimetype.h> |
35 | #include <qpe/config.h> | 35 | #include <qpe/config.h> |
36 | #include <qpe/storage.h> | 36 | #include <qpe/storage.h> |
37 | #include <qpe/resource.h> | 37 | #include <qpe/resource.h> |
38 | 38 | ||
39 | #include <qdict.h> | 39 | #include <qdict.h> |
40 | #include <qdir.h> | 40 | #include <qdir.h> |
41 | #include <qregexp.h> | 41 | #include <qregexp.h> |
42 | 42 | ||
43 | #ifdef Q_WS_QWS | 43 | #ifdef Q_WS_QWS |
44 | #include <qgfx_qws.h> | 44 | #include <qgfx_qws.h> |
45 | #endif | 45 | #endif |
46 | 46 | ||
47 | #include <stdlib.h> | 47 | #include <stdlib.h> |
48 | 48 | ||
49 | int AppLnk::lastId = 5000; | 49 | int AppLnk::lastId = 5000; |
50 | 50 | ||
51 | static int smallSize = 14; | 51 | static int smallSize = 14; |
52 | static int bigSize = 32; | 52 | static int bigSize = 32; |
53 | 53 | ||
54 | static QString safeFileName(const QString& n) | 54 | static QString safeFileName(const QString& n) |
55 | { | 55 | { |
56 | QString safename=n; | 56 | QString safename=n; |
57 | safename.replace(QRegExp("[^0-9A-Za-z.]"),"_"); | 57 | safename.replace(QRegExp("[^0-9A-Za-z.]"),"_"); |
58 | safename.replace(QRegExp("^[^A-Za-z]*"),""); | 58 | safename.replace(QRegExp("^[^A-Za-z]*"),""); |
59 | if ( safename.isEmpty() ) | 59 | if ( safename.isEmpty() ) |
60 | safename = "_"; | 60 | safename = "_"; |
61 | return safename; | 61 | return safename; |
62 | } | 62 | } |
63 | 63 | ||
64 | static bool prepareDirectories(const QString& lf) | 64 | static bool prepareDirectories(const QString& lf) |
65 | { | 65 | { |
66 | if ( !QFile::exists(lf) ) { | 66 | if ( !QFile::exists(lf) ) { |
67 | // May need to create directories | 67 | // May need to create directories |
68 | QFileInfo fi(lf); | 68 | QFileInfo fi(lf); |
69 | if ( system(("mkdir -p "+fi.dirPath(TRUE))) ) | 69 | if ( system(("mkdir -p "+fi.dirPath(TRUE))) ) |
70 | return FALSE; | 70 | return FALSE; |
71 | } | 71 | } |
72 | return TRUE; | 72 | return TRUE; |
73 | } | 73 | } |
74 | 74 | ||
75 | class AppLnkPrivate | 75 | class AppLnkPrivate |
76 | { | 76 | { |
77 | public: | 77 | public: |
78 | /* the size of the Pixmap */ | 78 | /* the size of the Pixmap */ |
79 | enum Size {Normal = 0, Big }; | 79 | enum Size {Normal = 0, Big }; |
80 | AppLnkPrivate() { | 80 | AppLnkPrivate() { |
81 | /* we want one normal and one big item */ | 81 | /* we want one normal and one big item */ |
82 | mPixmaps = QArray<QPixmap>(2); | 82 | |
83 | QPixmap pix; | ||
84 | mPixmaps.insert(0, pix ); | ||
85 | mPixmaps.insert(1, pix); | ||
83 | } | 86 | } |
84 | 87 | ||
85 | QStringList mCatList; // always correct | 88 | QStringList mCatList; // always correct |
86 | QArray<int> mCat; // cached value; correct if not empty | 89 | QArray<int> mCat; // cached value; correct if not empty |
87 | QArray<QPixmap> mPixmaps; | 90 | QMap<int, QPixmap> mPixmaps; |
88 | 91 | ||
89 | void updateCatListFromArray() | 92 | void updateCatListFromArray() |
90 | { | 93 | { |
91 | Categories cat( 0 ); | 94 | Categories cat( 0 ); |
92 | cat.load( categoryFileName() ); | 95 | cat.load( categoryFileName() ); |
93 | mCatList = cat.labels("Document View",mCat); | 96 | mCatList = cat.labels("Document View",mCat); |
94 | } | 97 | } |
95 | 98 | ||
96 | void setCatArrayDirty() | 99 | void setCatArrayDirty() |
97 | { | 100 | { |
98 | mCat.resize(0); | 101 | mCat.resize(0); |
99 | } | 102 | } |
100 | 103 | ||
101 | void ensureCatArray() | 104 | void ensureCatArray() |
102 | { | 105 | { |
103 | if ( mCat.count() > 0 || mCatList.count()==0 ) | 106 | if ( mCat.count() > 0 || mCatList.count()==0 ) |
104 | return; | 107 | return; |
105 | 108 | ||
106 | Categories cat( 0 ); | 109 | Categories cat( 0 ); |
107 | cat.load( categoryFileName() ); | 110 | cat.load( categoryFileName() ); |
108 | mCat.resize( mCatList.count() ); | 111 | mCat.resize( mCatList.count() ); |
109 | int i; | 112 | int i; |
110 | QStringList::ConstIterator it; | 113 | QStringList::ConstIterator it; |
111 | for ( i = 0, it = mCatList.begin(); it != mCatList.end(); | 114 | for ( i = 0, it = mCatList.begin(); it != mCatList.end(); |
112 | ++it, i++ ) { | 115 | ++it, i++ ) { |
113 | 116 | ||
114 | bool number; | 117 | bool number; |
115 | int id = (*it).toInt( &number ); | 118 | int id = (*it).toInt( &number ); |
116 | if ( !number ) { | 119 | if ( !number ) { |
117 | id = cat.id( "Document View", *it ); | 120 | id = cat.id( "Document View", *it ); |
118 | if ( id == 0 ) | 121 | if ( id == 0 ) |
119 | id = cat.addCategory( "Document View", *it ); | 122 | id = cat.addCategory( "Document View", *it ); |
120 | } | 123 | } |
121 | mCat[i] = id; | 124 | mCat[i] = id; |
122 | } | 125 | } |
123 | } | 126 | } |
124 | }; | 127 | }; |
125 | 128 | ||
126 | /*! | 129 | /*! |
127 | \class AppLnk applnk.h | 130 | \class AppLnk applnk.h |
128 | \brief The AppLnk class represents an application available on the system. | 131 | \brief The AppLnk class represents an application available on the system. |
129 | 132 | ||
130 | Every Qtopia application \e app has a corresponding \e app.desktop | 133 | Every Qtopia application \e app has a corresponding \e app.desktop |
131 | file. When one of these files is read its data is stored as an | 134 | file. When one of these files is read its data is stored as an |
132 | AppLnk object. | 135 | AppLnk object. |
133 | 136 | ||
134 | The AppLnk class introduces some Qtopia-specific concepts, and | 137 | The AppLnk class introduces some Qtopia-specific concepts, and |
135 | provides a variety of functions, as described in the following | 138 | provides a variety of functions, as described in the following |