Merge branch 'v1.1'

This commit is contained in:
Attila Tőkés 2014-02-21 17:17:42 +02:00
commit b1c640c39d
2 changed files with 5 additions and 5 deletions

View File

@ -193,7 +193,7 @@ void MimePart::prepare()
switch (cEncoding) switch (cEncoding)
{ {
case _7Bit: case _7Bit:
mimeString.append(QString(content).toAscii()); mimeString.append(QString(content).toLatin1());
break; break;
case _8Bit: case _8Bit:
mimeString.append(content); mimeString.append(content);

View File

@ -29,7 +29,7 @@ QString& QuotedPrintable::encode(const QByteArray &input)
{ {
byte = input[i]; byte = input[i];
if ((byte == 0x20) || (byte >= 33) && (byte <= 126) && (byte != 61)) if ((byte == 0x20) || ((byte >= 33) && (byte <= 126) && (byte != 61)))
{ {
output->append(byte); output->append(byte);
} }
@ -54,13 +54,13 @@ QByteArray& QuotedPrintable::decode(const QString &input)
for (int i = 0; i < input.length(); ++i) for (int i = 0; i < input.length(); ++i)
{ {
if (input.at(i).toAscii() == '=') if (input.at(i).toLatin1() == '=')
{ {
output->append((hexVal[input.at(++i).toAscii() - '0'] << 4) + hexVal[input.at(++i).toAscii() - '0']); output->append((hexVal[input.at(++i).toLatin1() - '0'] << 4) + hexVal[input.at(++i).toLatin1() - '0']);
} }
else else
{ {
output->append(input.at(i).toAscii()); output->append(input.at(i).toLatin1());
} }
} }