Introduce FileName::changePermission() and fix ConverterCache.

[lyx.git] / src / support / qstring_helpers.h

diff --git a/src/support/qstring_helpers.h b/src/support/qstring_helpers.h
index b53a13a7a5d9fce75cfd79dcdeae36acb1212347..87b77ccd107b5c73d27fadd8c6037695d08aeb3d 100644 (file)
--- a/src/support/qstring_helpers.h
+++ b/src/support/qstring_helpers.h
@@ -15,6 +15,7 @@
 #include "support/docstring.h"
 
 #include <QString>
+#include <QVector>
 
 namespace lyx {
 
@@ -56,16 +57,12 @@ inline bool is_utf16(char_type c)
  * This is the preferred method of converting anything that possibly
  * contains non-ASCII stuff to QString.
  */
-#if QT_VERSION >= 0x040200
 inline QString const toqstr(docstring const & ucs4)
 {
        // If possible we let qt do the work, since this version does not
        // need to be superfast.
        return QString::fromUcs4(reinterpret_cast<uint const *>(ucs4.data()), ucs4.length());
 }
-#else
-QString const toqstr(docstring const & ucs4);
-#endif
 
 
 /**
@@ -74,8 +71,13 @@ QString const toqstr(docstring const & ucs4);
  * This is the preferred method of converting anything that possibly
  * contains non-ASCII stuff to docstring.
  */
-docstring const qstring_to_ucs4(QString const & qstr);
-
+inline docstring const qstring_to_ucs4(QString const & qstr)
+{
+       if (qstr.isEmpty())
+               return docstring();
+       QVector<uint> const ucs4 = qstr.toUcs4();
+       return docstring((char_type const *)(ucs4.constData()), ucs4.size());
+}
 
 /**
  * fromqstr - convert a QString into a UTF8 encoded std::string
@@ -83,7 +85,10 @@ docstring const qstring_to_ucs4(QString const & qstr);
  * This should not be used except for output to lyxerr, since all possibly
  * non-ASCII stuff should be stored in a docstring.
  */
-std::string const fromqstr(QString const & str);
+inline std::string const fromqstr(QString const & str)
+{
+       return str.isEmpty() ? std::string() : std::string(str.toUtf8());
+}
 
 } // namespace lyx