1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
--- /tmp/qapplication_p.h 2008-07-14 11:39:24.000000000 +0200
+++ qt-embedded-linux-opensource-src-4.4.0/src/gui/kernel/qapplication_p.h 2008-07-14 11:39:47.000000000 +0200
@@ -344,7 +344,7 @@
# endif
QRect maxWindowRect(const QScreen *screen) const { return maxWindowRects[screen]; }
void setMaxWindowRect(const QScreen *screen, int screenNo, const QRect &rect);
- void setScreenTransformation(QScreen *screen, int screen, int transformation);
+ void setScreenTransformation(QScreen *screen, int screenNo, int transformation);
#endif
static QApplicationPrivate *instance() { return self; }
--- /tmp/qdrawhelper_p.h 2008-07-14 11:48:26.000000000 +0200
+++ qt-embedded-linux-opensource-src-4.4.0/src/gui/painting/qdrawhelper_p.h 2008-07-14 11:50:12.000000000 +0200
@@ -1379,7 +1379,7 @@
static inline quint32 qt_convertToRgb(SRC color);
template <>
-static inline quint32 qt_convertToRgb(quint32 color)
+inline quint32 qt_convertToRgb(quint32 color)
{
const int r = qRed(color) >> (8 - qrgb::len_red);
const int g = qGreen(color) >> (8 - qrgb::len_green);
@@ -1394,7 +1394,7 @@
}
template <>
-static inline quint32 qt_convertToRgb(quint16 color)
+inline quint32 qt_convertToRgb(quint16 color)
{
return qt_convertToRgb(qt_colorConvert<quint32, quint16>(color, 0));
}
@@ -1422,14 +1422,14 @@
} Q_PACKED;
template <>
-static inline qrgb_generic16 qt_colorConvert(quint32 color, qrgb_generic16 dummy)
+inline qrgb_generic16 qt_colorConvert(quint32 color, qrgb_generic16 dummy)
{
Q_UNUSED(dummy);
return qrgb_generic16(color);
}
template <>
-static inline qrgb_generic16 qt_colorConvert(quint16 color, qrgb_generic16 dummy)
+inline qrgb_generic16 qt_colorConvert(quint16 color, qrgb_generic16 dummy)
{
Q_UNUSED(dummy);
return qrgb_generic16(qt_colorConvert<quint32, quint16>(color, 0));
--- /tmp/qscreen_qws.cpp 2008-07-14 11:51:39.000000000 +0200
+++ qt-embedded-linux-opensource-src-4.4.0/src/gui/embedded/qscreen_qws.cpp 2008-07-14 11:52:56.000000000 +0200
@@ -828,13 +828,13 @@
static inline quint8 qt_convertToGray4(SRC color);
template <>
-static inline quint8 qt_convertToGray4(quint32 color)
+inline quint8 qt_convertToGray4(quint32 color)
{
return qGray(color) >> 4;
}
template <>
-static inline quint8 qt_convertToGray4(quint16 color)
+inline quint8 qt_convertToGray4(quint16 color)
{
const int r = (color & 0xf800) >> 11;
const int g = (color & 0x07e0) >> 6; // only keep 5 bit
@@ -843,13 +843,13 @@
}
template <>
-static inline quint8 qt_convertToGray4(qrgb444 color)
+inline quint8 qt_convertToGray4(qrgb444 color)
{
return qt_convertToGray4(quint32(color));
}
template <>
-static inline quint8 qt_convertToGray4(qargb4444 color)
+inline quint8 qt_convertToGray4(qargb4444 color)
{
return qt_convertToGray4(quint32(color));
}
@@ -969,25 +969,25 @@
static inline quint8 qt_convertToMono(SRC color);
template <>
-static inline quint8 qt_convertToMono(quint32 color)
+inline quint8 qt_convertToMono(quint32 color)
{
return qGray(color) >> 7;
}
template <>
-static inline quint8 qt_convertToMono(quint16 color)
+inline quint8 qt_convertToMono(quint16 color)
{
return (qGray(qt_colorConvert<quint32, quint16>(color, 0)) >> 7);
}
template <>
-static inline quint8 qt_convertToMono(qargb4444 color)
+inline quint8 qt_convertToMono(qargb4444 color)
{
return (qGray(quint32(color)) >> 7);
}
template <>
-static inline quint8 qt_convertToMono(qrgb444 color)
+inline quint8 qt_convertToMono(qrgb444 color)
{
return (qGray(quint32(color)) >> 7);
}
--- /tmp/qdrawhelper.cpp 2008-07-14 11:56:25.000000000 +0200
+++ qt-embedded-linux-opensource-src-4.4.0/src/gui/painting/qdrawhelper.cpp 2008-07-14 11:57:29.000000000 +0200
@@ -3374,7 +3374,7 @@
#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
template <>
-static inline void madd_4(qargb8565 *dest, const quint32 a, const qargb8565 *src)
+inline void madd_4(qargb8565 *dest, const quint32 a, const qargb8565 *src)
{
Q_ASSERT((quintptr(dest) & 0x3) == 0);
Q_ASSERT((quintptr(src) & 0x3) == 0);
@@ -3455,7 +3455,7 @@
#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
template <>
-static inline void madd_4(qargb8555 *dest, const quint32 a, const qargb8555 *src)
+inline void madd_4(qargb8555 *dest, const quint32 a, const qargb8555 *src)
{
Q_ASSERT((quintptr(dest) & 0x3) == 0);
Q_ASSERT((quintptr(src) & 0x3) == 0);
|
