#include <QFile>
+//Needed in Ubuntu
+#include <typeinfo>
#if ! defined(USE_WCHAR_T) && defined(__GNUC__)
#include <locale>
#include <iostream>
-#include <typeinfo>
#endif
using namespace std;
char_type *d = &s[0];
while (--n >= 0) {
d[n] = ascii[n];
- LASSERT(static_cast<unsigned char>(ascii[n]) < 0x80, /**/);
+ LATTEST(static_cast<unsigned char>(ascii[n]) < 0x80);
}
}
return s;
{
int const len = ascii.length();
for (int i = 0; i < len; ++i)
- LASSERT(static_cast<unsigned char>(ascii[i]) < 0x80, /**/);
+ LATTEST(static_cast<unsigned char>(ascii[i]) < 0x80);
return docstring(ascii.begin(), ascii.end());
}
string ascii;
ascii.resize(len);
for (int i = 0; i < len; ++i) {
- LASSERT(ucs4[i] < 0x80, /**/);
+ LATTEST(ucs4[i] < 0x80);
ascii[i] = static_cast<char>(ucs4[i]);
}
return ascii;
}
-IconvProcessor & utf8ToUcs4()
-{
- static IconvProcessor iconv(ucs4_codeset, "UTF-8");
- return iconv;
-}
-
-
-
void utf8_to_ucs4(string const & utf8, docstring & ucs4)
{
size_t n = utf8.size();
lyx::docstring::const_iterator it = l.begin();
lyx::docstring::const_iterator end = l.end();
for (; it != end; ++it, ++r) {
- LASSERT(static_cast<unsigned char>(*r) < 0x80, /**/);
+ LASSERT(static_cast<unsigned char>(*r) < 0x80, return false);
if (!*r)
return false;
if (*it != static_cast<lyx::docstring::value_type>(*r))
{
lyx::docstring s(l);
for (char const * c = r; *c; ++c) {
- LASSERT(static_cast<unsigned char>(*c) < 0x80, /**/);
+ LASSERT(static_cast<unsigned char>(*c) < 0x80, return l);
s.push_back(*c);
}
return s;
{
lyx::docstring s;
for (char const * c = l; *c; ++c) {
- LASSERT(static_cast<unsigned char>(*c) < 0x80, /**/);
+ LASSERT(static_cast<unsigned char>(*c) < 0x80, return r);
s.push_back(*c);
}
s += r;
lyx::docstring operator+(lyx::docstring const & l, char r)
{
- LASSERT(static_cast<unsigned char>(r) < 0x80, /**/);
+ LASSERT(static_cast<unsigned char>(r) < 0x80, return l);
docstring s = l;
s += docstring::value_type(r);
return s;
lyx::docstring operator+(char l, lyx::docstring const & r)
{
- LASSERT(static_cast<unsigned char>(l) < 0x80, /**/);
+ LASSERT(static_cast<unsigned char>(l) < 0x80, return r);
return lyx::docstring::value_type(l) + r;
}
lyx::docstring & operator+=(lyx::docstring & l, char const * r)
{
for (char const * c = r; *c; ++c) {
- LASSERT(static_cast<unsigned char>(*c) < 0x80, /**/);
+ LASSERT(static_cast<unsigned char>(*c) < 0x80, return l);
l.push_back(*c);
}
return l;
lyx::docstring & operator+=(lyx::docstring & l, char r)
{
- LASSERT(static_cast<unsigned char>(r) < 0x80, /**/);
+ LASSERT(static_cast<unsigned char>(r) < 0x80, return l);
l.push_back(r);
return l;
}
return do_put_helper(oit, b, fill, v);
}
-#ifdef _GLIBCXX_USE_LONG_LONG
+#ifdef LYX_USE_LONG_LONG
iter_type
do_put(iter_type oit, ios_base & b, char_type fill, long long v) const
{
return do_get_integer(iit, eit, b, err, v);
}
-#ifdef _GLIBCXX_USE_LONG_LONG
+#ifdef LYX_USE_LONG_LONG
iter_type
do_get(iter_type iit, iter_type eit, ios_base & b,
ios_base::iostate & err, long long & v) const
// [+-]? [0-9]* .? [0-9]* ([eE] [+-]? [0-9]+)?
string s;
s.reserve(64);
- char c;
numpunct_facet p;
char const dot = p.decimal_point();
char const sep = p.thousands_sep();