diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-09-28 16:16:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-29 08:12:32 +0200 |
| commit | d65dbb5d508d4cdbc383686428430035c205b21c (patch) | |
| tree | 35457ae8b8cb93fdae295ac28c78d221091b98d9 /src/gui/util | |
| parent | 66e7e69f00a08664f0c0a6ed62a37a6918eaf8f3 (diff) | |
Fix g++/MinGW compiler warnings.
- Assigned/Unused variables.
- Unsigned comparison >= 0 is always true.
- Constructor initialization order.
- Signed/Unsigned comparisons.
Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src/gui/util')
| -rw-r--r-- | src/gui/util/qcompleter.cpp | 2 | ||||
| -rw-r--r-- | src/gui/util/qsystemtrayicon_win.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp index 8245ba1e77..09cbe2bebf 100644 --- a/src/gui/util/qcompleter.cpp +++ b/src/gui/util/qcompleter.cpp @@ -474,6 +474,8 @@ QMatchData QCompletionEngine::filterHistory() return QMatchData(); bool isDirModel = false; bool isFsModel = false; + Q_UNUSED(isDirModel) + Q_UNUSED(isFsModel) #ifndef QT_NO_DIRMODEL isDirModel = (qobject_cast<QDirModel *>(source) != 0); #endif diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp index 03853acace..f449b27c85 100644 --- a/src/gui/util/qsystemtrayicon_win.cpp +++ b/src/gui/util/qsystemtrayicon_win.cpp @@ -424,7 +424,7 @@ QRect QSystemTrayIconSys::findIconGeometry(const int iconId) if (currentIconHandle == winId() && currentIconId == iconId && !isHidden) { SendMessage(trayHandle, TB_GETITEMRECT, toolbarButton , (LPARAM)data); - RECT iconRect = {0, 0}; + RECT iconRect = {0, 0, 0, 0}; if(ReadProcessMemory(trayProcess, data, &iconRect, sizeof(RECT), &numBytes)) { MapWindowPoints(trayHandle, NULL, (LPPOINT)&iconRect, 2); QRect geometry(iconRect.left + 1, iconRect.top + 1, |