Changeset 5d250c7 in OpenModelica

Timestamp:

2021-06-08T10:08:04+02:00 (3 years ago)

Author:

Adeel Asghar <adeel.asghar@…>

Parents:

e3219aad

Message:

Check for null pointer

File:

• OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp (modified) (6 diffs)

OMEdit/OMEditLIB/Annotations/LineAnnotation.cpp

@@ -1655 +1655 @@
 }
 
-void ExpandableConnectorTreeModel::createExpandableConnectorTreeItem(Element *pComponent,
-                                                                     ExpandableConnectorTreeItem *pParentExpandableConnectorTreeItem)
+void ExpandableConnectorTreeModel::createExpandableConnectorTreeItem(Element *pComponent, ExpandableConnectorTreeItem *pParentExpandableConnectorTreeItem)
 {
   StringHandler::ModelicaClasses restriction = StringHandler::Model;
@@ -1662 +1661 @@
     restriction = pComponent->getLibraryTreeItem()->getRestriction();
   }
-  ExpandableConnectorTreeItem *pExpandableConnectorTreeItem = new ExpandableConnectorTreeItem(pComponent->getName(),
-                                                                                              pComponent->getComponentInfo()->isArray(),
-                                                                                              pComponent->getComponentInfo()->getArrayIndex(),
-                                                                                              restriction, false,
+  ExpandableConnectorTreeItem *pExpandableConnectorTreeItem = new ExpandableConnectorTreeItem(pComponent->getName(), pComponent->getComponentInfo()->isArray(),
+                                                                                              pComponent->getComponentInfo()->getArrayIndex(), restriction, false,
                                                                                               pParentExpandableConnectorTreeItem);
   int row = pParentExpandableConnectorTreeItem->getChildren().size();
@@ -1672 +1669 @@
   pParentExpandableConnectorTreeItem->insertChild(row, pExpandableConnectorTreeItem);
   endInsertRows();
-  if (pComponent->getLibraryTreeItem()) {
+  if (pComponent->getLibraryTreeItem() && pComponent->getLibraryTreeItem()->getModelWidget()) {
     foreach (Element *pChildComponent, pComponent->getLibraryTreeItem()->getModelWidget()->getDiagramGraphicsView()->getElementsList()) {
       createExpandableConnectorTreeItem(pChildComponent, pExpandableConnectorTreeItem);
@@ -1679 +1676 @@
   // create add variable item only if item is expandable connector
   if (pExpandableConnectorTreeItem->getRestriction() == StringHandler::ExpandableConnector) {
-    ExpandableConnectorTreeItem *pNewVariableExpandableConnectorTreeItem = new ExpandableConnectorTreeItem(Helper::newVariable, false, "",
-                                                                                                           StringHandler::Model, true,
-                                                                                                           pExpandableConnectorTreeItem);
+    ExpandableConnectorTreeItem *pNewVariableExpandableConnectorTreeItem = new ExpandableConnectorTreeItem(Helper::newVariable, false, "", StringHandler::Model,
+                                                                                                           true, pExpandableConnectorTreeItem);
     int row = pExpandableConnectorTreeItem->getChildren().size();
     QModelIndex index = expandableConnectorTreeItemIndex(pExpandableConnectorTreeItem);
@@ -1755 +1751 @@
   mpStartExpandableConnectorTreeView = 0;
   mpStartComponent = mpConnectionLineAnnotation->getStartComponent();
-  mpStartRootComponent = mpStartComponent->getParentComponent() ? mpStartComponent->getRootParentComponent() : 0;
+  mpStartRootComponent = mpStartComponent->getParentComponent() ? mpStartComponent->getRootParentComponent() : mpStartComponent;
   if (mpStartComponent->isExpandableConnector() || (mpStartRootComponent && mpStartRootComponent->isExpandableConnector())) {
     mpStartExpandableConnectorTreeModel = new ExpandableConnectorTreeModel(this);
@@ -1771 +1767 @@
   // End expandable connector treeview
   mpEndComponent = mpConnectionLineAnnotation->getEndComponent();
-  mpEndRootComponent = mpEndComponent->getParentComponent() ? mpEndComponent->getRootParentComponent() : 0;
+  mpEndRootComponent = mpEndComponent->getParentComponent() ? mpEndComponent->getRootParentComponent() : mpEndComponent;
   mpEndExpandableConnectorTreeView = 0;
   if (mpEndComponent->isExpandableConnector() || (mpEndRootComponent && mpEndRootComponent->isExpandableConnector())) {