#include "support/docstring.h"
#include <QString>
+#include <QVector>
namespace lyx {
{
// 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());
+ return QString::fromUcs4((uint const *)ucs4.data(), ucs4.length());
}
+/**
+ * toqstr - convert a UCS4 encoded character into a QString
+ *
+ * This is the preferred method of converting anything that possibly
+ * contains non-ASCII stuff to QString.
+ */
+inline QString const toqstr(char_type ucs4)
+{
+ union { char_type c; uint i; } u = { ucs4 };
+ return QString::fromUcs4(&u.i, 1);
+}
/**
* qstring_to_ucs4 - convert a QString into a UCS4 encoded docstring
* 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
* 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