QChar c = getC();
if (c.unicode() == EOFile)
return EndOfFile;
- switch (c)
+ switch (c.unicode())
{
case ' ':
case '\t':
errorMessage(i18n("Unexpected end of file"));
return EndOfFile;
}
- else if (isalpha(c) || (c == '_') || (c == '!'))
+ else if (c.isLetter() || (c == '_') || (c == '!'))
{
token += c;
while ((c = getC()).unicode() != EOFile &&
- (isalnum(c) || (c == '_') || (c == '.') || (c == '!')))
+ (c.isLetterOrNumber() || (c == '_') || (c == '.') || (c == '!')))
token += c;
ungetC(c);
if (token[0] == '!')
* Utility::timezone2tz) or GMT[+-]hh:mm */
token += c;
while ((c = getC()).unicode() != EOFile &&
- (isalnum(c) || c == '+' || c == '-' || c == ':')
+ (c.isLetterOrNumber() || c == '+' || c == '-' || c == ':')
&& i++ < 9)
token += c;
}
else
{
token += c;
- switch (c)
+ switch (c.unicode())
{
case '{':
return LBRACE;
if (m_file.right(2) == "/.")
{
// read from stdin
- m_f.reset(new Q3TextStream(stdin, QIODevice::ReadOnly));
+ m_f.reset(new QTextStream(stdin, QIODevice::ReadOnly));
m_fh = stdin;
}
else
// read from file system
if ((m_fh = fopen(m_file, "r")) == 0)
return false;
- m_f.reset(new Q3TextStream(m_fh, QIODevice::ReadOnly));
+ m_f.reset(new QTextStream(m_fh, QIODevice::ReadOnly));
}
if (DEBUGLEVEL > 0)
tjWarning(i18n("Processing file \'%1\'").arg(m_file));
}
else
- m_f.reset(new Q3TextStream(textBuffer, QIODevice::ReadOnly));
+ m_f.reset(new QTextStream(&textBuffer, QIODevice::ReadOnly));
m_lineBuf = QString::null;
m_currLine = 1;