-rw-r--r-- | qmake/include/qdir.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/qmake/include/qdir.h b/qmake/include/qdir.h index 6e9f1ab..4b08b79 100644 --- a/qmake/include/qdir.h +++ b/qmake/include/qdir.h | |||
@@ -133,107 +133,108 @@ public: | |||
133 | virtual QStringList entryList( const QString &nameFilter, | 133 | virtual QStringList entryList( const QString &nameFilter, |
134 | int filterSpec = DefaultFilter, | 134 | int filterSpec = DefaultFilter, |
135 | int sortSpec = DefaultSort ) const; | 135 | int sortSpec = DefaultSort ) const; |
136 | 136 | ||
137 | virtual const QFileInfoList *entryInfoList( int filterSpec = DefaultFilter, | 137 | virtual const QFileInfoList *entryInfoList( int filterSpec = DefaultFilter, |
138 | int sortSpec = DefaultSort ) const; | 138 | int sortSpec = DefaultSort ) const; |
139 | virtual const QFileInfoList *entryInfoList( const QString &nameFilter, | 139 | virtual const QFileInfoList *entryInfoList( const QString &nameFilter, |
140 | int filterSpec = DefaultFilter, | 140 | int filterSpec = DefaultFilter, |
141 | int sortSpec = DefaultSort ) const; | 141 | int sortSpec = DefaultSort ) const; |
142 | 142 | ||
143 | static const QFileInfoList *drives(); | 143 | static const QFileInfoList *drives(); |
144 | 144 | ||
145 | virtual bool mkdir( const QString &dirName, | 145 | virtual bool mkdir( const QString &dirName, |
146 | bool acceptAbsPath = TRUE ) const; | 146 | bool acceptAbsPath = TRUE ) const; |
147 | virtual bool rmdir( const QString &dirName, | 147 | virtual bool rmdir( const QString &dirName, |
148 | bool acceptAbsPath = TRUE ) const; | 148 | bool acceptAbsPath = TRUE ) const; |
149 | 149 | ||
150 | virtual bool isReadable() const; | 150 | virtual bool isReadable() const; |
151 | virtual bool exists() const; | 151 | virtual bool exists() const; |
152 | virtual bool isRoot() const; | 152 | virtual bool isRoot() const; |
153 | 153 | ||
154 | virtual bool isRelative() const; | 154 | virtual bool isRelative() const; |
155 | virtual void convertToAbs(); | 155 | virtual void convertToAbs(); |
156 | 156 | ||
157 | virtual bool operator==( const QDir & ) const; | 157 | virtual bool operator==( const QDir & ) const; |
158 | virtual bool operator!=( const QDir & ) const; | 158 | virtual bool operator!=( const QDir & ) const; |
159 | 159 | ||
160 | virtual bool remove( const QString &fileName, | 160 | virtual bool remove( const QString &fileName, |
161 | bool acceptAbsPath = TRUE ); | 161 | bool acceptAbsPath = TRUE ); |
162 | virtual bool rename( const QString &name, const QString &newName, | 162 | virtual bool rename( const QString &name, const QString &newName, |
163 | bool acceptAbsPaths = TRUE ); | 163 | bool acceptAbsPaths = TRUE ); |
164 | virtual bool exists( const QString &name, | 164 | virtual bool exists( const QString &name, |
165 | bool acceptAbsPath = TRUE ); | 165 | bool acceptAbsPath = TRUE ); |
166 | 166 | ||
167 | static char separator(); | 167 | static char separator(); |
168 | 168 | ||
169 | static bool setCurrent( const QString &path ); | 169 | static bool setCurrent( const QString &path ); |
170 | static QDir current(); | 170 | static QDir current(); |
171 | static QDir home(); | 171 | static QDir home(); |
172 | static QDir root(); | 172 | static QDir root(); |
173 | static QString currentDirPath(); | 173 | static QString currentDirPath(); |
174 | static QString homeDirPath(); | 174 | static QString homeDirPath(); |
175 | static QString rootDirPath(); | 175 | static QString rootDirPath(); |
176 | 176 | ||
177 | static bool match( const QStringList &filters, const QString &fileName ); | 177 | static bool match( const QStringList &filters, const QString &fileName ); |
178 | static bool match( const QString &filter, const QString &fileName ); | 178 | static bool match( const QString &filter, const QString &fileName ); |
179 | static QString cleanDirPath( const QString &dirPath ); | 179 | static QString cleanDirPath( const QString &dirPath ); |
180 | static bool isRelativePath( const QString &path ); | 180 | static bool isRelativePath( const QString &path ); |
181 | void refresh() const; | ||
181 | 182 | ||
182 | private: | 183 | private: |
183 | #ifdef Q_OS_MAC | 184 | #ifdef Q_OS_MAC |
184 | typedef struct FSSpec FSSpec; | 185 | typedef struct FSSpec FSSpec; |
185 | static FSSpec *make_spec(const QString &); | 186 | static FSSpec *make_spec(const QString &); |
186 | #endif | 187 | #endif |
187 | void init(); | 188 | void init(); |
188 | virtual bool readDirEntries( const QString &nameFilter, | 189 | virtual bool readDirEntries( const QString &nameFilter, |
189 | int FilterSpec, int SortSpec ); | 190 | int FilterSpec, int SortSpec ); |
190 | 191 | ||
191 | static void slashify ( QString &); | 192 | static void slashify( QString & ); |
192 | 193 | ||
193 | QStringdPath; | 194 | QStringdPath; |
194 | QStringList *fList; | 195 | QStringList *fList; |
195 | QFileInfoList *fiList; | 196 | QFileInfoList *fiList; |
196 | QStringnameFilt; | 197 | QStringnameFilt; |
197 | FilterSpecfiltS; | 198 | FilterSpecfiltS; |
198 | SortSpecsortS; | 199 | SortSpecsortS; |
199 | uint dirty: 1; | 200 | uint dirty: 1; |
200 | uintallDirs : 1; | 201 | uintallDirs : 1; |
201 | }; | 202 | }; |
202 | 203 | ||
203 | 204 | ||
204 | inline QString QDir::path() const | 205 | inline QString QDir::path() const |
205 | { | 206 | { |
206 | return dPath; | 207 | return dPath; |
207 | } | 208 | } |
208 | 209 | ||
209 | inline QString QDir::nameFilter() const | 210 | inline QString QDir::nameFilter() const |
210 | { | 211 | { |
211 | return nameFilt; | 212 | return nameFilt; |
212 | } | 213 | } |
213 | 214 | ||
214 | inline QDir::FilterSpec QDir::filter() const | 215 | inline QDir::FilterSpec QDir::filter() const |
215 | { | 216 | { |
216 | return filtS; | 217 | return filtS; |
217 | } | 218 | } |
218 | 219 | ||
219 | inline QDir::SortSpec QDir::sorting() const | 220 | inline QDir::SortSpec QDir::sorting() const |
220 | { | 221 | { |
221 | return sortS; | 222 | return sortS; |
222 | } | 223 | } |
223 | 224 | ||
224 | inline bool QDir::matchAllDirs() const | 225 | inline bool QDir::matchAllDirs() const |
225 | { | 226 | { |
226 | return allDirs; | 227 | return allDirs; |
227 | } | 228 | } |
228 | 229 | ||
229 | inline bool QDir::operator!=( const QDir &d ) const | 230 | inline bool QDir::operator!=( const QDir &d ) const |
230 | { | 231 | { |
231 | return !(*this == d); | 232 | return !(*this == d); |
232 | } | 233 | } |
233 | 234 | ||
234 | 235 | ||
235 | struct QDirSortItem { | 236 | struct QDirSortItem { |
236 | QString filename_cache; | 237 | QString filename_cache; |
237 | QFileInfo* item; | 238 | QFileInfo* item; |
238 | }; | 239 | }; |
239 | 240 | ||