#include "support/docstring.h"
-#include <QChar>
#include <QString>
-
-#include <boost/assert.hpp>
+#include <QVector>
namespace lyx {
}
-/**
- * Convert a QChar into a UCS4 character.
- * This is a hack (it does only make sense for the common part of the UCS4
- * and UTF16 encodings) and should not be used.
- * This does only exist because of performance reasons (a real conversion
- * using iconv is too slow on windows).
- */
-inline char_type const qchar_to_ucs4(QChar const & qchar)
-{
- BOOST_ASSERT(is_utf16(static_cast<char_type>(qchar.unicode())));
- return static_cast<char_type>(qchar.unicode());
-}
-
-
-/**
- * Convert a UCS4 character into a QChar.
- * This is a hack (it does only make sense for the common part of the UCS4
- * and UTF16 encodings) and should not be used.
- * This does only exist because of performance reasons (a real conversion
- * using iconv is too slow on windows).
- */
-inline QChar const ucs4_to_qchar(char_type const ucs4)
-{
- // FIXME: The following cast is not a real conversion but it work
- // for the ucs2 subrange of unicode. Instead of an assertion we should
- // return some special characters that indicates that its display is
- // not supported.
- BOOST_ASSERT(is_utf16(ucs4));
- return QChar(static_cast<unsigned short>(ucs4));
-}
-
-
/**
* toqstr - convert a UCS4 encoded docstring into a QString
*
* 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());
+ return QString::fromUcs4((uint const *)ucs4.data(), ucs4.length());
}
-#else
-QString const toqstr(docstring const & ucs4);
-#endif
+/**
+ * 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