forked from qt-creator/qt-creator
QmlDesigner: Fix clazy warning
Use make_unique Change-Id: Iae83819c8e2f37718ca2c65dae15e3a65c994829 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
This commit is contained in:
@@ -50,6 +50,7 @@
|
|||||||
#include <QPair>
|
#include <QPair>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
namespace QmlDesigner {
|
namespace QmlDesigner {
|
||||||
|
|
||||||
@@ -148,10 +149,10 @@ void FormEditorView::createFormEditorWidget()
|
|||||||
m_formEditorWidget = QPointer<FormEditorWidget>(new FormEditorWidget(this));
|
m_formEditorWidget = QPointer<FormEditorWidget>(new FormEditorWidget(this));
|
||||||
m_scene = QPointer<FormEditorScene>(new FormEditorScene(m_formEditorWidget.data(), this));
|
m_scene = QPointer<FormEditorScene>(new FormEditorScene(m_formEditorWidget.data(), this));
|
||||||
|
|
||||||
m_moveTool.reset(new MoveTool(this));
|
m_moveTool = std::make_unique<MoveTool>(this);
|
||||||
m_selectionTool.reset(new SelectionTool(this));
|
m_selectionTool = std::make_unique<SelectionTool>(this);
|
||||||
m_resizeTool.reset(new ResizeTool(this));
|
m_resizeTool = std::make_unique<ResizeTool>(this);
|
||||||
m_dragTool.reset(new DragTool(this));
|
m_dragTool = std::make_unique<DragTool>(this);
|
||||||
|
|
||||||
m_currentTool = m_selectionTool.get();
|
m_currentTool = m_selectionTool.get();
|
||||||
|
|
||||||
|
@@ -30,6 +30,7 @@
|
|||||||
#include <QPen>
|
#include <QPen>
|
||||||
#include <QGraphicsScene>
|
#include <QGraphicsScene>
|
||||||
#include <QGraphicsTextItem>
|
#include <QGraphicsTextItem>
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
#include <abstractview.h>
|
#include <abstractview.h>
|
||||||
|
|
||||||
@@ -113,7 +114,7 @@ void SelectionIndicator::setItems(const QList<FormEditorItem*> &itemList)
|
|||||||
|
|
||||||
if (checkSingleSelection(itemList)) {
|
if (checkSingleSelection(itemList)) {
|
||||||
FormEditorItem *selectedItem = itemList.constFirst();
|
FormEditorItem *selectedItem = itemList.constFirst();
|
||||||
m_labelItem.reset(new QGraphicsPolygonItem(m_layerItem.data()));
|
m_labelItem = std::make_unique<QGraphicsPolygonItem>(m_layerItem.data());
|
||||||
|
|
||||||
QGraphicsWidget *toolbar = DesignerActionManager::instance().createFormEditorToolBar(m_labelItem.get());
|
QGraphicsWidget *toolbar = DesignerActionManager::instance().createFormEditorToolBar(m_labelItem.get());
|
||||||
toolbar->setPos(1, -1);
|
toolbar->setPos(1, -1);
|
||||||
|
Reference in New Issue
Block a user