Merge branch 'v1.1'
This commit is contained in:
commit
b1c640c39d
@ -193,7 +193,7 @@ void MimePart::prepare()
|
||||
switch (cEncoding)
|
||||
{
|
||||
case _7Bit:
|
||||
mimeString.append(QString(content).toAscii());
|
||||
mimeString.append(QString(content).toLatin1());
|
||||
break;
|
||||
case _8Bit:
|
||||
mimeString.append(content);
|
||||
|
@ -29,7 +29,7 @@ QString& QuotedPrintable::encode(const QByteArray &input)
|
||||
{
|
||||
byte = input[i];
|
||||
|
||||
if ((byte == 0x20) || (byte >= 33) && (byte <= 126) && (byte != 61))
|
||||
if ((byte == 0x20) || ((byte >= 33) && (byte <= 126) && (byte != 61)))
|
||||
{
|
||||
output->append(byte);
|
||||
}
|
||||
@ -54,13 +54,13 @@ QByteArray& QuotedPrintable::decode(const QString &input)
|
||||
|
||||
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
|
||||
{
|
||||
output->append(input.at(i).toAscii());
|
||||
output->append(input.at(i).toLatin1());
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user