Do not interface as variable.

Already defined in basetyps.h in MinGW.
OpenModelica · Apr 1, 2016 · ddb7de2 · ddb7de2
1 parent 26abcb9
commit ddb7de2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/OMEdit/OMEditGUI/Editors/MetaModelEditor.cpp b/OMEdit/OMEditGUI/Editors/MetaModelEditor.cpp
@@ -552,22 +552,22 @@ QGenericMatrix<3,1,double> MetaModelEditor::getRotationVector(QGenericMatrix<3,3
 /*!
  * \brief MetaModelEditor::getPositionAndRotationVectors
  * Extracts position and rotation vectors for specified TLM interface, both between CG and model X and between X and interface C
- * \param interface Interface on the form "submodel.interface"
+ * \param interfacePoint Interface on the form "submodel.interface"
  * \param CG_X_PHI_CG Rotation vector between CG abd X
  * \param X_C_PHI_X Rotation vector between X and C
  * \param CG_X_R_CG Position vector between CG and X
  * \param X_C_R_X Position vector between X and C
  * \return
  */
-bool MetaModelEditor::getPositionAndRotationVectors(QString interface,
+bool MetaModelEditor::getPositionAndRotationVectors(QString interfacePoint,
                                                     QGenericMatrix<3,1,double> &CG_X_PHI_CG,
                                                     QGenericMatrix<3,1,double> &X_C_PHI_X,
                                                     QGenericMatrix<3,1,double> &CG_X_R_CG,
                                                     QGenericMatrix<3,1,double> &X_C_R_X)
 {
   //Extract submodel and interface names
-  QString modelName = interface.split(".").at(0);
-  QString interfaceName = interface.split(".").at(1);
+  QString modelName = interfacePoint.split(".").at(0);
+  QString interfaceName = interfacePoint.split(".").at(1);
 
   //Read positions and rotations from XML
   QString x_c_r_x_str, x_c_phi_x_str;

diff --git a/OMEdit/OMEditGUI/Editors/MetaModelEditor.h b/OMEdit/OMEditGUI/Editors/MetaModelEditor.h
@@ -92,7 +92,8 @@ class MetaModelEditor : public BaseEditor
   bool mForceSetPlainText;
   XMLDocument mXmlDocument;
   QGenericMatrix<3,3,double> getRotationMatrix(QGenericMatrix<3,1,double> rotation);
-  bool getPositionAndRotationVectors(QString interface, QGenericMatrix<3,1,double> &CG_X_PHI_CG, QGenericMatrix<3,1,double> &X_C_PHI_X, QGenericMatrix<3,1,double> &CG_X_R_CG, QGenericMatrix<3,1,double> &X_C_R_X);
+  bool getPositionAndRotationVectors(QString interfacePoint, QGenericMatrix<3,1,double> &CG_X_PHI_CG, QGenericMatrix<3,1,double> &X_C_PHI_X,
+                                     QGenericMatrix<3,1,double> &CG_X_R_CG, QGenericMatrix<3,1,double> &X_C_R_X);
   bool interfacesAligned(QString interface1, QString interface2);
   bool fuzzyCompare(double p1, double p2);
   QGenericMatrix<3, 1, double> getRotationVector(QGenericMatrix<3, 3, double> R);

diff --git a/OMEdit/OMEditGUI/TLM/TLMCoSimulationThread.cpp b/OMEdit/OMEditGUI/TLM/TLMCoSimulationThread.cpp
@@ -76,7 +76,7 @@ void TLMCoSimulationThread::runManager()
   environment.insert("PATH", tlmCoSimulationOptions.getTLMPluginPath() + ";" + environment.value("PATH"));
   environment.insert("TLMPluginPath", tlmCoSimulationOptions.getTLMPluginPath());
   mpManagerProcess->setProcessEnvironment(environment);
-    // start the executable
+  // start the executable
   mpManagerProcess->start(fileName, args);
   emit sendManagerOutput(QString("%1 %2").arg(fileName).arg(args.join(" ")), StringHandler::OMEditInfo);
 }