summaryrefslogtreecommitdiff
path: root/freetype/qfontdata_p.h
Unidiff
Diffstat (limited to 'freetype/qfontdata_p.h') (more/less context) (ignore whitespace changes)
-rw-r--r--freetype/qfontdata_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/freetype/qfontdata_p.h b/freetype/qfontdata_p.h
index fc22c72..9da1d06 100644
--- a/freetype/qfontdata_p.h
+++ b/freetype/qfontdata_p.h
@@ -1,16 +1,16 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
@@ -24,25 +24,25 @@
24 24
25 25
26// 26//
27// W A R N I N G 27// W A R N I N G
28// ------------- 28// -------------
29// 29//
30// This file is not part of the Qt API. It exists for the convenience 30// This file is not part of the Qt API. It exists for the convenience
31// of qmenudata.cpp, qmenubar.cpp, qmenubar.cpp, qpopupmenu.cpp, 31// of qmenudata.cpp, qmenubar.cpp, qmenubar.cpp, qpopupmenu.cpp,
32// qmotifstyle.cpp and qwindowssstyle.cpp. This header file may change 32// qmotifstyle.cpp and qwindowssstyle.cpp. This header file may change
33// from version to version without notice, or even be removed. 33// from version to version without notice, or even be removed.
34// 34//
35// We mean it. 35// We mean it.
36// 36// oh, we're really scared.
37// 37//
38 38
39#ifndef QT_H 39#ifndef QT_H
40#endif // QT_H 40#endif // QT_H
41 41
42 struct QFontDef { // font definition 42 struct QFontDef { // font definition
43 QStringfamily; 43 QStringfamily;
44 QStringaddStyle; 44 QStringaddStyle;
45 int pointSize; 45 int pointSize;
46 uint styleHint: 8; 46 uint styleHint: 8;
47 uint styleStrategy: 8; 47 uint styleStrategy: 8;
48 uint charSet : 8; 48 uint charSet : 8;