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
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
|
--- qt4-x11-4.3.1.orig/config.tests/unix/endian.test
+++ qt4-x11-4.3.1/config.tests/unix/endian.test
@@ -30,6 +30,7 @@
[ "$VERBOSE" = "yes" ] && echo " Found 'MostSignificantByteFirst' in binary"
ENDIAN="BIG"
fi
+[ "$VERBOSE" = "yes" ] && make clean || make clean >/dev/null 2>&1
# done
if [ "$ENDIAN" = "LITTLE" ]; then
--- qt4-x11-4.3.1.orig/config.tests/x11/glib/glib.cpp
+++ qt4-x11-4.3.1/config.tests/x11/glib/glib.cpp
@@ -6,7 +6,7 @@
{
GMainContext *context;
GSource *source;
- GPollFD *pollfd;
+ GPollFD *pollfd = NULL;
if (!g_thread_supported())
g_thread_init(NULL);
context = g_main_context_default();
--- qt4-x11-4.3.1.orig/src/corelib/codecs/qtextcodec.cpp
+++ qt4-x11-4.3.1/src/corelib/codecs/qtextcodec.cpp
@@ -432,7 +432,7 @@
localeMapper = checkForCodec(lang);
// 5. "@euro"
- if (!localeMapper && ctype && strstr(ctype, "@euro") || lang && strstr(lang, "@euro"))
+ if ((!localeMapper && ctype && strstr(ctype, "@euro")) || (lang && strstr(lang, "@euro")))
localeMapper = checkForCodec("ISO 8859-15");
// 6. guess locale from ctype unless ctype is "C"
--- qt4-x11-4.3.1.orig/src/corelib/io/qtextstream.cpp
+++ qt4-x11-4.3.1/src/corelib/io/qtextstream.cpp
@@ -556,8 +556,8 @@
if (!codec || autoDetectUnicode) {
autoDetectUnicode = false;
- if (bytesRead >= 2 && (uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe
- || uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff)) {
+ if (bytesRead >= 2 && ((uchar(buf[0]) == 0xff && uchar(buf[1]) == 0xfe)
+ || (uchar(buf[0]) == 0xfe && uchar(buf[1]) == 0xff))) {
codec = QTextCodec::codecForName("UTF-16");
} else if (!codec) {
codec = QTextCodec::codecForLocale();
--- qt4-x11-4.3.1.orig/src/corelib/io/qurl.cpp
+++ qt4-x11-4.3.1/src/corelib/io/qurl.cpp
@@ -4740,9 +4740,9 @@
if (include.isEmpty()) {
for (int i = 0; i < len; ++i) {
unsigned char c = *inputData++;
- if (c >= 0x61 && c <= 0x7A // ALPHA
- || c >= 0x41 && c <= 0x5A // ALPHA
- || c >= 0x30 && c <= 0x39 // DIGIT
+ if ((c >= 0x61 && c <= 0x7A) // ALPHA
+ || (c >= 0x41 && c <= 0x5A) // ALPHA
+ || (c >= 0x30 && c <= 0x39) // DIGIT
|| c == 0x2D // -
|| c == 0x2E // .
|| c == 0x5F // _
@@ -4759,9 +4759,9 @@
const char * alsoEncode = include.constData();
for (int i = 0; i < len; ++i) {
unsigned char c = *inputData++;
- if ((c >= 0x61 && c <= 0x7A // ALPHA
- || c >= 0x41 && c <= 0x5A // ALPHA
- || c >= 0x30 && c <= 0x39 // DIGIT
+ if (((c >= 0x61 && c <= 0x7A) // ALPHA
+ || (c >= 0x41 && c <= 0x5A) // ALPHA
+ || (c >= 0x30 && c <= 0x39) // DIGIT
|| c == 0x2D // -
|| c == 0x2E // .
|| c == 0x5F // _
--- qt4-x11-4.3.1.orig/src/corelib/tools/qlocale.cpp
+++ qt4-x11-4.3.1/src/corelib/tools/qlocale.cpp
@@ -2609,8 +2609,8 @@
QChar c1 = format.at(i);
QChar c2 = format.at(i + 1);
- if (c1.unicode() == 'a' && c2.unicode() == 'p'
- || c1.unicode() == 'A' && c2.unicode() == 'P')
+ if ((c1.unicode() == 'a' && c2.unicode() == 'p')
+ || (c1.unicode() == 'A' && c2.unicode() == 'P'))
return true;
++i;
--- qt4-x11-4.3.1.orig/src/gui/kernel/qapplication.cpp
+++ qt4-x11-4.3.1/src/gui/kernel/qapplication.cpp
@@ -2036,11 +2036,11 @@
#ifndef QT_NO_TRANSLATION
static bool qt_detectRTLLanguage()
{
- return force_reverse ^
+ return (force_reverse ^
QApplication::tr("QT_LAYOUT_DIRECTION",
"Translate this string to the string 'LTR' in left-to-right"
" languages or to 'RTL' in right-to-left languages (such as Hebrew"
- " and Arabic) to get proper widget layout.") == QLatin1String("RTL");
+ " and Arabic) to get proper widget layout.") == QLatin1String("RTL"));
}
#endif
--- qt4-x11-4.3.1.orig/src/gui/kernel/qkeymapper_x11.cpp
+++ qt4-x11-4.3.1/src/gui/kernel/qkeymapper_x11.cpp
@@ -1330,8 +1330,8 @@
}
if (directionKeyEvent && lastWinId == keyWidget->internalWinId()) {
- if (keysym == XK_Shift_L && directionKeyEvent == XK_Control_L ||
- keysym == XK_Control_L && directionKeyEvent == XK_Shift_L) {
+ if ((keysym == XK_Shift_L && directionKeyEvent == XK_Control_L) ||
+ (keysym == XK_Control_L && directionKeyEvent == XK_Shift_L)) {
directionKeyEvent = Qt::Key_Direction_L;
} else if (keysym == XK_Shift_R && directionKeyEvent == XK_Control_R ||
keysym == XK_Control_R && directionKeyEvent == XK_Shift_R) {
--- qt4-x11-4.3.1.orig/src/gui/kernel/qwidget.cpp
+++ qt4-x11-4.3.1/src/gui/kernel/qwidget.cpp
@@ -1830,7 +1830,7 @@
for (int i = 0; i < pd->children.size(); ++i) {
QWidget *w = qobject_cast<QWidget *>(pd->children.at(i));
- if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created))
+ if (w && !w->isWindow() && !w->testAttribute(Qt::WA_WState_Created)) {
if (w!=q) {
w->create();
} else {
@@ -1840,6 +1840,7 @@
if (winid)
w->raise();
}
+ }
}
} else {
q->create();
--- qt4-x11-4.3.1.orig/src/gui/painting/qregion_unix.cpp
+++ qt4-x11-4.3.1/src/gui/painting/qregion_unix.cpp
@@ -1944,7 +1944,7 @@
else
--isInside;
- if (!inside && !isInside || inside && isInside) {
+ if ((!inside && !isInside) || (inside && isInside)) {
pWETE->nextWETE = AET;
pWETE = AET;
inside = !inside;
--- qt4-x11-4.3.1.orig/src/tools/uic/driver.cpp
+++ qt4-x11-4.3.1/src/tools/uic/driver.cpp
@@ -175,7 +175,7 @@
static bool isAnsiCCharacter(const QChar& c)
{
- return c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z')
+ return (c.toUpper() >= QLatin1Char('A') && c.toUpper() <= QLatin1Char('Z'))
|| c.isDigit() || c == QLatin1Char('_');
}
|
