summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-02 10:23:02 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-02 09:41:13 +0000
commitffb5ece8da10fa6d3ebf73a020ddd2a1dcf48a54 (patch)
tree8a035efda1399104c896632acd99d5d22c3a05d6
parent3593380d9d88d0d73eae9ff87a02ae2d975333ea (diff)
downloadqt4-tools-ffb5ece8da10fa6d3ebf73a020ddd2a1dcf48a54.tar.gz
Fix compiler warnings in Qt Designer.
shared/widgetdatabase.cpp:371:66: warning: typedef 'NameItemMap' locally defined but not used [-Wunused-local-typedefs] tools/designer/src/lib/shared/previewmanager.cpp:820:16: warning: converting ‘false’ to pointer type ‘QWidget*’ [-Wconversion-null] Task-number: QTBUG-44747 Change-Id: I9781a8cbce1def5229fe0ed7071c04ae6880b039 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
-rw-r--r--tools/designer/src/lib/shared/previewmanager.cpp2
-rw-r--r--tools/designer/src/lib/shared/widgetdatabase.cpp1
2 files changed, 1 insertions, 2 deletions
diff --git a/tools/designer/src/lib/shared/previewmanager.cpp b/tools/designer/src/lib/shared/previewmanager.cpp
index 303f384a9a..246288d279 100644
--- a/tools/designer/src/lib/shared/previewmanager.cpp
+++ b/tools/designer/src/lib/shared/previewmanager.cpp
@@ -817,7 +817,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/tools/designer/src/lib/shared/widgetdatabase.cpp b/tools/designer/src/lib/shared/widgetdatabase.cpp
index b1981e9862..821a2088ab 100644
--- a/tools/designer/src/lib/shared/widgetdatabase.cpp
+++ b/tools/designer/src/lib/shared/widgetdatabase.cpp
@@ -368,7 +368,6 @@ void WidgetDataBase::loadPlugins()
{
typedef QMap<QString, int> NameIndexMap;
typedef QList<QDesignerWidgetDataBaseItemInterface*> ItemList;
- typedef QMap<QString, QDesignerWidgetDataBaseItemInterface*> NameItemMap;
typedef QSet<QString> NameSet;
// 1) create a map of existing custom classes
NameIndexMap existingCustomClasses;