diff --git a/src/plugins/effectcomposer/effectcomposerview.cpp b/src/plugins/effectcomposer/effectcomposerview.cpp index 44e0d4b29c3..6a7a57eb67e 100644 --- a/src/plugins/effectcomposer/effectcomposerview.cpp +++ b/src/plugins/effectcomposer/effectcomposerview.cpp @@ -125,8 +125,10 @@ QmlDesigner::WidgetInfo EffectComposerView::widgetInfo() Core::ICore::addContextObject(context); } - return createWidgetInfo(m_widget.data(), "EffectComposer", - QmlDesigner::WidgetInfo::LeftPane, 0, tr("Effect Composer [beta]")); + return createWidgetInfo(m_widget.data(), + "EffectComposer", + QmlDesigner::WidgetInfo::LeftPane, + tr("Effect Composer [beta]")); } void EffectComposerView::customNotification([[maybe_unused]] const AbstractView *view, diff --git a/src/plugins/insight/insightview.cpp b/src/plugins/insight/insightview.cpp index a06cb5e8736..28101dc94e3 100644 --- a/src/plugins/insight/insightview.cpp +++ b/src/plugins/insight/insightview.cpp @@ -45,7 +45,6 @@ WidgetInfo InsightView::widgetInfo() return createWidgetInfo(m_insightWidget.data(), "QtInsight", WidgetInfo::RightPane, - 0, tr("Qt Insight")); } diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp index 28fed71b86e..a8e06b31129 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibraryview.cpp @@ -67,7 +67,7 @@ WidgetInfo AssetsLibraryView::widgetInfo() Core::ICore::addContextObject(context); } - return createWidgetInfo(m_widget.data(), "Assets", WidgetInfo::LeftPane, 0, tr("Assets")); + return createWidgetInfo(m_widget.data(), "Assets", WidgetInfo::LeftPane, tr("Assets")); } void AssetsLibraryView::customNotification(const AbstractView * /*view*/, diff --git a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp index f1a9d5de34c..3af7b99af13 100644 --- a/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/viewmanager.cpp @@ -425,10 +425,6 @@ QList ViewManager::widgetInfos() const widgetInfoList.append(view->widgetInfo()); } - Utils::sort(widgetInfoList, [](const WidgetInfo &firstWidgetInfo, const WidgetInfo &secondWidgetInfo) { - return firstWidgetInfo.placementPriority < secondWidgetInfo.placementPriority; - }); - return widgetInfoList; } diff --git a/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp b/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp index 786fd04f1b0..8f0c9ebe62e 100644 --- a/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp +++ b/src/plugins/qmldesigner/components/connectioneditor/connectionview.cpp @@ -303,7 +303,7 @@ WidgetInfo ConnectionView::widgetInfo() return createWidgetInfo(d->connectionViewQuickWidget.get(), QLatin1String("ConnectionView"), WidgetInfo::LeftPane, - 0, + tr("Connections")); } diff --git a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp index 17f1fa6890e..d301460aab0 100644 --- a/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp +++ b/src/plugins/qmldesigner/components/contentlibrary/contentlibraryview.cpp @@ -145,7 +145,6 @@ WidgetInfo ContentLibraryView::widgetInfo() return createWidgetInfo(m_widget.data(), "ContentLibrary", WidgetInfo::LeftPane, - 0, tr("Content Library")); } diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp index 8b7f3062eb5..48f8780b456 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditorview.cpp @@ -49,7 +49,7 @@ bool CurveEditorView::hasWidget() const WidgetInfo CurveEditorView::widgetInfo() { - return createWidgetInfo(m_editor, "CurveEditorId", WidgetInfo::BottomPane, 0, tr("Curves")); + return createWidgetInfo(m_editor, "CurveEditorId", WidgetInfo::BottomPane, tr("Curves")); } void CurveEditorView::modelAttached(Model *model) diff --git a/src/plugins/qmldesigner/components/debugview/debugview.cpp b/src/plugins/qmldesigner/components/debugview/debugview.cpp index 00ef24320b6..6635f06f376 100644 --- a/src/plugins/qmldesigner/components/debugview/debugview.cpp +++ b/src/plugins/qmldesigner/components/debugview/debugview.cpp @@ -439,7 +439,6 @@ WidgetInfo DebugView::widgetInfo() return createWidgetInfo(m_debugViewWidget.data(), QStringLiteral("DebugView"), WidgetInfo::LeftPane, - 0, tr("Debug View")); } diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp index 06f10aba28b..ef6620ba54d 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dview.cpp @@ -89,7 +89,6 @@ WidgetInfo Edit3DView::widgetInfo() return createWidgetInfo(m_edit3DWidget.data(), "Editor3D", WidgetInfo::CentralPane, - 0, tr("3D"), tr("3D view"), DesignerWidgetFlags::IgnoreErrors); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index 54b98720c64..e047773d132 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -368,7 +368,6 @@ WidgetInfo FormEditorView::widgetInfo() return createWidgetInfo(m_formEditorWidget.data(), "FormEditor", WidgetInfo::CentralPane, - 0, tr("2D"), tr("2D view"), DesignerWidgetFlags::IgnoreErrors); diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp index e4f4ffcd9c6..9ff1f8e8e70 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp @@ -49,7 +49,6 @@ WidgetInfo ItemLibraryView::widgetInfo() return createWidgetInfo(m_widget.data(), "Components", WidgetInfo::LeftPane, - 0, tr("Components"), tr("Components view")); } diff --git a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp index 8c794560369..fa3a385fb12 100644 --- a/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp +++ b/src/plugins/qmldesigner/components/materialbrowser/materialbrowserview.cpp @@ -216,7 +216,6 @@ WidgetInfo MaterialBrowserView::widgetInfo() return createWidgetInfo(m_widget.data(), "MaterialBrowser", WidgetInfo::LeftPane, - 0, tr("Material Browser"), tr("Material Browser view")); } diff --git a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp index 76d6bee2b02..2b6d321b57f 100644 --- a/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp +++ b/src/plugins/qmldesigner/components/materialeditor/materialeditorview.cpp @@ -879,7 +879,6 @@ WidgetInfo MaterialEditorView::widgetInfo() return createWidgetInfo(m_stackedWidget, "MaterialEditor", WidgetInfo::RightPane, - 0, tr("Material Editor"), tr("Material Editor view")); } diff --git a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp index 32fa8d37343..8e6819c0384 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatorview.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatorview.cpp @@ -117,7 +117,6 @@ WidgetInfo NavigatorView::widgetInfo() return createWidgetInfo(m_widget.data(), QStringLiteral("Navigator"), WidgetInfo::LeftPane, - 0, tr("Navigator"), tr("Navigator view")); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp index 9a0108dc676..af3f3601e7f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp @@ -986,7 +986,6 @@ WidgetInfo PropertyEditorView::widgetInfo() return createWidgetInfo(m_stackedWidget, QStringLiteral("Properties"), WidgetInfo::RightPane, - 0, tr("Properties"), tr("Property Editor view")); } diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp index dd8a030eaa6..8b906854558 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp @@ -70,7 +70,6 @@ WidgetInfo StatesEditorView::widgetInfo() return createWidgetInfo(m_statesEditorWidget.data(), "StatesEditor", WidgetInfo::BottomPane, - 0, tr("States")); } diff --git a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp index 254cfd0bea3..c834f57257f 100644 --- a/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp +++ b/src/plugins/qmldesigner/components/texteditor/texteditorview.cpp @@ -135,7 +135,6 @@ WidgetInfo TextEditorView::widgetInfo() return createWidgetInfo(m_widget, "TextEditor", WidgetInfo::CentralPane, - 0, tr("Code"), tr("Code view"), DesignerWidgetFlags::IgnoreErrors); diff --git a/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp b/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp index 8af22aa734b..53bc8fb89e8 100644 --- a/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp +++ b/src/plugins/qmldesigner/components/textureeditor/textureeditorview.cpp @@ -693,7 +693,6 @@ WidgetInfo TextureEditorView::widgetInfo() return createWidgetInfo(m_stackedWidget, "TextureEditor", WidgetInfo::RightPane, - 0, tr("Texture Editor"), tr("Texture Editor view")); } diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp index dfdb3b975fe..0d4f27707f8 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelineview.cpp @@ -659,7 +659,6 @@ WidgetInfo TimelineView::widgetInfo() return createWidgetInfo(createWidget(), QStringLiteral("Timelines"), WidgetInfo::BottomPane, - 0, tr("Timeline"), tr("Timeline view")); } diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp index a44cc5d9d64..8a7681d82ec 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditorview.cpp @@ -333,7 +333,6 @@ WidgetInfo TransitionEditorView::widgetInfo() return createWidgetInfo(createWidget(), "TransitionEditor", WidgetInfo::BottomPane, - 0, tr("Transitions"), tr("Transitions view")); } diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h index 694bdc6448b..b5fd8e12433 100644 --- a/src/plugins/qmldesigner/designercore/include/abstractview.h +++ b/src/plugins/qmldesigner/designercore/include/abstractview.h @@ -39,7 +39,6 @@ enum DesignerWidgetFlags { }; class WidgetInfo { - public: enum PlacementHint { NoPane, @@ -54,7 +53,6 @@ public: QString tabName; QString feedbackDisplayName; QWidget *widget = nullptr; - int placementPriority; PlacementHint placementHint; DesignerWidgetFlags widgetFlags = DesignerWidgetFlags::DisableOnError; }; @@ -296,7 +294,6 @@ protected: QWidget *widget = nullptr, const QString &uniqueId = QString(), WidgetInfo::PlacementHint placementHint = WidgetInfo::NoPane, - int placementPriority = 0, const QString &tabName = QString(), const QString &feedbackDisplayName = QString(), DesignerWidgetFlags widgetFlags = DesignerWidgetFlags::DisableOnError); diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp index 2f3ddb86c03..75c15c72738 100644 --- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp +++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp @@ -132,7 +132,6 @@ void AbstractView::removeModel() WidgetInfo AbstractView::createWidgetInfo(QWidget *widget, const QString &uniqueId, WidgetInfo::PlacementHint placementHint, - int placementPriority, const QString &tabName, const QString &feedbackDisplayName, DesignerWidgetFlags widgetFlags) @@ -142,7 +141,6 @@ WidgetInfo AbstractView::createWidgetInfo(QWidget *widget, widgetInfo.widget = widget; widgetInfo.uniqueId = uniqueId; widgetInfo.placementHint = placementHint; - widgetInfo.placementPriority = placementPriority; widgetInfo.tabName = tabName; widgetInfo.feedbackDisplayName = feedbackDisplayName; widgetInfo.widgetFlags = widgetFlags;