#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)
-{
- 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)
+/// Is \p c a valid utf16 char?
+inline bool is_utf16(char_type c)
{
- // 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(ucs4 < 65536);
- return QChar(static_cast<unsigned short>(ucs4));
+ // 0xd800 ... 0xdfff is the range of surrogate pairs.
+ return c < 0xd800 || (c > 0xdfff && c < 0x10000);
}
* 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
-
/**
- * ucs4_to_qstring - convert a UCS4 encoded char_type * into a QString
+ * toqstr - convert a UCS4 encoded character into a QString
*
- * This is a hack for the painter and font metrics and should not be used
- * elsewhere. Since it uses ucs4_to_qchar it has the same limitations.
+ * This is the preferred method of converting anything that possibly
+ * contains non-ASCII stuff to QString.
*/
-inline void ucs4_to_qstring(char_type const * str, size_t ls, QString & s)
+inline QString const toqstr(char_type ucs4)
{
- int i = static_cast<int>(ls);
- s.resize(i);
- for (; --i >= 0;)
- s[i] = ucs4_to_qchar(str[i]);
+ 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