Diffstat (limited to 'qmake/include/private/qdir_p.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qmake/include/private/qdir_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qmake/include/private/qdir_p.h b/qmake/include/private/qdir_p.h index 35dba28..a6c7c91 100644 --- a/qmake/include/private/qdir_p.h +++ b/qmake/include/private/qdir_p.h | |||
@@ -1,18 +1,18 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** $Id$ |
3 | ** | 3 | ** |
4 | ** Definition of some private QDir functions. | 4 | ** Definition of some private QDir functions. |
5 | ** | 5 | ** |
6 | ** Created : 2000.11.06 | 6 | ** Created : 001106 |
7 | ** | 7 | ** |
8 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 8 | ** Copyright (C) 2000 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 |
@@ -29,43 +29,44 @@ | |||
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 | #ifndef QDIR_P_H | 38 | #ifndef QDIR_P_H |
39 | #define QDIR_P_H | 39 | #define QDIR_P_H |
40 | 40 | ||
41 | |||
42 | // | 41 | // |
43 | // W A R N I N G | 42 | // W A R N I N G |
44 | // ------------- | 43 | // ------------- |
45 | // | 44 | // |
46 | // This file is not part of the Qt API. It exists for the convenience | 45 | // This file is not part of the Qt API. It exists for the convenience |
47 | // of qdir.cpp and qdir_*.cpp. | 46 | // of qdir.cpp and qdir_*.cpp. |
48 | // This header file may change from version to version without notice, | 47 | // This header file may change from version to version without notice, |
49 | // or even be removed. | 48 | // or even be removed. |
50 | // | 49 | // |
51 | // We mean it. | 50 | // We mean it. |
52 | // | 51 | // |
53 | // | 52 | // |
54 | 53 | ||
55 | #ifndef QT_H | 54 | #ifndef QT_H |
55 | #include "qregexp.h" | ||
56 | #include "qvaluelist.h" | ||
56 | #endif // QT_H | 57 | #endif // QT_H |
57 | 58 | ||
58 | extern QStringList qt_makeFilterList( const QString & ); | 59 | extern QValueList<QRegExp> qt_makeFilterList( const QString & ); |
59 | 60 | extern bool qt_matchFilterList( const QValueList<QRegExp> &, const QString & ); | |
60 | 61 | ||
61 | extern int qt_cmp_si_sortSpec; | 62 | extern int qt_cmp_si_sortSpec; |
62 | 63 | ||
63 | #if defined(Q_C_CALLBACKS) | 64 | #if defined(Q_C_CALLBACKS) |
64 | extern "C" { | 65 | extern "C" { |
65 | #endif | 66 | #endif |
66 | 67 | ||
67 | #ifdef Q_OS_TEMP | 68 | #ifdef Q_OS_TEMP |
68 | extern int __cdecl qt_cmp_si( const void *, const void * ); | 69 | extern int __cdecl qt_cmp_si( const void *, const void * ); |
69 | #else | 70 | #else |
70 | extern int qt_cmp_si( const void *, const void * ); | 71 | extern int qt_cmp_si( const void *, const void * ); |
71 | #endif | 72 | #endif |