Diffstat (limited to 'qmake/include/private/qcomplextext_p.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qmake/include/private/qcomplextext_p.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/qmake/include/private/qcomplextext_p.h b/qmake/include/private/qcomplextext_p.h index 2132522..c3aeeb1 100644 --- a/qmake/include/private/qcomplextext_p.h +++ b/qmake/include/private/qcomplextext_p.h | |||
@@ -1,87 +1,85 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | ** $Id$ | 2 | ** $Id$ |
3 | ** | 3 | ** |
4 | ** Internal header file. | 4 | ** Internal header file. |
5 | ** | 5 | ** |
6 | ** Created : | 6 | ** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. |
7 | ** | ||
8 | ** Copyright (C) 2001 Trolltech AS. All rights reserved. | ||
9 | ** | 7 | ** |
10 | ** This file is part of the kernel module of the Qt GUI Toolkit. | 8 | ** This file is part of the kernel module of the Qt GUI Toolkit. |
11 | ** | 9 | ** |
12 | ** This file may be distributed under the terms of the Q Public License | 10 | ** 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 | 11 | ** as defined by Trolltech AS of Norway and appearing in the file |
14 | ** LICENSE.QPL included in the packaging of this file. | 12 | ** LICENSE.QPL included in the packaging of this file. |
15 | ** | 13 | ** |
16 | ** This file may be distributed and/or modified under the terms of the | 14 | ** 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 | 15 | ** GNU General Public License version 2 as published by the Free Software |
18 | ** Foundation and appearing in the file LICENSE.GPL included in the | 16 | ** Foundation and appearing in the file LICENSE.GPL included in the |
19 | ** packaging of this file. | 17 | ** packaging of this file. |
20 | ** | 18 | ** |
21 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition | 19 | ** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition |
22 | ** licenses may use this file in accordance with the Qt Commercial License | 20 | ** licenses may use this file in accordance with the Qt Commercial License |
23 | ** Agreement provided with the Software. | 21 | ** Agreement provided with the Software. |
24 | ** | 22 | ** |
25 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 23 | ** 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. | 24 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
27 | ** | 25 | ** |
28 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for | 26 | ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for |
29 | ** information about Qt Commercial License Agreements. | 27 | ** information about Qt Commercial License Agreements. |
30 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. | 28 | ** See http://www.trolltech.com/qpl/ for QPL licensing information. |
31 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 29 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
32 | ** | 30 | ** |
33 | ** Contact info@trolltech.com if any conditions of this licensing are | 31 | ** Contact info@trolltech.com if any conditions of this licensing are |
34 | ** not clear to you. | 32 | ** not clear to you. |
35 | ** | 33 | ** |
36 | **********************************************************************/ | 34 | **********************************************************************/ |
37 | 35 | ||
38 | #ifndef QCOMPLEXTEXT_H | 36 | #ifndef QCOMPLEXTEXT_P_H |
39 | #define QCOMPLEXTEXT_H | 37 | #define QCOMPLEXTEXT_P_H |
40 | 38 | ||
41 | // | 39 | // |
42 | // W A R N I N G | 40 | // W A R N I N G |
43 | // ------------- | 41 | // ------------- |
44 | // | 42 | // |
45 | // This file is not part of the Qt API. It exists for the convenience | 43 | // This file is not part of the Qt API. It exists for the convenience |
46 | // of Qt Remote Control. This header file may change from version to | 44 | // of Qt Remote Control. This header file may change from version to |
47 | // version without notice, or even be removed. | 45 | // version without notice, or even be removed. |
48 | // | 46 | // |
49 | // We mean it. | 47 | // We mean it. |
50 | // | 48 | // |
51 | // | 49 | // |
52 | 50 | ||
53 | #ifndef QT_H | 51 | #ifndef QT_H |
54 | #include <qstring.h> | 52 | #include <qstring.h> |
55 | #include <qpointarray.h> | 53 | #include <qpointarray.h> |
56 | #include <qfont.h> | 54 | #include <qfont.h> |
57 | #include <qpainter.h> | 55 | #include <qpainter.h> |
58 | #include <qptrlist.h> | 56 | #include <qptrlist.h> |
59 | #include <qshared.h> | 57 | #include <qshared.h> |
60 | #endif // QT_H | 58 | #endif // QT_H |
61 | 59 | ||
62 | #ifndef QT_NO_COMPLEXTEXT | 60 | #ifndef QT_NO_COMPLEXTEXT |
63 | 61 | ||
64 | // bidi helper classes. Internal to Qt | 62 | // bidi helper classes. Internal to Qt |
65 | struct Q_EXPORT QBidiStatus { | 63 | struct Q_EXPORT QBidiStatus { |
66 | QBidiStatus() { | 64 | QBidiStatus() { |
67 | eor = QChar::DirON; | 65 | eor = QChar::DirON; |
68 | lastStrong = QChar::DirON; | 66 | lastStrong = QChar::DirON; |
69 | last = QChar:: DirON; | 67 | last = QChar:: DirON; |
70 | } | 68 | } |
71 | QChar::Direction eor; | 69 | QChar::Direction eor; |
72 | QChar::Direction lastStrong; | 70 | QChar::Direction lastStrong; |
73 | QChar::Direction last; | 71 | QChar::Direction last; |
74 | }; | 72 | }; |
75 | 73 | ||
76 | struct Q_EXPORT QBidiContext : public QShared { | 74 | struct Q_EXPORT QBidiContext : public QShared { |
77 | // ### ref and deref parent? | 75 | // ### ref and deref parent? |
78 | QBidiContext( uchar level, QChar::Direction embedding, QBidiContext *parent = 0, bool override = FALSE ); | 76 | QBidiContext( uchar level, QChar::Direction embedding, QBidiContext *parent = 0, bool override = FALSE ); |
79 | ~QBidiContext(); | 77 | ~QBidiContext(); |
80 | 78 | ||
81 | unsigned char level; | 79 | unsigned char level; |
82 | bool override : 1; | 80 | bool override : 1; |
83 | QChar::Direction dir : 5; | 81 | QChar::Direction dir : 5; |
84 | 82 | ||
85 | QBidiContext *parent; | 83 | QBidiContext *parent; |
86 | }; | 84 | }; |
87 | 85 | ||