diff options
Diffstat (limited to 'src/libraries/qmfmessageserver')
6 files changed, 45 insertions, 38 deletions
diff --git a/src/libraries/qmfmessageserver/qmailauthenticator.cpp b/src/libraries/qmfmessageserver/qmailauthenticator.cpp index 00b5a447..83ecfb7c 100644 --- a/src/libraries/qmfmessageserver/qmailauthenticator.cpp +++ b/src/libraries/qmfmessageserver/qmailauthenticator.cpp @@ -114,7 +114,7 @@ QByteArray QMailAuthenticator::getAuthentication(const QMailAccountConfiguration Q_UNUSED(capabilities) QMailServiceConfiguration configuration(svcCfg); - if (configuration.value("authentication") == QString::number(QMail::CramMd5Mechanism)) + if (configuration.value(QLatin1String("authentication")) == QString::number(QMail::CramMd5Mechanism)) return "CRAM-MD5"; // Unknown service type and/or authentication type @@ -133,13 +133,15 @@ QByteArray QMailAuthenticator::getAuthentication(const QMailAccountConfiguration QByteArray QMailAuthenticator::getResponse(const QMailAccountConfiguration::ServiceConfiguration &svcCfg, const QByteArray &challenge) { QMailServiceConfiguration configuration(svcCfg); - if (!configuration.value("smtpusername").isEmpty() - && (configuration.value("authentication") == QString::number(QMail::CramMd5Mechanism))) { + if (!configuration.value(QLatin1String("smtpusername")).isEmpty() + && (configuration.value(QLatin1String("authentication")) == QString::number(QMail::CramMd5Mechanism))) { // SMTP server CRAM-MD5 authentication - return cramMd5Response(challenge, configuration.value("smtpusername").toUtf8(), QByteArray::fromBase64(configuration.value("smtppassword").toUtf8())); - } else if (configuration.value("authentication") == QString::number(QMail::CramMd5Mechanism)) { + return cramMd5Response(challenge, configuration.value(QLatin1String("smtpusername")).toUtf8(), + QByteArray::fromBase64(configuration.value(QLatin1String("smtppassword")).toUtf8())); + } else if (configuration.value(QLatin1String("authentication")) == QString::number(QMail::CramMd5Mechanism)) { // IMAP/POP server CRAM-MD5 authentication - return cramMd5Response(challenge, configuration.value("username").toUtf8(), QByteArray::fromBase64(configuration.value("password").toUtf8())); + return cramMd5Response(challenge, configuration.value(QLatin1String("username")).toUtf8(), + QByteArray::fromBase64(configuration.value(QLatin1String("password")).toUtf8())); } // Unknown service type and/or authentication type diff --git a/src/libraries/qmfmessageserver/qmailmessagebuffer.cpp b/src/libraries/qmfmessageserver/qmailmessagebuffer.cpp index 2183f66e..87a5788a 100644 --- a/src/libraries/qmfmessageserver/qmailmessagebuffer.cpp +++ b/src/libraries/qmfmessageserver/qmailmessagebuffer.cpp @@ -235,13 +235,13 @@ bool QMailMessageBuffer::isFull() { void QMailMessageBuffer::readConfig() { - QSettings settings("QtProject", "QMF"); - settings.beginGroup("MessageBuffer"); + QSettings settings(QLatin1String("QtProject"), QLatin1String("QMF")); + settings.beginGroup(QLatin1String("MessageBuffer")); - d->maxPending = settings.value("maxPending", 1000).toInt(); - d->idleTimeout = settings.value("idleTimeout", 1000).toInt(); - d->maxTimeout = settings.value("maxTimeout", 8000).toInt(); - d->timeoutScale = settings.value("timeoutScale", 2.0f).value<qreal>(); + d->maxPending = settings.value(QLatin1String("maxPending"), 1000).toInt(); + d->idleTimeout = settings.value(QLatin1String("idleTimeout"), 1000).toInt(); + d->maxTimeout = settings.value(QLatin1String("maxTimeout"), 8000).toInt(); + d->timeoutScale = settings.value(QLatin1String("timeoutScale"), 2.0f).value<qreal>(); d->messageTimer.setInterval(d->idleTimeout); } diff --git a/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp b/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp index 5f428711..a4060382 100644 --- a/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp +++ b/src/libraries/qmfmessageserver/qmailmessageclassifier.cpp @@ -59,21 +59,21 @@ */ QMailMessageClassifier::QMailMessageClassifier() { - QSettings settings("QtProject", "messageserver"); + QSettings settings(QLatin1String("QtProject"), QLatin1String("messageserver")); - settings.beginGroup("global"); + settings.beginGroup(QLatin1String("global")); - int count = settings.beginReadArray("voicemail"); + int count = settings.beginReadArray(QLatin1String("voicemail")); for (int i = 0; i < count; ++i) { settings.setArrayIndex(i); - voiceMailAddresses.append(settings.value("address").toString()); + voiceMailAddresses.append(settings.value(QLatin1String("address")).toString()); } settings.endArray(); - count = settings.beginReadArray("videomail"); + count = settings.beginReadArray(QLatin1String("videomail")); for (int i = 0; i < count; ++i) { settings.setArrayIndex(i); - videoMailAddresses.append(settings.value("address").toString()); + videoMailAddresses.append(settings.value(QLatin1String("address")).toString()); } settings.endArray(); @@ -87,8 +87,8 @@ QMailMessageClassifier::~QMailMessageClassifier() static QMailMessage::ContentType fromContentType(const QMailMessageContentType& contentType) { - QString type(contentType.type().toLower()); - QString subtype(contentType.subType().toLower()); + QByteArray type(contentType.type().toLower()); + QByteArray subtype(contentType.subType().toLower()); QMailMessage::ContentType content = QMailMessage::UnknownContent; diff --git a/src/libraries/qmfmessageserver/qmailmessageservice.cpp b/src/libraries/qmfmessageserver/qmailmessageservice.cpp index 7e0f470d..21478542 100644 --- a/src/libraries/qmfmessageserver/qmailmessageservice.cpp +++ b/src/libraries/qmfmessageserver/qmailmessageservice.cpp @@ -54,7 +54,7 @@ class PluginMap : public QMap<QString, QMailMessageServicePlugin*> public: PluginMap() : QMap<QString, QMailMessageServicePlugin*>(), - _manager(PLUGIN_KEY) + _manager(QString::fromLatin1(PLUGIN_KEY)) { foreach (const QString &item, _manager.list()) { QObject *instance(_manager.instance(item)); @@ -248,7 +248,7 @@ QMailMessageServicePlugin::~QMailMessageServicePlugin() */ QStringList QMailMessageServicePlugin::keys() const { - return QStringList() << "QMailMessageServicePluginInterface"; + return QStringList() << QLatin1String("QMailMessageServicePluginInterface"); } @@ -319,7 +319,7 @@ bool appendErrorText(QString* message, int code, const ErrorMap& map) if (message->isEmpty()) { *message = extra; } else { - message->append("\n[").append(extra).append(']'); + message->append(QLatin1String("\n[")).append(extra).append(QChar::fromLatin1(']')); } } return true; @@ -1123,7 +1123,7 @@ void QMailMessageSource::copyMessages() bool successful(true); unsigned int size = QMailStore::instance()->sizeOfMessages(QMailMessageKey::id(d->_ids)); - if (!LongStream::freeSpace("", size + 1024*10)) { + if (!LongStream::freeSpace(QString(), size + 1024*10)) { qMailLog(Messaging) << "Insufficient space to copy messages to folder:" << d->_destinationId << "bytes required:" << size; emit d->_service->statusChanged(QMailServiceAction::Status(QMailServiceAction::Status::ErrFileSystemFull, tr("Insufficient space to copy messages to folder"), QMailAccountId(), d->_destinationId, QMailMessageId())); successful = false; diff --git a/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp b/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp index 29a7eec8..f79a2550 100644 --- a/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp +++ b/src/libraries/qmfmessageserver/qmailserviceconfiguration.cpp @@ -118,7 +118,7 @@ QMailAccountId QMailServiceConfiguration::id() const */ int QMailServiceConfiguration::version() const { - return value("version", "0").toInt(); + return value(QLatin1String("version"), QLatin1String("0")).toInt(); } /*! @@ -126,7 +126,7 @@ int QMailServiceConfiguration::version() const */ void QMailServiceConfiguration::setVersion(int version) { - setValue("version", QString::number(version)); + setValue(QLatin1String("version"), QString::number(version)); } /*! @@ -134,15 +134,15 @@ void QMailServiceConfiguration::setVersion(int version) */ QMailServiceConfiguration::ServiceType QMailServiceConfiguration::type() const { - QString svcType(value("servicetype")); + QString svcType(value(QLatin1String("servicetype"))); - if (svcType == "source") { + if (svcType == QLatin1String("source")) { return Source; - } else if (svcType == "sink") { + } else if (svcType == QLatin1String("sink")) { return Sink; - } else if (svcType == "source-sink") { + } else if (svcType == QLatin1String("source-sink")) { return SourceAndSink; - } else if (svcType == "storage") { + } else if (svcType == QLatin1String("storage")) { return Storage; } @@ -154,7 +154,12 @@ QMailServiceConfiguration::ServiceType QMailServiceConfiguration::type() const */ void QMailServiceConfiguration::setType(ServiceType type) { - setValue("servicetype", (type == Source ? "source" : (type == Sink ? "sink" : (type == SourceAndSink ? "source-sink" : (type == Storage ? "storage" : "unknown"))))); + setValue(QLatin1String("servicetype"), + (type == Source ? QLatin1String("source") + : (type == Sink ? QLatin1String("sink") + : (type == SourceAndSink ? QLatin1String("source-sink") + : (type == Storage ? QLatin1String("storage") + : QLatin1String("unknown")))))); } /*! @@ -183,7 +188,7 @@ QString QMailServiceConfiguration::encodeValue(const QString &value) { // TODO: Shouldn't this be UTF-8? QMailBase64Codec codec(QMailBase64Codec::Text); - QByteArray encoded(codec.encode(value, "ISO-8859-1")); + QByteArray encoded(codec.encode(value, QLatin1String("ISO-8859-1"))); return QString::fromLatin1(encoded.constData(), encoded.length()); } @@ -197,7 +202,7 @@ QString QMailServiceConfiguration::decodeValue(const QString &value) QByteArray encoded(value.toLatin1()); QMailBase64Codec codec(QMailBase64Codec::Text); - return codec.decode(encoded, "ISO-8859-1"); + return codec.decode(encoded, QLatin1String("ISO-8859-1")); } /*! diff --git a/src/libraries/qmfmessageserver/qmailtransport.cpp b/src/libraries/qmfmessageserver/qmailtransport.cpp index 96bbbecc..e2699b24 100644 --- a/src/libraries/qmfmessageserver/qmailtransport.cpp +++ b/src/libraries/qmfmessageserver/qmailtransport.cpp @@ -219,7 +219,7 @@ void QMailTransport::createSocket(EncryptType encryptType) const int bufferLimit = 101*1024; // Limit memory used when downloading mSocket->setReadBufferSize( bufferLimit ); - mSocket->setObjectName(QString(mName) + "-socket"); + mSocket->setObjectName(QString(mName) + QLatin1String("-socket")); connect(mSocket, SIGNAL(connected()), this, SLOT(connectionEstablished())); connect(mSocket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(socketError(QAbstractSocket::SocketError))); connect(mSocket, SIGNAL(readyRead()), this, SIGNAL(readyRead())); @@ -403,7 +403,7 @@ void QMailTransport::connectionFailed(const QList<QSslError>& errors) if (ignoreCertificateErrors(errors)) mSocket->ignoreSslErrors(); else - errorHandling(QAbstractSocket::UnknownSocketError, ""); + errorHandling(QAbstractSocket::UnknownSocketError, QString()); } /*! \internal */ @@ -414,9 +414,9 @@ bool QMailTransport::ignoreCertificateErrors(const QList<QSslError>& errors) QString text; foreach (const QSslError& error, errors) { - text += (text.isEmpty() ? "'" : ", '"); + text += (text.isEmpty() ? QLatin1String("'") : QLatin1String(", '")); text += error.errorString(); - text += "'"; + text += QLatin1String("'"); if (error.error() == QSslError::NoSslSupport) failed = true; |