feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtQuickDesigner: remove unnecessary list member

Browse Source 
no need to keep an extra list since we have access to
m_designerActionManager

Change-Id: I20e449beb24ab194a59b46dc4c677cd1e8152cca
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Tim Jenssen
2018-04-12 14:24:23 +02:00
parent 2673e09ed6
commit 239d6955dc
3 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp
View File

@@ -1015,7 +1015,6 @@ void DesignerActionManager::createDefaultAddResourceHandler()
void DesignerActionManager::addDesignerAction(ActionInterface *newAction) void DesignerActionManager::addDesignerAction(ActionInterface *newAction)
{ {
m_designerActions.append(QSharedPointer<ActionInterface>(newAction)); m_designerActions.append(QSharedPointer<ActionInterface>(newAction));
m_designerActionManagerView->setDesignerActionList(designerActions());
} }
void DesignerActionManager::addCreatorCommand(Core::Command *command, const QByteArray &category, int priority, void DesignerActionManager::addCreatorCommand(Core::Command *command, const QByteArray &category, int priority,

7
src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.cpp
View File

@@ -120,11 +120,6 @@ void DesignerActionManagerView::importsChanged(const QList<Import> &, const QLis
setupContext(); setupContext();
} }
void DesignerActionManagerView::setDesignerActionList(const QList<ActionInterface *> &designerActionList)
{
m_designerActionList = designerActionList;
}
void DesignerActionManagerView::signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &, AbstractView::PropertyChangeFlags) void DesignerActionManagerView::signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &, AbstractView::PropertyChangeFlags)
{ {
setupContext(SelectionContext::UpdateMode::Fast); setupContext(SelectionContext::UpdateMode::Fast);
@@ -176,7 +171,7 @@ void DesignerActionManagerView::setupContext(SelectionContext::UpdateMode update
} }
SelectionContext selectionContext(this); SelectionContext selectionContext(this);
selectionContext.setUpdateMode(updateMode); selectionContext.setUpdateMode(updateMode);
foreach (ActionInterface* action, m_designerActionList) { foreach (ActionInterface* action, m_designerActionManager.designerActions()) {
action->currentContextChanged(selectionContext); action->currentContextChanged(selectionContext);
} }
m_setupContextDirty = false; m_setupContextDirty = false;

2
src/plugins/qmldesigner/components/componentcore/designeractionmanagerview.h
View File

@@ -66,7 +66,6 @@ public:
void instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList) override; void instancePropertyChanged(const QList<QPair<ModelNode, PropertyName> > &propertyList) override;
void setDesignerActionList(const QList<ActionInterface* > &designerActionList);
DesignerActionManager &designerActionManager(); DesignerActionManager &designerActionManager();
const DesignerActionManager &designerActionManager() const; const DesignerActionManager &designerActionManager() const;
void emitSelectionChanged(); void emitSelectionChanged();
@@ -77,7 +76,6 @@ signals:
private: private:
DesignerActionManager m_designerActionManager; DesignerActionManager m_designerActionManager;
QList<ActionInterface* > m_designerActionList;
bool m_isInRewriterTransaction; bool m_isInRewriterTransaction;
bool m_setupContextDirty; bool m_setupContextDirty;
}; };