From a5b01032b63a5f02bbecfe0a94e0c50a4521b21a Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 11 May 2012 10:34:03 +0200 Subject: [PATCH] Fix warning with GCC MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit warning: converting ‘false’ to pointer type ‘QWidget*’ Change-Id: I4cd605e1639f0f59033fbd7152ec645ce1252f38 Reviewed-by: Friedemann Kleint --- src/designer/src/lib/shared/previewmanager.cpp | 2 +- src/designer/src/lib/uilib/abstractformbuilder.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index c46ac03..36e39b2 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -811,7 +811,7 @@ QWidget *PreviewManager::raise(const QDesignerFormWindowInterface *fw, const Pre { typedef PreviewManagerPrivate::PreviewDataList PreviewDataList; if (d->m_previews.empty()) - return false; + return 0; // find matching window const PreviewDataList::const_iterator cend = d->m_previews.constEnd(); diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp index e406b27..c091075 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -222,7 +222,7 @@ QWidget *QAbstractFormBuilder::load(QIODevice *dev, QWidget *parentWidget) d->m_errorString.clear(); if (!readUiAttributes(reader, d->m_language, &d->m_errorString)) { uiLibWarning(d->m_errorString); - return false; + return 0; } DomUI ui; ui.read(reader); -- 2.7.4