- Do not escape strings when sending data directly.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@24499 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Feb 10, 2015 · ca2549b · ca2549b
1 parent 25d5f60
commit ca2549b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/OMEdit/OMEditGUI/OMC/OMCProxy.cpp b/OMEdit/OMEditGUI/OMC/OMCProxy.cpp
@@ -1590,7 +1590,7 @@ bool OMCProxy::loadFile(QString fileName, QString encoding, bool uses)
   */
 bool OMCProxy::loadString(QString value, QString fileName, QString encoding, bool checkError)
 {
-  bool result = mpOMCInterface->loadString(StringHandler::escapeStringWithoutNewLine(value), fileName, encoding);
+  bool result = mpOMCInterface->loadString(value, fileName, encoding);
   if (checkError) {
     printMessagesStringInternal();
   }
@@ -1619,7 +1619,7 @@ QList<QString> OMCProxy::parseFile(QString fileName, QString encoding)
   */
 QList<QString> OMCProxy::parseString(QString value, QString fileName)
 {
-  QList<QString> resultList = mpOMCInterface->parseString(StringHandler::escapeStringWithoutNewLine(value), fileName);
+  QList<QString> resultList = mpOMCInterface->parseString(value, fileName);
   printMessagesStringInternal();
   return resultList;
 }

diff --git a/OMEdit/OMEditGUI/Util/StringHandler.cpp b/OMEdit/OMEditGUI/Util/StringHandler.cpp
@@ -891,27 +891,6 @@ QString StringHandler::escapeString(QString value)
   return res;
 }
 
-QString StringHandler::escapeStringWithoutNewLine(QString value)
-{
-  QString res;
-  value = value.trimmed();
-  for (int i = 0; i < value.length(); i++) {
-    switch (value[i].toAscii()) {
-      case '"':  res.append('\"');     break;
-      case '\\': res.append("\\\\");   break;
-      case '\a': res.append("\\a");    break;
-      case '\b': res.append("\\b");    break;
-      case '\f': res.append("\\f");    break;
-      case '\n': res.append("");       break;
-      case '\r': res.append("\\r");    break;
-      case '\t': res.append("\\t");    break;
-      case '\v': res.append("\\v");    break;
-      default:   res.append(value[i]); break;
-    }
-  }
-  return res;
-}
-
 #define CONSUME_CHAR(value,res,i) \
   if (value.at(i) == '\\') { \
   i++; \

diff --git a/OMEdit/OMEditGUI/Util/StringHandler.h b/OMEdit/OMEditGUI/Util/StringHandler.h
@@ -116,7 +116,6 @@ class StringHandler : public QObject
   static QString removeComment(QString value);
   static QString getModifierValue(QString value);
   static QString escapeString(QString value);
-  static QString escapeStringWithoutNewLine(QString value);
   // Returns "" if the string is not a standard Modelica string. Else it unparses it into normal form.
   static QString unparse(QString value);
   // Returns empty list if the string is not a standard Modelica string-array. Else it unparses it into normal form.