Added functions to convert unicode strings to/from escaped 7-bit character arrays.

diff --git a/src/libs/Common/util.cpp b/src/libs/Common/util.cpp
index eeedb61ff19fddeab479a322c9dc0eedec681c36..1a07a4a0c33f7d7c081f6a4a3a8cdbbb1e8ef66b 100644 (file)
--- a/src/libs/Common/util.cpp
+++ b/src/libs/Common/util.cpp
@@ -97,3 +97,87 @@ QVariant eVaf::Common::toVariant(QString const & value, QVariant const & default
             return QVariant(value);
     }
 }
+
+QByteArray eVaf::Common::toEscapedString(QString const & str)
+{
+    QByteArray rval;
+    foreach (QChar c, str) {
+        if (c.unicode() < 32 || c.unicode() >= 127)
+            rval.append("&#" + QByteArray::number(c.unicode()) + ";");
+        else if (c == '\"')
+            rval.append("&quot;");
+        else if (c == '&')
+            rval.append("&amp;");
+        else if (c == '\'')
+            rval.append("&apos;");
+        else if (c == '<')
+            rval.append("&lt;");
+        else if (c == '>')
+            rval.append("&gt;");
+        else
+            rval.append((char const)c.unicode());
+    }
+
+    return rval;
+}
+
+QString eVaf::Common::fromEscapedString(QByteArray const & str)
+{
+    QString rval;
+
+    bool e = false;
+    QByteArray ref;
+    foreach (char c, str) {
+        if (!e) {
+            if (c == '&') {
+                e = true;
+                ref = "&";
+            }
+            else
+                rval.append(QChar((ushort)c));
+        }
+        else {
+            ref.append(c);
+            if (c == ';') {
+                e = false;
+                ref = ref.toLower();
+
+                if (ref.startsWith("&#x")) {
+                    // Numeric character reference in the HEX format
+                    bool ok;
+                    ushort ucode = ref.mid(3, ref.size() - 4).toUInt(&ok, 16);
+                    if (ok)
+                        rval.append(QChar(ucode));
+                    else
+                        // Invalid numeric character reference; output as is
+                        rval.append(ref);
+                }
+                else if (ref.startsWith("&#")) {
+                    // Numeric character reference in the DEC format
+                    bool ok;
+                    ushort ucode = ref.mid(2, ref.size() - 3).toUInt(&ok, 10);
+                    if (ok)
+                        rval.append(QChar(ucode));
+                    else
+                        // Invalid numeric character reference; output as is
+                        rval.append(ref);
+                }
+                else if (ref == "&quot;")
+                    rval.append('\"');
+                else if (ref == "&amp;")
+                    rval.append('&');
+                else if (ref == "&apos;")
+                    rval.append('\'');
+                else if (ref == "&lt;")
+                    rval.append('<');
+                else if (ref == "&gt;")
+                    rval.append('>');
+                else
+                    // Unknown reference, output as is
+                    rval.append(ref);
+            }
+        }
+    }
+
+    return rval;
+}

diff --git a/src/libs/Common/util.h b/src/libs/Common/util.h
index 4b5e4c9fd81ce62aa7778f8a233b11c5e157d116..de094b3e791d85ef6caec890a532f521709e1617 100644 (file)
--- a/src/libs/Common/util.h
+++ b/src/libs/Common/util.h
@@ -76,6 +76,27 @@ inline bool isFalse(QString const & str)
 
 COMMON_EXPORT QVariant toVariant(QString const & value, QVariant const & defaultValue);
 
+/**
+ * Converts unicode strings to escaped 7-bit character arrays.
+ * @param str Unicode string
+ * @return Escaped 7-bit character array
+ *
+ * This function converts a unicode (or any) string to the escaped 7-bit character array. Characters that cannot
+ * be output directly as a printable 7-bit character are output as numeric character references. The result can be
+ * directly inserted into XML or HTML documents and later converted back with the eVaf::Common::fromEscapedString()
+ * function.
+ */
+COMMON_EXPORT QByteArray toEscapedString(QString const & str);
+
+/**
+ * Converts escaped 7-bit character arrays to unicode string.
+ * @param str Escaped 7-bit character array
+ * @return Unicode string
+ *
+ * This function converts an escaped 7-bit character array to a unicode string. Numeric character references and
+ * character entity references are expanded to actual unicode characters.
+ */
+COMMON_EXPORT QString fromEscapedString(QByteArray const & str);
 
 } // namespace eVaf::Common
 } // namespace eVaf

diff --git a/src/libs/Common/version.h b/src/libs/Common/version.h
index 30d4175a849f8b8e370775975b3d3c09d8224d24..dc569f439749c39c4bdafc144ec4a1a18efd1c26 100644 (file)
--- a/src/libs/Common/version.h
+++ b/src/libs/Common/version.h
@@ -25,12 +25,12 @@
 /**
  * Module/library version number in the form major,minor,release,build
  */
-#define VER_FILE_VERSION                0,1,4,7
+#define VER_FILE_VERSION                0,2,1,8
 
 /**
  * Module/library version number in the string format (shall end with \0)
  */
-#define VER_FILE_VERSION_STR            "0.1.4.7\0"
+#define VER_FILE_VERSION_STR            "0.2.1.8\0"
 
 /**
  * Module/library name (shall end with \0)