- Fixed some warnings.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@22852 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Oct 21, 2014 · 2cd7fe4 · 2cd7fe4
1 parent 175cd22
commit 2cd7fe4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/OMEdit/OMEditGUI/MainWindow.cpp b/OMEdit/OMEditGUI/MainWindow.cpp
@@ -1042,7 +1042,7 @@ TransformationsWidget *MainWindow::showTransformationsWidget(QString fileName)
   pTransformationsWidget->show();
   pTransformationsWidget->raise();
   pTransformationsWidget->activateWindow();
-  pTransformationsWidget->setWindowState(pTransformationsWidget->windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
+  pTransformationsWidget->setWindowState(pTransformationsWidget->windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
   return pTransformationsWidget;
 }
 
@@ -1297,7 +1297,7 @@ void MainWindow::showAlgorithmicDebugger()
   mpDebuggerMainWindow->show();
   mpDebuggerMainWindow->raise();
   mpDebuggerMainWindow->activateWindow();
-  mpDebuggerMainWindow->setWindowState(mpDebuggerMainWindow->windowState() & ~Qt::WindowMinimized | Qt::WindowActive);
+  mpDebuggerMainWindow->setWindowState(mpDebuggerMainWindow->windowState() & (~Qt::WindowMinimized | Qt::WindowActive));
   mpDebuggerMainWindow->restoreWindows();
 }
 

diff --git a/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp b/OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp
@@ -1856,34 +1856,29 @@ void LibraryTreeWidget::showModelWidget(LibraryTreeNode *pLibraryTreeNode, bool
   QList<QTreeWidgetItem*> selectedItemsList = selectedItems();
   if (pLibraryTreeNode == 0)
   {
-    if (selectedItemsList.isEmpty())
-    {
+    if (selectedItemsList.isEmpty()) {
       QApplication::restoreOverrideCursor();
       return;
     }
     pLibraryTreeNode = dynamic_cast<LibraryTreeNode*>(selectedItemsList.at(0));
   }
   mpMainWindow->getPerspectiveTabBar()->setCurrentIndex(1);
   /* Search Tree Items never have model widget so find the equivalent Library Tree Node */
-  if (isSearchedTree())
-  {
+  if (isSearchedTree()) {
     pLibraryTreeNode = mpMainWindow->getLibraryTreeWidget()->getLibraryTreeNode(pLibraryTreeNode->getNameStructure());
     mpMainWindow->getLibraryTreeWidget()->showModelWidget(pLibraryTreeNode, newClass, extendsClass);
     QApplication::restoreOverrideCursor();
     return;
   }
-  if (pLibraryTreeNode->getModelWidget())
-  {
+  if (pLibraryTreeNode->getModelWidget()) {
     pLibraryTreeNode->getModelWidget()->setWindowTitle(pLibraryTreeNode->getNameStructure() + (pLibraryTreeNode->isSaved() ? "" : "*"));
     mpMainWindow->getModelWidgetContainer()->addModelWidget(pLibraryTreeNode->getModelWidget());
-  }
-  else
-  {
+  } else {
     ModelWidget *pModelWidget = NULL;
     if (pLibraryTreeNode->getLibraryType() == LibraryTreeNode::Modelica) {
       pModelWidget = new ModelWidget(newClass, extendsClass, pLibraryTreeNode, mpMainWindow->getModelWidgetContainer());
     } else if (pLibraryTreeNode->getLibraryType() == LibraryTreeNode::Text) {
-        pModelWidget = new ModelWidget(text, pLibraryTreeNode, mpMainWindow->getModelWidgetContainer());
+      pModelWidget = new ModelWidget(text, pLibraryTreeNode, mpMainWindow->getModelWidgetContainer());
     } else if (pLibraryTreeNode->getLibraryType() == LibraryTreeNode::TLM) {
       pModelWidget = new ModelWidget(text, text, pLibraryTreeNode, mpMainWindow->getModelWidgetContainer());
     } else {

diff --git a/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp b/OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp
@@ -439,6 +439,7 @@ bool GraphicsView::addComponent(QString className, QPointF position)
       }
     }
   }
+  return false;
 }
 
 void GraphicsView::addComponentToView(QString name, QString className, QString transformationString, QPointF point,
@@ -2190,20 +2191,19 @@ void ModelWidget::setModelModified()
   LibraryTreeWidget *pLibraryTreeWidget = mpModelWidgetContainer->getMainWindow()->getLibraryTreeWidget();
   LibraryTreeNode *pLibraryTreeNode;
   pLibraryTreeNode = pLibraryTreeWidget->getLibraryTreeNode(StringHandler::getFirstWordBeforeDot(mpLibraryTreeNode->getNameStructure()));
-  if (pLibraryTreeNode->getFileName().compare(mpLibraryTreeNode->getFileName()) == 0)
-  {
+  if (pLibraryTreeNode->getFileName().compare(mpLibraryTreeNode->getFileName()) == 0) {
     // Add a * in the model window title.
-    if (pLibraryTreeNode->getModelWidget())
-    {
+    if (pLibraryTreeNode->getModelWidget()) {
       pLibraryTreeNode->getModelWidget()->setWindowTitle(QString(pLibraryTreeNode->getNameStructure()).append("*"));
     }
     pLibraryTreeNode->setIsSaved(false);
   }
   /*
     If this model is child model inside a package then reflect the change in the text view of the package as well.
     */
-  if (!mpLibraryTreeNode->getParentName().isEmpty())
+  if (!mpLibraryTreeNode->getParentName().isEmpty()) {
     updateParentModelsText(mpLibraryTreeNode->getNameStructure());
+  }
 }
 
 void ModelWidget::updateParentModelsText(QString className)
@@ -2832,7 +2832,7 @@ void ModelWidget::closeEvent(QCloseEvent *event)
 }
 
 ModelWidgetContainer::ModelWidgetContainer(MainWindow *pParent)
-  : MdiArea(pParent), mShowGridLines(false), mPreviousViewType(StringHandler::NoView)
+  : MdiArea(pParent), mPreviousViewType(StringHandler::NoView), mShowGridLines(false)
 {
   if (mpMainWindow->getOptionsDialog()->getGeneralSettingsPage()->getModelingViewMode().compare(Helper::subWindow) == 0)
     setViewMode(QMdiArea::SubWindowView);