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

ModelEditor: Fix calls from derived classes

Browse Source 
Change-Id: I4f144bd925bd5f72272e50628d46996b0dba5369
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Jochen Becher
2015-11-12 18:15:33 +01:00
parent 38df7a21aa
commit aa6d69b7bc
7 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libs/3rdparty/modeling/qmt/diagram_controller/diagramcontroller.cpp vendored
View File

@@ -166,8 +166,8 @@ public:
private:
void swap()
{
DiagramController *diagramController = DiagramUndoCommand::diagramController();
MDiagram *diagram = DiagramUndoCommand::diagram();
DiagramController *diagramController = this->diagramController();
MDiagram *diagram = this->diagram();
foreach (DElement *clonedElement, m_clonedElements) {
DElement *activeElement = diagramController->findElement(clonedElement->uid(), diagram);
QMT_CHECK(activeElement);
@@ -215,8 +215,8 @@ protected:
void remove()
{
DiagramController *diagramController = DiagramUndoCommand::diagramController();
MDiagram *diagram = DiagramUndoCommand::diagram();
DiagramController *diagramController = this->diagramController();
MDiagram *diagram = this->diagram();
bool removed = false;
for (int i = 0; i < m_clonedElements.count(); ++i) {
Clone &clone = m_clonedElements[i];
@@ -240,8 +240,8 @@ protected:
void insert()
{
DiagramController *diagramController = DiagramUndoCommand::diagramController();
MDiagram *diagram = DiagramUndoCommand::diagram();
DiagramController *diagramController = this->diagramController();
MDiagram *diagram = this->diagram();
bool inserted = false;
for (int i = m_clonedElements.count() - 1; i >= 0; --i) {
Clone &clone = m_clonedElements[i];
@@ -310,7 +310,7 @@ public:
{
Clone clone;
MDiagram *diagram = DiagramUndoCommand::diagram();
MDiagram *diagram = this->diagram();
clone.m_elementKey = element->uid();
clone.m_indexOfElement = diagram->diagramElements().indexOf(element);
QMT_CHECK(clone.m_indexOfElement >= 0);