summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2009-08-03 14:49:46 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2009-08-04 08:06:21 (GMT)
commitd3c96863ec17a69c616bdcb12e6a99a874eba66d (patch)
treea3e0c512fbc7ba23679193c6271c3cd531971222 /src/gui
parent14f9cbbec204ba146205d12cb06577d41b5f974c (diff)
downloadQt-d3c96863ec17a69c616bdcb12e6a99a874eba66d.zip
Qt-d3c96863ec17a69c616bdcb12e6a99a874eba66d.tar.gz
Qt-d3c96863ec17a69c616bdcb12e6a99a874eba66d.tar.bz2
fix warnings on mingw (gcc4.4)
basically reordering members initialization in constructors or fixing singed/unsigned checks. Reviewed-by: Trustme
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/painting/qregion_win.cpp4
-rw-r--r--src/gui/util/qcompleter.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/painting/qregion_win.cpp b/src/gui/painting/qregion_win.cpp
index 2d5e76b..8708461 100644
--- a/src/gui/painting/qregion_win.cpp
+++ b/src/gui/painting/qregion_win.cpp
@@ -57,7 +57,7 @@ HRGN qt_tryCreateRegion(QRegion::RegionType type, int left, int top, int right,
{
const int tries = 10;
for (int i = 0; i < tries; ++i) {
- HRGN region;
+ HRGN region = 0;
switch (type) {
case QRegion::Rectangle:
region = CreateRectRgn(left, top, right, bottom);
@@ -96,7 +96,7 @@ QRegion qt_region_from_HRGN(HRGN rgn)
QRegion region;
RECT *r = reinterpret_cast<RECT*>(rd->Buffer);
- for (int i = 0; i < rd->rdh.nCount; ++i) {
+ for (uint i = 0; i < rd->rdh.nCount; ++i) {
QRect rect;
rect.setCoords(r->left, r->top, r->right - 1, r->bottom - 1);
++r;
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index a0a3756..f4dd87c 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -772,7 +772,7 @@ QMatchData QUnsortedModelEngine::filter(const QString& part, const QModelIndex&
///////////////////////////////////////////////////////////////////////////////
QCompleterPrivate::QCompleterPrivate()
: widget(0), proxy(0), popup(0), cs(Qt::CaseSensitive), role(Qt::EditRole), column(0),
- sorting(QCompleter::UnsortedModel), wrap(true), maxVisibleItems(7), eatFocusOut(true)
+ maxVisibleItems(7), sorting(QCompleter::UnsortedModel), wrap(true), eatFocusOut(true)
{
}