-rw-r--r-- | qmake/tools/qdir.cpp | 94 |
1 files changed, 71 insertions, 23 deletions
diff --git a/qmake/tools/qdir.cpp b/qmake/tools/qdir.cpp index 418ea49..5714878 100644 --- a/qmake/tools/qdir.cpp +++ b/qmake/tools/qdir.cpp | |||
@@ -1,116 +1,121 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** $Id$ |
3 | ** | 3 | ** |
4 | ** Implementation of QDir class | 4 | ** Implementation of QDir class |
5 | ** | 5 | ** |
6 | ** Created : 950427 | 6 | ** Created : 950427 |
7 | ** | 7 | ** |
8 | ** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. | 8 | ** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. |
9 | ** | 9 | ** |
10 | ** This file is part of the tools module of the Qt GUI Toolkit. | 10 | ** This file is part of the tools module of the Qt GUI Toolkit. |
11 | ** | 11 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 12 | ** This file may be distributed under the terms of the Q Public License |
13 | ** as defined by Trolltech AS of Norway and appearing in the file | 13 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 14 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 15 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 16 | ** This file may be distributed and/or modified under the terms of the |
17 | ** GNU General Public License version 2 as published by the Free Software | 17 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 18 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 19 | ** packaging of this file. |
20 | ** | 20 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition | 21 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition |
22 | ** licenses may use this file in accordance with the Qt Commercial License | 22 | ** licenses may use this file in accordance with the Qt Commercial License |
23 | ** Agreement provided with the Software. | 23 | ** Agreement provided with the Software. |
24 | ** | 24 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 26 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 27 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 29 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 32 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 33 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 34 | ** not clear to you. |
35 | ** | 35 | ** |
36 | **********************************************************************/ | 36 | **********************************************************************/ |
37 | 37 | ||
38 | #include "qplatformdefs.h" | 38 | #include "qplatformdefs.h" |
39 | #include "qdir.h" | 39 | #include "qdir.h" |
40 | 40 | ||
41 | #ifndef QT_NO_DIR | 41 | #ifndef QT_NO_DIR |
42 | #include <private/qdir_p.h> | 42 | #include <private/qdir_p.h> |
43 | #include "qfileinfo.h" | 43 | #include "qfileinfo.h" |
44 | #include "qregexp.h" | 44 | #include "qregexp.h" |
45 | #include "qstringlist.h" | 45 | #include "qstringlist.h" |
46 | #include <stdlib.h> | 46 | #include <limits.h> |
47 | #include <ctype.h> | ||
48 | 47 | ||
48 | #if defined(Q_FS_FAT) && !defined(Q_OS_UNIX) | ||
49 | const bool CaseSensitiveFS = FALSE; | ||
50 | #else | ||
51 | const bool CaseSensitiveFS = TRUE; | ||
52 | #endif | ||
49 | 53 | ||
50 | 54 | ||
51 | /*! | 55 | /*! |
52 | \class QDir | 56 | \class QDir |
57 | \reentrant | ||
53 | \brief The QDir class provides access to directory structures and their contents in a platform-independent way. | 58 | \brief The QDir class provides access to directory structures and their contents in a platform-independent way. |
54 | 59 | ||
55 | \ingroup io | 60 | \ingroup io |
56 | \mainclass | 61 | \mainclass |
57 | 62 | ||
58 | A QDir is used to manipulate path names, access information | 63 | A QDir is used to manipulate path names, access information |
59 | regarding paths and files, and manipulate the underlying file | 64 | regarding paths and files, and manipulate the underlying file |
60 | system. | 65 | system. |
61 | 66 | ||
62 | A QDir can point to a file using either a relative or an absolute | 67 | A QDir can point to a file using either a relative or an absolute |
63 | path. Absolute paths begin with the directory separator "/" | 68 | path. Absolute paths begin with the directory separator "/" |
64 | (optionally preceded by a drive specification under Windows). If | 69 | (optionally preceded by a drive specification under Windows). If |
65 | you always use "/" as a directory separator, Qt will translate | 70 | you always use "/" as a directory separator, Qt will translate |
66 | your paths to conform to the underlying operating system. Relative | 71 | your paths to conform to the underlying operating system. Relative |
67 | file names begin with a directory name or a file name and specify | 72 | file names begin with a directory name or a file name and specify |
68 | a path relative to the current directory. | 73 | a path relative to the current directory. |
69 | 74 | ||
70 | The "current" path refers to the application's working directory. | 75 | The "current" path refers to the application's working directory. |
71 | A QDir's own path is set and retrieved with setPath() and path(). | 76 | A QDir's own path is set and retrieved with setPath() and path(). |
72 | 77 | ||
73 | An example of an absolute path is the string "/tmp/quartz", a | 78 | An example of an absolute path is the string "/tmp/quartz", a |
74 | relative path might look like "src/fatlib". You can use the | 79 | relative path might look like "src/fatlib". You can use the |
75 | function isRelative() to check if a QDir is using a relative or an | 80 | function isRelative() to check if a QDir is using a relative or an |
76 | absolute file path. Call convertToAbs() to convert a relative QDir | 81 | absolute file path. Call convertToAbs() to convert a relative QDir |
77 | to an absolute one. For a simplified path use cleanDirPath(). To | 82 | to an absolute one. For a simplified path use cleanDirPath(). To |
78 | obtain a path which has no symbolic links or redundant ".." | 83 | obtain a path which has no symbolic links or redundant ".." |
79 | elements use canonicalPath(). The path can be set with setPath(), | 84 | elements use canonicalPath(). The path can be set with setPath(), |
80 | and changed with cd() and cdUp(). | 85 | and changed with cd() and cdUp(). |
81 | 86 | ||
82 | QDir provides several static functions, for example, setCurrent() | 87 | QDir provides several static functions, for example, setCurrent() |
83 | to set the application's working directory and currentDirPath() to | 88 | to set the application's working directory and currentDirPath() to |
84 | retrieve the application's working directory. Access to some | 89 | retrieve the application's working directory. Access to some |
85 | common paths is provided with the static functions, current(), | 90 | common paths is provided with the static functions, current(), |
86 | home() and root() which return QDir objects or currentDirPath(), | 91 | home() and root() which return QDir objects or currentDirPath(), |
87 | homeDirPath() and rootDirPath() which return the path as a string. | 92 | homeDirPath() and rootDirPath() which return the path as a string. |
88 | 93 | ||
89 | The number of entries in a directory is returned by count(). | 94 | The number of entries in a directory is returned by count(). |
90 | Obtain a string list of the names of all the files and directories | 95 | Obtain a string list of the names of all the files and directories |
91 | in a directory with entryList(). If you prefer a list of QFileInfo | 96 | in a directory with entryList(). If you prefer a list of QFileInfo |
92 | pointers use entryInfoList(). Both these functions can apply a | 97 | pointers use entryInfoList(). Both these functions can apply a |
93 | name filter, an attributes filter (e.g. read-only, files not | 98 | name filter, an attributes filter (e.g. read-only, files not |
94 | directories, etc.), and a sort order. The filters and sort may be | 99 | directories, etc.), and a sort order. The filters and sort may be |
95 | set with calls to setNameFilter(), setFilter() and setSorting(). | 100 | set with calls to setNameFilter(), setFilter() and setSorting(). |
96 | They may also be specified in the entryList() and | 101 | They may also be specified in the entryList() and |
97 | entryInfoList()'s arguments. | 102 | entryInfoList()'s arguments. |
98 | 103 | ||
99 | Create a new directory with mkdir(), rename a directory with | 104 | Create a new directory with mkdir(), rename a directory with |
100 | rename() and remove an existing directory with rmdir(). Remove a | 105 | rename() and remove an existing directory with rmdir(). Remove a |
101 | file with remove(). You can interrogate a directory with exists(), | 106 | file with remove(). You can interrogate a directory with exists(), |
102 | isReadable() and isRoot(). | 107 | isReadable() and isRoot(). |
103 | 108 | ||
104 | To get a path with a filename use filePath(), and to get a | 109 | To get a path with a filename use filePath(), and to get a |
105 | directory name use dirName(); neither of these functions checks | 110 | directory name use dirName(); neither of these functions checks |
106 | for the existence of the file or directory. | 111 | for the existence of the file or directory. |
107 | 112 | ||
108 | The list of root directories is provided by drives(); on Unix | 113 | The list of root directories is provided by drives(); on Unix |
109 | systems this returns a list containing one root directory, "/"; on | 114 | systems this returns a list containing one root directory, "/"; on |
110 | Windows the list will usually contain "C:/", and possibly "D:/", | 115 | Windows the list will usually contain "C:/", and possibly "D:/", |
111 | etc. | 116 | etc. |
112 | 117 | ||
113 | If you need the path in a form suitable for the underlying | 118 | If you need the path in a form suitable for the underlying |
114 | operating system use convertSeparators(). | 119 | operating system use convertSeparators(). |
115 | 120 | ||
116 | Examples: | 121 | Examples: |
@@ -169,128 +174,136 @@ | |||
169 | QDir::QDir() | 174 | QDir::QDir() |
170 | { | 175 | { |
171 | dPath = QString::fromLatin1("."); | 176 | dPath = QString::fromLatin1("."); |
172 | init(); | 177 | init(); |
173 | } | 178 | } |
174 | 179 | ||
175 | /*! | 180 | /*! |
176 | Constructs a QDir with path \a path, that filters its entries by | 181 | Constructs a QDir with path \a path, that filters its entries by |
177 | name using \a nameFilter and by attributes using \a filterSpec. It | 182 | name using \a nameFilter and by attributes using \a filterSpec. It |
178 | also sorts the names using \a sortSpec. | 183 | also sorts the names using \a sortSpec. |
179 | 184 | ||
180 | The default \a nameFilter is an empty string, which excludes | 185 | The default \a nameFilter is an empty string, which excludes |
181 | nothing; the default \a filterSpec is \c All, which also means | 186 | nothing; the default \a filterSpec is \c All, which also means |
182 | exclude nothing. The default \a sortSpec is \c Name|IgnoreCase, | 187 | exclude nothing. The default \a sortSpec is \c Name|IgnoreCase, |
183 | i.e. sort by name case-insensitively. | 188 | i.e. sort by name case-insensitively. |
184 | 189 | ||
185 | Example that lists all the files in "/tmp": | 190 | Example that lists all the files in "/tmp": |
186 | \code | 191 | \code |
187 | QDir d( "/tmp" ); | 192 | QDir d( "/tmp" ); |
188 | for ( int i = 0; i < d.count(); i++ ) | 193 | for ( int i = 0; i < d.count(); i++ ) |
189 | printf( "%s\n", d[i] ); | 194 | printf( "%s\n", d[i] ); |
190 | \endcode | 195 | \endcode |
191 | 196 | ||
192 | If \a path is "" or QString::null, QDir uses "." (the current | 197 | If \a path is "" or QString::null, QDir uses "." (the current |
193 | directory). If \a nameFilter is "" or QString::null, QDir uses the | 198 | directory). If \a nameFilter is "" or QString::null, QDir uses the |
194 | name filter "*" (all files). | 199 | name filter "*" (all files). |
195 | 200 | ||
196 | Note that \a path need not exist. | 201 | Note that \a path need not exist. |
197 | 202 | ||
198 | \sa exists(), setPath(), setNameFilter(), setFilter(), setSorting() | 203 | \sa exists(), setPath(), setNameFilter(), setFilter(), setSorting() |
199 | */ | 204 | */ |
200 | 205 | ||
201 | QDir::QDir( const QString &path, const QString &nameFilter, | 206 | QDir::QDir( const QString &path, const QString &nameFilter, |
202 | int sortSpec, int filterSpec ) | 207 | int sortSpec, int filterSpec ) |
203 | { | 208 | { |
204 | init(); | 209 | init(); |
205 | dPath = cleanDirPath( path ); | 210 | dPath = cleanDirPath( path ); |
206 | if ( dPath.isEmpty() ) | 211 | if ( dPath.isEmpty() ) |
207 | dPath = QString::fromLatin1("."); | 212 | dPath = QString::fromLatin1("."); |
208 | nameFilt = nameFilter; | 213 | nameFilt = nameFilter; |
209 | if ( nameFilt.isEmpty() ) | 214 | if ( nameFilt.isEmpty() ) |
210 | nameFilt = QString::fromLatin1("*"); | 215 | nameFilt = QString::fromLatin1("*"); |
211 | filtS = (FilterSpec)filterSpec; | 216 | filtS = (FilterSpec)filterSpec; |
212 | sortS = (SortSpec)sortSpec; | 217 | sortS = (SortSpec)sortSpec; |
213 | } | 218 | } |
214 | 219 | ||
215 | /*! | 220 | /*! |
216 | Constructs a QDir that is a copy of the directory \a d. | 221 | Constructs a QDir that is a copy of the directory \a d. |
217 | 222 | ||
218 | \sa operator=() | 223 | \sa operator=() |
219 | */ | 224 | */ |
220 | 225 | ||
221 | QDir::QDir( const QDir &d ) | 226 | QDir::QDir( const QDir &d ) |
222 | { | 227 | { |
223 | dPath = d.dPath; | 228 | dPath = d.dPath; |
224 | fList = 0; | 229 | fList = 0; |
225 | fiList = 0; | 230 | fiList = 0; |
226 | nameFilt = d.nameFilt; | 231 | nameFilt = d.nameFilt; |
227 | dirty = TRUE; | 232 | dirty = TRUE; |
228 | allDirs = d.allDirs; | 233 | allDirs = d.allDirs; |
229 | filtS = d.filtS; | 234 | filtS = d.filtS; |
230 | sortS = d.sortS; | 235 | sortS = d.sortS; |
231 | } | 236 | } |
232 | 237 | ||
238 | /*! | ||
239 | Refreshes the directory information. | ||
240 | */ | ||
241 | void QDir::refresh() const | ||
242 | { | ||
243 | QDir* that = (QDir*) this; | ||
244 | that->dirty = TRUE; | ||
245 | } | ||
233 | 246 | ||
234 | void QDir::init() | 247 | void QDir::init() |
235 | { | 248 | { |
236 | fList = 0; | 249 | fList = 0; |
237 | fiList = 0; | 250 | fiList = 0; |
238 | nameFilt = QString::fromLatin1("*"); | 251 | nameFilt = QString::fromLatin1("*"); |
239 | dirty = TRUE; | 252 | dirty = TRUE; |
240 | allDirs = FALSE; | 253 | allDirs = FALSE; |
241 | filtS = All; | 254 | filtS = All; |
242 | sortS = SortSpec(Name | IgnoreCase); | 255 | sortS = SortSpec(Name | IgnoreCase); |
243 | } | 256 | } |
244 | 257 | ||
245 | /*! | 258 | /*! |
246 | Destroys the QDir frees up its resources. | 259 | Destroys the QDir frees up its resources. |
247 | */ | 260 | */ |
248 | 261 | ||
249 | QDir::~QDir() | 262 | QDir::~QDir() |
250 | { | 263 | { |
251 | delete fList; | 264 | delete fList; |
252 | delete fiList; | 265 | delete fiList; |
253 | } | 266 | } |
254 | 267 | ||
255 | 268 | ||
256 | /*! | 269 | /*! |
257 | Sets the path of the directory to \a path. The path is cleaned of | 270 | Sets the path of the directory to \a path. The path is cleaned of |
258 | redundant ".", ".." and of multiple separators. No check is made | 271 | redundant ".", ".." and of multiple separators. No check is made |
259 | to ensure that a directory with this path exists. | 272 | to ensure that a directory with this path exists. |
260 | 273 | ||
261 | The path can be either absolute or relative. Absolute paths begin | 274 | The path can be either absolute or relative. Absolute paths begin |
262 | with the directory separator "/" (optionally preceded by a drive | 275 | with the directory separator "/" (optionally preceded by a drive |
263 | specification under Windows). Relative file names begin with a | 276 | specification under Windows). Relative file names begin with a |
264 | directory name or a file name and specify a path relative to the | 277 | directory name or a file name and specify a path relative to the |
265 | current directory. An example of an absolute path is the string | 278 | current directory. An example of an absolute path is the string |
266 | "/tmp/quartz", a relative path might look like "src/fatlib". | 279 | "/tmp/quartz", a relative path might look like "src/fatlib". |
267 | 280 | ||
268 | \sa path(), absPath(), exists(), cleanDirPath(), dirName(), | 281 | \sa path(), absPath(), exists(), cleanDirPath(), dirName(), |
269 | absFilePath(), isRelative(), convertToAbs() | 282 | absFilePath(), isRelative(), convertToAbs() |
270 | */ | 283 | */ |
271 | 284 | ||
272 | void QDir::setPath( const QString &path ) | 285 | void QDir::setPath( const QString &path ) |
273 | { | 286 | { |
274 | dPath = cleanDirPath( path ); | 287 | dPath = cleanDirPath( path ); |
275 | if ( dPath.isEmpty() ) | 288 | if ( dPath.isEmpty() ) |
276 | dPath = QString::fromLatin1("."); | 289 | dPath = QString::fromLatin1("."); |
277 | dirty = TRUE; | 290 | dirty = TRUE; |
278 | } | 291 | } |
279 | 292 | ||
280 | /*! | 293 | /*! |
281 | \fn QString QDir::path() const | 294 | \fn QString QDir::path() const |
282 | 295 | ||
283 | Returns the path, this may contain symbolic links, but never | 296 | Returns the path, this may contain symbolic links, but never |
284 | contains redundant ".", ".." or multiple separators. | 297 | contains redundant ".", ".." or multiple separators. |
285 | 298 | ||
286 | The returned path can be either absolute or relative (see | 299 | The returned path can be either absolute or relative (see |
287 | setPath()). | 300 | setPath()). |
288 | 301 | ||
289 | \sa setPath(), absPath(), exists(), cleanDirPath(), dirName(), | 302 | \sa setPath(), absPath(), exists(), cleanDirPath(), dirName(), |
290 | absFilePath(), convertSeparators() | 303 | absFilePath(), convertSeparators() |
291 | */ | 304 | */ |
292 | 305 | ||
293 | /*! | 306 | /*! |
294 | Returns the absolute path (a path that starts with "/" or with a | 307 | Returns the absolute path (a path that starts with "/" or with a |
295 | drive specification), which may contain symbolic links, but never | 308 | drive specification), which may contain symbolic links, but never |
296 | contains redundant ".", ".." or multiple separators. | 309 | contains redundant ".", ".." or multiple separators. |
@@ -321,132 +334,158 @@ QString QDir::absPath() const | |||
321 | No check is made to ensure that a directory with this name | 334 | No check is made to ensure that a directory with this name |
322 | actually exists. | 335 | actually exists. |
323 | 336 | ||
324 | \sa path(), absPath(), absFilePath(), exists(), QString::isNull() | 337 | \sa path(), absPath(), absFilePath(), exists(), QString::isNull() |
325 | */ | 338 | */ |
326 | 339 | ||
327 | QString QDir::dirName() const | 340 | QString QDir::dirName() const |
328 | { | 341 | { |
329 | int pos = dPath.findRev( '/' ); | 342 | int pos = dPath.findRev( '/' ); |
330 | if ( pos == -1 ) | 343 | if ( pos == -1 ) |
331 | return dPath; | 344 | return dPath; |
332 | return dPath.right( dPath.length() - pos - 1 ); | 345 | return dPath.right( dPath.length() - pos - 1 ); |
333 | } | 346 | } |
334 | 347 | ||
335 | /*! | 348 | /*! |
336 | Returns the path name of a file in the directory. Does \e not | 349 | Returns the path name of a file in the directory. Does \e not |
337 | check if the file actually exists in the directory. If the QDir is | 350 | check if the file actually exists in the directory. If the QDir is |
338 | relative the returned path name will also be relative. Redundant | 351 | relative the returned path name will also be relative. Redundant |
339 | multiple separators or "." and ".." directories in \a fileName | 352 | multiple separators or "." and ".." directories in \a fileName |
340 | will not be removed (see cleanDirPath()). | 353 | will not be removed (see cleanDirPath()). |
341 | 354 | ||
342 | If \a acceptAbsPath is TRUE a \a fileName starting with a | 355 | If \a acceptAbsPath is TRUE a \a fileName starting with a |
343 | separator "/" will be returned without change. If \a acceptAbsPath | 356 | separator "/" will be returned without change. If \a acceptAbsPath |
344 | is FALSE an absolute path will be prepended to the fileName and | 357 | is FALSE an absolute path will be prepended to the fileName and |
345 | the resultant string returned. | 358 | the resultant string returned. |
346 | 359 | ||
347 | \sa absFilePath(), isRelative(), canonicalPath() | 360 | \sa absFilePath(), isRelative(), canonicalPath() |
348 | */ | 361 | */ |
349 | 362 | ||
350 | QString QDir::filePath( const QString &fileName, | 363 | QString QDir::filePath( const QString &fileName, |
351 | bool acceptAbsPath ) const | 364 | bool acceptAbsPath ) const |
352 | { | 365 | { |
353 | if ( acceptAbsPath && !isRelativePath(fileName) ) | 366 | if ( acceptAbsPath && !isRelativePath(fileName) ) |
354 | return QString(fileName); | 367 | return QString(fileName); |
355 | 368 | ||
356 | QString tmp = dPath; | 369 | QString tmp = dPath; |
357 | if ( tmp.isEmpty() || (tmp[(int)tmp.length()-1] != '/' && !!fileName && | 370 | if ( tmp.isEmpty() || (tmp[(int)tmp.length()-1] != '/' && !!fileName && |
358 | fileName[0] != '/') ) | 371 | fileName[0] != '/') ) |
359 | tmp += '/'; | 372 | tmp += '/'; |
360 | tmp += fileName; | 373 | tmp += fileName; |
361 | return tmp; | 374 | return tmp; |
362 | } | 375 | } |
363 | 376 | ||
364 | /*! | 377 | /*! |
365 | Returns the absolute path name of a file in the directory. Does \e | 378 | Returns the absolute path name of a file in the directory. Does \e |
366 | not check if the file actually exists in the directory. Redundant | 379 | not check if the file actually exists in the directory. Redundant |
367 | multiple separators or "." and ".." directories in \a fileName | 380 | multiple separators or "." and ".." directories in \a fileName |
368 | will not be removed (see cleanDirPath()). | 381 | will not be removed (see cleanDirPath()). |
369 | 382 | ||
370 | If \a acceptAbsPath is TRUE a \a fileName starting with a | 383 | If \a acceptAbsPath is TRUE a \a fileName starting with a |
371 | separator "/" will be returned without change. If \a acceptAbsPath | 384 | separator "/" will be returned without change. If \a acceptAbsPath |
372 | is FALSE an absolute path will be prepended to the fileName and | 385 | is FALSE an absolute path will be prepended to the fileName and |
373 | the resultant string returned. | 386 | the resultant string returned. |
374 | 387 | ||
375 | \sa filePath() | 388 | \sa filePath() |
376 | */ | 389 | */ |
377 | 390 | ||
378 | QString QDir::absFilePath( const QString &fileName, | 391 | QString QDir::absFilePath( const QString &fileName, |
379 | bool acceptAbsPath ) const | 392 | bool acceptAbsPath ) const |
380 | { | 393 | { |
381 | if ( acceptAbsPath && !isRelativePath( fileName ) ) | 394 | if ( acceptAbsPath && !isRelativePath( fileName ) ) |
382 | return fileName; | 395 | return fileName; |
383 | 396 | ||
384 | QString tmp = absPath(); | 397 | QString tmp = absPath(); |
385 | if ( tmp.isEmpty() || (tmp[(int)tmp.length()-1] != '/' && !!fileName && | 398 | #ifdef Q_OS_WIN32 |
386 | fileName[0] != '/') ) | 399 | if ( fileName[0].isLetter() && fileName[1] == ':' ) { |
387 | tmp += '/'; | 400 | int drv = fileName.upper()[0].latin1() - 'A' + 1; |
388 | tmp += fileName; | 401 | if ( _getdrive() != drv ) { |
402 | if ( qt_winunicode ) { | ||
403 | TCHAR buf[PATH_MAX]; | ||
404 | ::_tgetdcwd( drv, buf, PATH_MAX ); | ||
405 | tmp.setUnicodeCodes( (ushort*)buf, ::_tcslen(buf) ); | ||
406 | } else { | ||
407 | char buf[PATH_MAX]; | ||
408 | ::_getdcwd( drv, buf, PATH_MAX ); | ||
409 | tmp = buf; | ||
410 | } | ||
411 | if ( !tmp.endsWith("\\") ) | ||
412 | tmp += "\\"; | ||
413 | tmp += fileName.right( fileName.length() - 2 ); | ||
414 | int x; | ||
415 | for ( x = 0; x < (int) tmp.length(); x++ ) { | ||
416 | if ( tmp[x] == '\\' ) | ||
417 | tmp[x] = '/'; | ||
418 | } | ||
419 | } | ||
420 | } else | ||
421 | #endif | ||
422 | { | ||
423 | if ( tmp.isEmpty() || (tmp[(int)tmp.length()-1] != '/' && !!fileName && | ||
424 | fileName[0] != '/') ) | ||
425 | tmp += '/'; | ||
426 | tmp += fileName; | ||
427 | } | ||
389 | return tmp; | 428 | return tmp; |
390 | } | 429 | } |
391 | 430 | ||
392 | 431 | ||
393 | /*! | 432 | /*! |
394 | Returns \a pathName with the '/' separators converted to | 433 | Returns \a pathName with the '/' separators converted to |
395 | separators that are appropriate for the underlying operating | 434 | separators that are appropriate for the underlying operating |
396 | system. | 435 | system. |
397 | 436 | ||
398 | On Windows, convertSeparators("c:/winnt/system32") returns | 437 | On Windows, convertSeparators("c:/winnt/system32") returns |
399 | "c:\winnt\system32". | 438 | "c:\winnt\system32". |
400 | 439 | ||
401 | The returned string may be the same as the argument on some | 440 | The returned string may be the same as the argument on some |
402 | operating systems, for example on Unix. | 441 | operating systems, for example on Unix. |
403 | */ | 442 | */ |
404 | 443 | ||
405 | QString QDir::convertSeparators( const QString &pathName ) | 444 | QString QDir::convertSeparators( const QString &pathName ) |
406 | { | 445 | { |
407 | QString n( pathName ); | 446 | QString n( pathName ); |
408 | #if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) | 447 | #if defined(Q_FS_FAT) || defined(Q_OS_OS2EMX) |
409 | for ( int i=0; i<(int)n.length(); i++ ) { | 448 | for ( int i=0; i<(int)n.length(); i++ ) { |
410 | if ( n[i] == '/' ) | 449 | if ( n[i] == '/' ) |
411 | n[i] = '\\'; | 450 | n[i] = '\\'; |
412 | } | 451 | } |
413 | #elif defined(Q_OS_MAC9) | 452 | #elif defined(Q_OS_MAC9) |
414 | while(n.length() && n[0] == '/' ) n = n.right(n.length()-1); | 453 | while(n.length() && n[0] == '/' ) n = n.right(n.length()-1); |
415 | for ( int i=0; i<(int)n.length(); i++ ) { | 454 | for ( int i=0; i<(int)n.length(); i++ ) { |
416 | if ( n[i] == '/' ) | 455 | if ( n[i] == '/' ) |
417 | n[i] = ':'; | 456 | n[i] = ':'; |
418 | } | 457 | } |
419 | if(n.contains(':') && n.left(1) != ':') | 458 | if(n.contains(':') && n.left(1) != ':') |
420 | n.prepend(':'); | 459 | n.prepend(':'); |
421 | #endif | 460 | #endif |
422 | return n; | 461 | return n; |
423 | } | 462 | } |
424 | 463 | ||
425 | 464 | ||
426 | /*! | 465 | /*! |
427 | Changes the QDir's directory to \a dirName. | 466 | Changes the QDir's directory to \a dirName. |
428 | 467 | ||
429 | If \a acceptAbsPath is TRUE a path starting with separator "/" | 468 | If \a acceptAbsPath is TRUE a path starting with separator "/" |
430 | will cause the function to change to the absolute directory. If \a | 469 | will cause the function to change to the absolute directory. If \a |
431 | acceptAbsPath is FALSE any number of separators at the beginning | 470 | acceptAbsPath is FALSE any number of separators at the beginning |
432 | of \a dirName will be removed and the function will descend into | 471 | of \a dirName will be removed and the function will descend into |
433 | \a dirName. | 472 | \a dirName. |
434 | 473 | ||
435 | Returns TRUE if the new directory exists and is readable; | 474 | Returns TRUE if the new directory exists and is readable; |
436 | otherwise returns FALSE. Note that the logical cd() operation is | 475 | otherwise returns FALSE. Note that the logical cd() operation is |
437 | not performed if the new directory does not exist. | 476 | not performed if the new directory does not exist. |
438 | 477 | ||
439 | Calling cd( ".." ) is equivalent to calling cdUp(). | 478 | Calling cd( ".." ) is equivalent to calling cdUp(). |
440 | 479 | ||
441 | \sa cdUp(), isReadable(), exists(), path() | 480 | \sa cdUp(), isReadable(), exists(), path() |
442 | */ | 481 | */ |
443 | 482 | ||
444 | bool QDir::cd( const QString &dirName, bool acceptAbsPath ) | 483 | bool QDir::cd( const QString &dirName, bool acceptAbsPath ) |
445 | { | 484 | { |
446 | if ( dirName.isEmpty() || dirName==QString::fromLatin1(".") ) | 485 | if ( dirName.isEmpty() || dirName==QString::fromLatin1(".") ) |
447 | return TRUE; | 486 | return TRUE; |
448 | QString old = dPath; | 487 | QString old = dPath; |
449 | if ( acceptAbsPath && !isRelativePath(dirName) ) { | 488 | if ( acceptAbsPath && !isRelativePath(dirName) ) { |
450 | dPath = cleanDirPath( dirName ); | 489 | dPath = cleanDirPath( dirName ); |
451 | } else { | 490 | } else { |
452 | if ( !isRoot() ) { | 491 | if ( !isRoot() ) { |
@@ -873,144 +912,146 @@ bool QDir::exists() const | |||
873 | */ | 912 | */ |
874 | 913 | ||
875 | bool QDir::isRelative() const | 914 | bool QDir::isRelative() const |
876 | { | 915 | { |
877 | return isRelativePath( dPath ); | 916 | return isRelativePath( dPath ); |
878 | } | 917 | } |
879 | 918 | ||
880 | /*! | 919 | /*! |
881 | Converts the directory path to an absolute path. If it is already | 920 | Converts the directory path to an absolute path. If it is already |
882 | absolute nothing is done. | 921 | absolute nothing is done. |
883 | 922 | ||
884 | \sa isRelative() | 923 | \sa isRelative() |
885 | */ | 924 | */ |
886 | 925 | ||
887 | void QDir::convertToAbs() | 926 | void QDir::convertToAbs() |
888 | { | 927 | { |
889 | dPath = absPath(); | 928 | dPath = absPath(); |
890 | } | 929 | } |
891 | 930 | ||
892 | /*! | 931 | /*! |
893 | Makes a copy of QDir \a d and assigns it to this QDir. | 932 | Makes a copy of QDir \a d and assigns it to this QDir. |
894 | */ | 933 | */ |
895 | 934 | ||
896 | QDir &QDir::operator=( const QDir &d ) | 935 | QDir &QDir::operator=( const QDir &d ) |
897 | { | 936 | { |
898 | dPath = d.dPath; | 937 | dPath = d.dPath; |
899 | delete fList; | 938 | delete fList; |
900 | fList = 0; | 939 | fList = 0; |
901 | delete fiList; | 940 | delete fiList; |
902 | fiList = 0; | 941 | fiList = 0; |
903 | nameFilt = d.nameFilt; | 942 | nameFilt = d.nameFilt; |
904 | dirty = TRUE; | 943 | dirty = TRUE; |
905 | allDirs = d.allDirs; | 944 | allDirs = d.allDirs; |
906 | filtS = d.filtS; | 945 | filtS = d.filtS; |
907 | sortS = d.sortS; | 946 | sortS = d.sortS; |
908 | return *this; | 947 | return *this; |
909 | } | 948 | } |
910 | 949 | ||
911 | /*! | 950 | /*! |
912 | \overload | 951 | \overload |
913 | 952 | ||
914 | Sets the directory path to be the given \a path. | 953 | Sets the directory path to be the given \a path. |
915 | */ | 954 | */ |
916 | 955 | ||
917 | QDir &QDir::operator=( const QString &path ) | 956 | QDir &QDir::operator=( const QString &path ) |
918 | { | 957 | { |
919 | dPath = cleanDirPath( path ); | 958 | dPath = cleanDirPath( path ); |
920 | dirty = TRUE; | 959 | dirty = TRUE; |
921 | return *this; | 960 | return *this; |
922 | } | 961 | } |
923 | 962 | ||
924 | 963 | ||
925 | /*! | 964 | /*! |
926 | \fn bool QDir::operator!=( const QDir &d ) const | 965 | \fn bool QDir::operator!=( const QDir &d ) const |
927 | 966 | ||
928 | Returns TRUE if directory \a d and this directory have different | 967 | Returns TRUE if directory \a d and this directory have different |
929 | paths or different sort or filter settings; otherwise returns | 968 | paths or different sort or filter settings; otherwise returns |
930 | FALSE. | 969 | FALSE. |
931 | 970 | ||
932 | Example: | 971 | Example: |
933 | \code | 972 | \code |
934 | // The current directory is "/usr/local" | 973 | // The current directory is "/usr/local" |
935 | QDir d1( "/usr/local/bin" ); | 974 | QDir d1( "/usr/local/bin" ); |
936 | QDir d2( "bin" ); | 975 | QDir d2( "bin" ); |
937 | if ( d1 != d2 ) qDebug( "They differ\n" ); // This is printed | 976 | if ( d1 != d2 ) |
977 | qDebug( "They differ" ); | ||
938 | \endcode | 978 | \endcode |
939 | */ | 979 | */ |
940 | 980 | ||
941 | /*! | 981 | /*! |
942 | Returns TRUE if directory \a d and this directory have the same | 982 | Returns TRUE if directory \a d and this directory have the same |
943 | path and their sort and filter settings are the same; otherwise | 983 | path and their sort and filter settings are the same; otherwise |
944 | returns FALSE. | 984 | returns FALSE. |
945 | 985 | ||
946 | Example: | 986 | Example: |
947 | \code | 987 | \code |
948 | // The current directory is "/usr/local" | 988 | // The current directory is "/usr/local" |
949 | QDir d1( "/usr/local/bin" ); | 989 | QDir d1( "/usr/local/bin" ); |
950 | QDir d2( "bin" ); | 990 | QDir d2( "bin" ); |
951 | d2.convertToAbs(); | 991 | d2.convertToAbs(); |
952 | if ( d1 == d2 ) qDebug( "They're the same\n" ); // This is printed | 992 | if ( d1 == d2 ) |
993 | qDebug( "They're the same" ); | ||
953 | \endcode | 994 | \endcode |
954 | */ | 995 | */ |
955 | 996 | ||
956 | bool QDir::operator==( const QDir &d ) const | 997 | bool QDir::operator==( const QDir &d ) const |
957 | { | 998 | { |
958 | return dPath == d.dPath && | 999 | return dPath == d.dPath && |
959 | nameFilt == d.nameFilt && | 1000 | nameFilt == d.nameFilt && |
960 | allDirs == d.allDirs && | 1001 | allDirs == d.allDirs && |
961 | filtS == d.filtS && | 1002 | filtS == d.filtS && |
962 | sortS == d.sortS; | 1003 | sortS == d.sortS; |
963 | } | 1004 | } |
964 | 1005 | ||
965 | 1006 | ||
966 | /*! | 1007 | /*! |
967 | Removes the file, \a fileName. | 1008 | Removes the file, \a fileName. |
968 | 1009 | ||
969 | If \a acceptAbsPath is TRUE a path starting with separator "/" | 1010 | If \a acceptAbsPath is TRUE a path starting with separator "/" |
970 | will remove the file with the absolute path. If \a acceptAbsPath | 1011 | will remove the file with the absolute path. If \a acceptAbsPath |
971 | is FALSE any number of separators at the beginning of \a fileName | 1012 | is FALSE any number of separators at the beginning of \a fileName |
972 | will be removed and the resultant file name will be removed. | 1013 | will be removed and the resultant file name will be removed. |
973 | 1014 | ||
974 | Returns TRUE if the file is removed successfully; otherwise | 1015 | Returns TRUE if the file is removed successfully; otherwise |
975 | returns FALSE. | 1016 | returns FALSE. |
976 | */ | 1017 | */ |
977 | 1018 | ||
978 | bool QDir::remove( const QString &fileName, bool acceptAbsPath ) | 1019 | bool QDir::remove( const QString &fileName, bool acceptAbsPath ) |
979 | { | 1020 | { |
980 | if ( fileName.isEmpty() ) { | 1021 | if ( fileName.isEmpty() ) { |
981 | #if defined(QT_CHECK_NULL) | 1022 | #if defined(QT_CHECK_NULL) |
982 | qWarning( "QDir::remove: Empty or null file name" ); | 1023 | qWarning( "QDir::remove: Empty or null file name" ); |
983 | #endif | 1024 | #endif |
984 | return FALSE; | 1025 | return FALSE; |
985 | } | 1026 | } |
986 | QString p = filePath( fileName, acceptAbsPath ); | 1027 | QString p = filePath( fileName, acceptAbsPath ); |
987 | return QFile::remove( p ); | 1028 | return QFile::remove( p ); |
988 | } | 1029 | } |
989 | 1030 | ||
990 | /*! | 1031 | /*! |
991 | Checks for the existence of the file \a name. | 1032 | Checks for the existence of the file \a name. |
992 | 1033 | ||
993 | If \a acceptAbsPath is TRUE a path starting with separator "/" | 1034 | If \a acceptAbsPath is TRUE a path starting with separator "/" |
994 | will check the file with the absolute path. If \a acceptAbsPath is | 1035 | will check the file with the absolute path. If \a acceptAbsPath is |
995 | FALSE any number of separators at the beginning of \a name will be | 1036 | FALSE any number of separators at the beginning of \a name will be |
996 | removed and the resultant file name will be checked. | 1037 | removed and the resultant file name will be checked. |
997 | 1038 | ||
998 | Returns TRUE if the file exists; otherwise returns FALSE. | 1039 | Returns TRUE if the file exists; otherwise returns FALSE. |
999 | 1040 | ||
1000 | \sa QFileInfo::exists(), QFile::exists() | 1041 | \sa QFileInfo::exists(), QFile::exists() |
1001 | */ | 1042 | */ |
1002 | 1043 | ||
1003 | bool QDir::exists( const QString &name, bool acceptAbsPath ) //### const in 4.0 | 1044 | bool QDir::exists( const QString &name, bool acceptAbsPath ) //### const in 4.0 |
1004 | { | 1045 | { |
1005 | if ( name.isEmpty() ) { | 1046 | if ( name.isEmpty() ) { |
1006 | #if defined(QT_CHECK_NULL) | 1047 | #if defined(QT_CHECK_NULL) |
1007 | qWarning( "QDir::exists: Empty or null file name" ); | 1048 | qWarning( "QDir::exists: Empty or null file name" ); |
1008 | #endif | 1049 | #endif |
1009 | return FALSE; | 1050 | return FALSE; |
1010 | } | 1051 | } |
1011 | QString tmp = filePath( name, acceptAbsPath ); | 1052 | QString tmp = filePath( name, acceptAbsPath ); |
1012 | return QFile::exists( tmp ); | 1053 | return QFile::exists( tmp ); |
1013 | } | 1054 | } |
1014 | 1055 | ||
1015 | /*! | 1056 | /*! |
1016 | Returns the native directory separator; "/" under UNIX (including | 1057 | Returns the native directory separator; "/" under UNIX (including |
@@ -1026,190 +1067,197 @@ char QDir::separator() | |||
1026 | #if defined(Q_OS_UNIX) | 1067 | #if defined(Q_OS_UNIX) |
1027 | return '/'; | 1068 | return '/'; |
1028 | #elif defined (Q_FS_FAT) || defined(Q_WS_WIN) | 1069 | #elif defined (Q_FS_FAT) || defined(Q_WS_WIN) |
1029 | return '\\'; | 1070 | return '\\'; |
1030 | #elif defined (Q_OS_MAC) | 1071 | #elif defined (Q_OS_MAC) |
1031 | return ':'; | 1072 | return ':'; |
1032 | #else | 1073 | #else |
1033 | return '/'; | 1074 | return '/'; |
1034 | #endif | 1075 | #endif |
1035 | } | 1076 | } |
1036 | 1077 | ||
1037 | /*! | 1078 | /*! |
1038 | Returns the application's current directory. | 1079 | Returns the application's current directory. |
1039 | 1080 | ||
1040 | Use path() to access a QDir object's path. | 1081 | Use path() to access a QDir object's path. |
1041 | 1082 | ||
1042 | \sa currentDirPath(), QDir::QDir() | 1083 | \sa currentDirPath(), QDir::QDir() |
1043 | */ | 1084 | */ |
1044 | 1085 | ||
1045 | QDir QDir::current() | 1086 | QDir QDir::current() |
1046 | { | 1087 | { |
1047 | return QDir( currentDirPath() ); | 1088 | return QDir( currentDirPath() ); |
1048 | } | 1089 | } |
1049 | 1090 | ||
1050 | /*! | 1091 | /*! |
1051 | Returns the home directory. | 1092 | Returns the home directory. |
1052 | 1093 | ||
1053 | Under Windows the \c HOME environment variable is used. If this | 1094 | Under Windows the \c HOME environment variable is used. If this |
1054 | does not exist the \c USERPROFILE environment variable is used. If | 1095 | does not exist the \c USERPROFILE environment variable is used. If |
1055 | that does not exist the path is formed by concatenating the \c | 1096 | that does not exist the path is formed by concatenating the \c |
1056 | HOMEDRIVE and \c HOMEPATH environment variables. If they don't | 1097 | HOMEDRIVE and \c HOMEPATH environment variables. If they don't |
1057 | exist the rootDirPath() is used (this uses the \c SystemDrive | 1098 | exist the rootDirPath() is used (this uses the \c SystemDrive |
1058 | environment variable). If none of these exist "C:\" is used. | 1099 | environment variable). If none of these exist "C:\" is used. |
1059 | 1100 | ||
1060 | Under non-Windows operating systems the \c HOME environment | 1101 | Under non-Windows operating systems the \c HOME environment |
1061 | variable is used if it exists, otherwise rootDirPath() is used. | 1102 | variable is used if it exists, otherwise rootDirPath() is used. |
1062 | 1103 | ||
1063 | \sa homeDirPath() | 1104 | \sa homeDirPath() |
1064 | */ | 1105 | */ |
1065 | 1106 | ||
1066 | QDir QDir::home() | 1107 | QDir QDir::home() |
1067 | { | 1108 | { |
1068 | return QDir( homeDirPath() ); | 1109 | return QDir( homeDirPath() ); |
1069 | } | 1110 | } |
1070 | 1111 | ||
1071 | /*! | 1112 | /*! |
1072 | Returns the root directory. | 1113 | Returns the root directory. |
1073 | 1114 | ||
1074 | \sa rootDirPath() drives() | 1115 | \sa rootDirPath() drives() |
1075 | */ | 1116 | */ |
1076 | 1117 | ||
1077 | QDir QDir::root() | 1118 | QDir QDir::root() |
1078 | { | 1119 | { |
1079 | return QDir( rootDirPath() ); | 1120 | return QDir( rootDirPath() ); |
1080 | } | 1121 | } |
1081 | 1122 | ||
1082 | /*! | 1123 | /*! |
1083 | \fn QString QDir::homeDirPath() | 1124 | \fn QString QDir::homeDirPath() |
1084 | 1125 | ||
1085 | Returns the absolute path of the user's home directory. | 1126 | Returns the absolute path of the user's home directory. |
1086 | 1127 | ||
1087 | \sa home() | 1128 | \sa home() |
1088 | */ | 1129 | */ |
1089 | 1130 | ||
1090 | QStringList qt_makeFilterList( const QString &filter ) | 1131 | QValueList<QRegExp> qt_makeFilterList( const QString &filter ) |
1091 | { | 1132 | { |
1133 | QValueList<QRegExp> regExps; | ||
1092 | if ( filter.isEmpty() ) | 1134 | if ( filter.isEmpty() ) |
1093 | return QStringList(); | 1135 | return regExps; |
1094 | 1136 | ||
1095 | QChar sep( ';' ); | 1137 | QChar sep( ';' ); |
1096 | int i = filter.find( sep, 0 ); | 1138 | int i = filter.find( sep, 0 ); |
1097 | if ( i == -1 && filter.find( ' ', 0 ) != -1 ) | 1139 | if ( i == -1 && filter.find( ' ', 0 ) != -1 ) |
1098 | sep = QChar( ' ' ); | 1140 | sep = QChar( ' ' ); |
1099 | 1141 | ||
1100 | QStringList list = QStringList::split( sep, filter ); | 1142 | QStringList list = QStringList::split( sep, filter ); |
1101 | QStringList::Iterator it = list.begin(); | 1143 | QStringList::Iterator it = list.begin(); |
1102 | QStringList list2; | 1144 | while ( it != list.end() ) { |
1145 | regExps << QRegExp( (*it).stripWhiteSpace(), CaseSensitiveFS, TRUE ); | ||
1146 | ++it; | ||
1147 | } | ||
1148 | return regExps; | ||
1149 | } | ||
1103 | 1150 | ||
1104 | for ( ; it != list.end(); ++it ) { | 1151 | bool qt_matchFilterList( const QValueList<QRegExp>& filters, |
1105 | QString s = *it; | 1152 | const QString &fileName ) |
1106 | list2 << s.stripWhiteSpace(); | 1153 | { |
1154 | QValueList<QRegExp>::ConstIterator rit = filters.begin(); | ||
1155 | while ( rit != filters.end() ) { | ||
1156 | if ( (*rit).exactMatch(fileName) ) | ||
1157 | return TRUE; | ||
1158 | ++rit; | ||
1107 | } | 1159 | } |
1108 | return list2; | 1160 | return FALSE; |
1109 | } | 1161 | } |
1110 | 1162 | ||
1163 | |||
1111 | /*! | 1164 | /*! |
1112 | \overload | 1165 | \overload |
1113 | 1166 | ||
1114 | Returns TRUE if the \a fileName matches any of the wildcard (glob) | 1167 | Returns TRUE if the \a fileName matches any of the wildcard (glob) |
1115 | patterns in the list of \a filters; otherwise returns FALSE. | 1168 | patterns in the list of \a filters; otherwise returns FALSE. |
1116 | 1169 | ||
1117 | (See \link qregexp.html#wildcard-matching QRegExp wildcard | 1170 | (See \link qregexp.html#wildcard-matching QRegExp wildcard |
1118 | matching.\endlink) | 1171 | matching.\endlink) |
1119 | \sa QRegExp::match() | 1172 | \sa QRegExp::match() |
1120 | */ | 1173 | */ |
1121 | 1174 | ||
1122 | bool QDir::match( const QStringList &filters, const QString &fileName ) | 1175 | bool QDir::match( const QStringList &filters, const QString &fileName ) |
1123 | { | 1176 | { |
1124 | QStringList::ConstIterator sit = filters.begin(); | 1177 | QStringList::ConstIterator sit = filters.begin(); |
1125 | while ( sit != filters.end() ) { | 1178 | while ( sit != filters.end() ) { |
1126 | #if defined(Q_FS_FAT) && !defined(Q_OS_UNIX) | 1179 | QRegExp rx( *sit, CaseSensitiveFS, TRUE ); |
1127 | QRegExp rx( *sit, FALSE, TRUE ); // The FAT FS is not case sensitive.. | ||
1128 | #else | ||
1129 | QRegExp rx( *sit, TRUE, TRUE ); // ..while others are. | ||
1130 | #endif | ||
1131 | if ( rx.exactMatch(fileName) ) | 1180 | if ( rx.exactMatch(fileName) ) |
1132 | return TRUE; | 1181 | return TRUE; |
1133 | ++sit; | 1182 | ++sit; |
1134 | } | 1183 | } |
1135 | return FALSE; | 1184 | return FALSE; |
1136 | } | 1185 | } |
1137 | 1186 | ||
1138 | /*! | 1187 | /*! |
1139 | Returns TRUE if the \a fileName matches the wildcard (glob) | 1188 | Returns TRUE if the \a fileName matches the wildcard (glob) |
1140 | pattern \a filter; otherwise returns FALSE. The \a filter may | 1189 | pattern \a filter; otherwise returns FALSE. The \a filter may |
1141 | contain multiple patterns separated by spaces or semicolons. | 1190 | contain multiple patterns separated by spaces or semicolons. |
1142 | 1191 | ||
1143 | (See \link qregexp.html#wildcard-matching QRegExp wildcard | 1192 | (See \link qregexp.html#wildcard-matching QRegExp wildcard |
1144 | matching.\endlink) | 1193 | matching.\endlink) |
1145 | \sa QRegExp::match() | 1194 | \sa QRegExp::match() |
1146 | */ | 1195 | */ |
1147 | 1196 | ||
1148 | bool QDir::match( const QString &filter, const QString &fileName ) | 1197 | bool QDir::match( const QString &filter, const QString &fileName ) |
1149 | { | 1198 | { |
1150 | QStringList lst = qt_makeFilterList( filter ); | 1199 | return qt_matchFilterList( qt_makeFilterList(filter), fileName ); |
1151 | return match( lst, fileName ); | ||
1152 | } | 1200 | } |
1153 | 1201 | ||
1154 | 1202 | ||
1155 | /*! | 1203 | /*! |
1156 | Removes all multiple directory separators "/" and resolves any | 1204 | Removes all multiple directory separators "/" and resolves any |
1157 | "."s or ".."s found in the path, \a filePath. | 1205 | "."s or ".."s found in the path, \a filePath. |
1158 | 1206 | ||
1159 | Symbolic links are kept. This function does not return the | 1207 | Symbolic links are kept. This function does not return the |
1160 | canonical path, but rather the simplest version of the input. | 1208 | canonical path, but rather the simplest version of the input. |
1161 | For example, "./local" becomes "local", "local/../bin" becomes | 1209 | For example, "./local" becomes "local", "local/../bin" becomes |
1162 | "bin" and "/local/usr/../bin" becomes "/local/bin". | 1210 | "bin" and "/local/usr/../bin" becomes "/local/bin". |
1163 | 1211 | ||
1164 | \sa absPath() canonicalPath() | 1212 | \sa absPath() canonicalPath() |
1165 | */ | 1213 | */ |
1166 | 1214 | ||
1167 | QString QDir::cleanDirPath( const QString &filePath ) | 1215 | QString QDir::cleanDirPath( const QString &filePath ) |
1168 | { | 1216 | { |
1169 | QString name = filePath; | 1217 | QString name = filePath; |
1170 | QString newPath; | 1218 | QString newPath; |
1171 | 1219 | ||
1172 | if ( name.isEmpty() ) | 1220 | if ( name.isEmpty() ) |
1173 | return name; | 1221 | return name; |
1174 | 1222 | ||
1175 | slashify( name ); | 1223 | slashify( name ); |
1176 | 1224 | ||
1177 | bool addedSeparator; | 1225 | bool addedSeparator; |
1178 | if ( isRelativePath(name) ) { | 1226 | if ( isRelativePath(name) ) { |
1179 | addedSeparator = TRUE; | 1227 | addedSeparator = TRUE; |
1180 | name.insert( 0, '/' ); | 1228 | name.insert( 0, '/' ); |
1181 | } else { | 1229 | } else { |
1182 | addedSeparator = FALSE; | 1230 | addedSeparator = FALSE; |
1183 | } | 1231 | } |
1184 | 1232 | ||
1185 | int ePos, pos, upLevel; | 1233 | int ePos, pos, upLevel; |
1186 | 1234 | ||
1187 | pos = ePos = name.length(); | 1235 | pos = ePos = name.length(); |
1188 | upLevel = 0; | 1236 | upLevel = 0; |
1189 | int len; | 1237 | int len; |
1190 | 1238 | ||
1191 | while ( pos && (pos = name.findRev('/',--pos)) != -1 ) { | 1239 | while ( pos && (pos = name.findRev('/',--pos)) != -1 ) { |
1192 | len = ePos - pos - 1; | 1240 | len = ePos - pos - 1; |
1193 | if ( len == 2 && name.at(pos + 1) == '.' | 1241 | if ( len == 2 && name.at(pos + 1) == '.' |
1194 | && name.at(pos + 2) == '.' ) { | 1242 | && name.at(pos + 2) == '.' ) { |
1195 | upLevel++; | 1243 | upLevel++; |
1196 | } else { | 1244 | } else { |
1197 | if ( len != 0 && (len != 1 || name.at(pos + 1) != '.') ) { | 1245 | if ( len != 0 && (len != 1 || name.at(pos + 1) != '.') ) { |
1198 | if ( !upLevel ) | 1246 | if ( !upLevel ) |
1199 | newPath = QString::fromLatin1("/") | 1247 | newPath = QString::fromLatin1("/") |
1200 | + name.mid(pos + 1, len) + newPath; | 1248 | + name.mid(pos + 1, len) + newPath; |
1201 | else | 1249 | else |
1202 | upLevel--; | 1250 | upLevel--; |
1203 | } | 1251 | } |
1204 | } | 1252 | } |
1205 | ePos = pos; | 1253 | ePos = pos; |
1206 | } | 1254 | } |
1207 | if ( addedSeparator ) { | 1255 | if ( addedSeparator ) { |
1208 | while ( upLevel-- ) | 1256 | while ( upLevel-- ) |
1209 | newPath.insert( 0, QString::fromLatin1("/..") ); | 1257 | newPath.insert( 0, QString::fromLatin1("/..") ); |
1210 | if ( !newPath.isEmpty() ) | 1258 | if ( !newPath.isEmpty() ) |
1211 | newPath.remove( 0, 1 ); | 1259 | newPath.remove( 0, 1 ); |
1212 | else | 1260 | else |
1213 | newPath = QString::fromLatin1("."); | 1261 | newPath = QString::fromLatin1("."); |
1214 | } else { | 1262 | } else { |
1215 | if ( newPath.isEmpty() ) | 1263 | if ( newPath.isEmpty() ) |