From abe5a0a432116963d22c4ef501a4dfd2393d66fb Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 17 Nov 2011 17:09:32 +0100 Subject: qtbase: Warnings fixes. Change-Id: Ie97e36bc168b3de3cae2d0eb615e777884529a06 Reviewed-by: Bradley T. Hughes --- src/corelib/global/qnamespace.h | 2 +- src/gui/kernel/qguiapplication.cpp | 2 +- src/plugins/platforms/windows/qwindowsole.cpp | 3 +-- src/printsupport/dialogs/qpagesetupdialog_win.cpp | 3 --- src/printsupport/kernel/qprintengine_win.cpp | 1 - src/widgets/accessible/qaccessiblewidget.cpp | 2 +- src/widgets/dialogs/qfiledialog.cpp | 1 + src/widgets/itemviews/qabstractitemview.cpp | 4 ++-- src/widgets/kernel/qinputcontext.cpp | 1 + src/widgets/kernel/qwidget.cpp | 1 - src/widgets/styles/qwindowsvistastyle.cpp | 8 -------- src/widgets/styles/qwindowsxpstyle.cpp | 1 - src/widgets/util/qcompleter.cpp | 13 +++++++++---- 13 files changed, 17 insertions(+), 25 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index a6e649ee0b..ccc6bbd6b2 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -185,7 +185,7 @@ public: ExtraButton24 = 0x04000000, MaxMouseButton = ExtraButton24, // 4 high-order bits remain available for future use (0x08000000 through 0x40000000). - MouseButtonMask = 0xffffffff, + MouseButtonMask = 0xffffffff }; Q_DECLARE_FLAGS(MouseButtons, MouseButton) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index b1abe659e4..8f74e3d3db 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -620,7 +620,7 @@ void QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::Mo } else { // Check to see if a new button has been pressed/released. for (int check = Qt::LeftButton; - check <= Qt::MaxMouseButton; + check <= int(Qt::MaxMouseButton); check = check << 1) { if (check & stateChange) { button = Qt::MouseButton(check); diff --git a/src/plugins/platforms/windows/qwindowsole.cpp b/src/plugins/platforms/windows/qwindowsole.cpp index 15e2622e64..f7b84a7b66 100644 --- a/src/plugins/platforms/windows/qwindowsole.cpp +++ b/src/plugins/platforms/windows/qwindowsole.cpp @@ -458,13 +458,12 @@ bool QWindowsOleEnumFmtEtc::copyFormatEtc(LPFORMATETC dest, LPFORMATETC src) con *dest = *src; if (src->ptd) { - LPVOID pout; LPMALLOC pmalloc; if (CoGetMalloc(MEMCTX_TASK, &pmalloc) != NOERROR) return false; - pout = (LPVOID)pmalloc->Alloc(src->ptd->tdSize); + pmalloc->Alloc(src->ptd->tdSize); memcpy(dest->ptd, src->ptd, size_t(src->ptd->tdSize)); pmalloc->Release(); diff --git a/src/printsupport/dialogs/qpagesetupdialog_win.cpp b/src/printsupport/dialogs/qpagesetupdialog_win.cpp index d21bbb1a36..f177ec4ea5 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_win.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_win.cpp @@ -105,9 +105,6 @@ int QPageSetupDialog::exec() QWindow *parentWindow = parent->windowHandle(); psd.hwndOwner = parentWindow ? (HWND)QGuiApplication::platformNativeInterface()->nativeResourceForWindow("handle", parentWindow) : 0; - QRect paperRect = d->printer->paperRect(); - QRect pageRect = d->printer->pageRect(); - psd.Flags = PSD_MARGINS; double multiplier = 1; switch (QLocale::system().measurementSystem()) { diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 438d893efc..603ac6abd4 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -1707,7 +1707,6 @@ void QWin32PrintEnginePrivate::readDevmode(HGLOBAL globalDevmode) static void draw_text_item_win(const QPointF &pos, const QTextItemInt &ti, HDC hdc, bool convertToText, const QTransform &xform, const QPointF &topLeft) { - QFontEngine *fe = ti.fontEngine; QPointF baseline_pos = xform.inverted().map(xform.map(pos) - topLeft); SetTextAlign(hdc, TA_BASELINE); diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 76f96d68ba..6f3e661f2d 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -841,7 +841,7 @@ void QAccessibleWidget::doAction(const QString &actionName) } } -QStringList QAccessibleWidget::keyBindingsForAction(const QString &actionName) const +QStringList QAccessibleWidget::keyBindingsForAction(const QString & /* actionName */) const { return QStringList(); } diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 75ba15af87..e284076286 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -906,6 +906,7 @@ QStringList QFileDialogPrivate::typedFiles() const files << qt_tildeExpansion(editText); #else files << editText; + Q_UNUSED(q) #endif } else { // " is used to separate files like so: "file1" "file2" "file3" ... diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp index 115dd24e2f..8c99ed4b5a 100644 --- a/src/widgets/itemviews/qabstractitemview.cpp +++ b/src/widgets/itemviews/qabstractitemview.cpp @@ -3436,9 +3436,9 @@ void QAbstractItemViewPrivate::_q_rowsInserted(const QModelIndex &index, int sta Q_UNUSED(start) Q_UNUSED(end) - Q_Q(QAbstractItemView); #ifndef QT_NO_ACCESSIBILITY #ifdef Q_WS_X11 + Q_Q(QAbstractItemView); if (QAccessible::isActive()) { QAccessible::queryAccessibleInterface(q)->table2Interface()->rowsInserted(index, start, end); QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged); @@ -3487,10 +3487,10 @@ void QAbstractItemViewPrivate::_q_modelDestroyed() */ void QAbstractItemViewPrivate::_q_layoutChanged() { - Q_Q(QAbstractItemView); doDelayedItemsLayout(); #ifndef QT_NO_ACCESSIBILITY #ifdef Q_WS_X11 + Q_Q(QAbstractItemView); if (QAccessible::isActive()) { QAccessible::queryAccessibleInterface(q)->table2Interface()->modelReset(); QAccessible::updateAccessibility(q, 0, QAccessible::TableModelChanged); diff --git a/src/widgets/kernel/qinputcontext.cpp b/src/widgets/kernel/qinputcontext.cpp index 7724773478..66595e8ee4 100644 --- a/src/widgets/kernel/qinputcontext.cpp +++ b/src/widgets/kernel/qinputcontext.cpp @@ -284,6 +284,7 @@ void QInputContext::update() */ void QInputContext::widgetDestroyed(QWidget *widget) { + Q_UNUSED(widget) // nothing to be done here, as we use a weak pointer in the input panel } diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 584e4406ac..9cf9a550a8 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -375,7 +375,6 @@ void QWidgetPrivate::updateWidgetTransform() */ QInputContext *QWidget::inputContext() { - Q_D(QWidget); if (!testAttribute(Qt::WA_InputMethodEnabled)) return 0; diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp index c1f11d4132..d83ad855c2 100644 --- a/src/widgets/styles/qwindowsvistastyle.cpp +++ b/src/widgets/styles/qwindowsvistastyle.cpp @@ -749,7 +749,6 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt if (cg == QPalette::Normal && !(vopt->state & QStyle::State_Active)) cg = QPalette::Inactive; - QRect textRect = subElementRect(QStyle::SE_ItemViewItemText, option, widget); QRect itemRect = subElementRect(QStyle::SE_ItemViewItemFocusRect, option, widget).adjusted(-1, 0, 1, 0); itemRect.setTop(vopt->rect.top()); itemRect.setBottom(vopt->rect.bottom()); @@ -765,7 +764,6 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt QPixmap pixmap; if (vopt->backgroundBrush.style() != Qt::NoBrush) { - QPointF oldBO = painter->brushOrigin(); painter->setBrushOrigin(vopt->rect.topLeft()); painter->fillRect(vopt->rect, vopt->backgroundBrush); } @@ -1065,9 +1063,6 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption case CE_ProgressBarContents: if (const QStyleOptionProgressBar *bar = qstyleoption_cast(option)) { - int stateId = MBI_NORMAL; - if (disabled) - stateId = MBI_DISABLED; bool isIndeterminate = (bar->minimum == 0 && bar->maximum == 0); bool vertical = false; bool inverted = false; @@ -1245,10 +1240,7 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption pGetThemeMargins(theme.handle(), NULL, MENU_POPUPCHECK, 0, TMT_CONTENTMARGINS, NULL, &margins); checkcol = qMax(menuitem->maxIconWidth, int(6 + size.cx + margins.cxLeftWidth + margins.cxRightWidth)); } - QColor darkLine = option->palette.background().color().darker(108); - QColor lightLine = option->palette.background().color().lighter(107); QRect rect = option->rect; - QStyleOptionMenuItem mbiCopy = *menuitem; //draw vertical menu line QPoint p1 = QStyle::visualPos(option->direction, menuitem->rect, QPoint(checkcol, rect.top())); diff --git a/src/widgets/styles/qwindowsxpstyle.cpp b/src/widgets/styles/qwindowsxpstyle.cpp index 57f9ca42e6..8b13794d05 100644 --- a/src/widgets/styles/qwindowsxpstyle.cpp +++ b/src/widgets/styles/qwindowsxpstyle.cpp @@ -2471,7 +2471,6 @@ void QWindowsXPStyle::drawControl(ControlElement element, const QStyleOption *op if (qstyleoption_cast(option)) { QColor highlight = option->palette.color(QPalette::Active, QPalette::Highlight); p->save(); - QRect r = option->rect; p->setPen(highlight.darker(120)); QColor dimHighlight(qMin(highlight.red()/2 + 110, 255), qMin(highlight.green()/2 + 110, 255), diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index 358ecf0277..e99dd9ffc5 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -474,14 +474,19 @@ QMatchData QCompletionEngine::filterHistory() QAbstractItemModel *source = c->proxy->sourceModel(); if (curParts.count() <= 1 || c->proxy->showAll || !source) return QMatchData(); - bool isDirModel = false; - bool isFsModel = false; + #ifndef QT_NO_DIRMODEL - isDirModel = (qobject_cast(source) != 0); + const bool isDirModel = (qobject_cast(source) != 0); +#else + const bool isDirModel = false; #endif + Q_UNUSED(isDirModel) #ifndef QT_NO_FILESYSTEMMODEL - isFsModel = (qobject_cast(source) != 0); + const bool isFsModel = (qobject_cast(source) != 0); +#else + const bool isFsModel = false; #endif + Q_UNUSED(isFsModel) QVector v; QIndexMapper im(v); QMatchData m(im, -1, true); -- cgit v1.2.3