diff --git a/cockatrice/src/deckstats_interface.cpp b/cockatrice/src/deckstats_interface.cpp index 44c14fab..64cd958f 100644 --- a/cockatrice/src/deckstats_interface.cpp +++ b/cockatrice/src/deckstats_interface.cpp @@ -52,7 +52,7 @@ void DeckStatsInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data) urlQuery.addQueryItem("deck", deckWithoutTokens.writeToString_Plain()); urlQuery.addQueryItem("decktitle", deck->getName()); params.setQuery(urlQuery); - data->append(params.query(QUrl::EncodeReserved)); + data->append(params.query(QUrl::EncodeReserved).toUtf8()); } void DeckStatsInterface::analyzeDeck(DeckList *deck) diff --git a/cockatrice/src/tappedout_interface.cpp b/cockatrice/src/tappedout_interface.cpp index 45edabb0..95f58d39 100644 --- a/cockatrice/src/tappedout_interface.cpp +++ b/cockatrice/src/tappedout_interface.cpp @@ -78,7 +78,7 @@ void TappedOutInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data) urlQuery.addQueryItem("mainboard", mainboard.writeToString_Plain(false, true)); urlQuery.addQueryItem("sideboard", sideboard.writeToString_Plain(false, true)); params.setQuery(urlQuery); - data->append(params.query(QUrl::EncodeReserved)); + data->append(params.query(QUrl::EncodeReserved).toUtf8()); } void TappedOutInterface::analyzeDeck(DeckList *deck) diff --git a/servatrice/src/smtp/qxtmailattachment.cpp b/servatrice/src/smtp/qxtmailattachment.cpp index 59ad464f..1224c6af 100644 --- a/servatrice/src/smtp/qxtmailattachment.cpp +++ b/servatrice/src/smtp/qxtmailattachment.cpp @@ -143,9 +143,9 @@ QHash QxtMailAttachment::extraHeaders() const return qxt_d->extraHeaders; } -QString QxtMailAttachment::extraHeader(const QString& key) const +QByteArray QxtMailAttachment::extraHeader(const QString& key) const { - return qxt_d->extraHeaders[key.toLower()]; + return qxt_d->extraHeaders[key.toLower()].toLatin1(); } bool QxtMailAttachment::hasExtraHeader(const QString& key) const diff --git a/servatrice/src/smtp/qxtmailattachment.h b/servatrice/src/smtp/qxtmailattachment.h index 23955ff9..397b117f 100644 --- a/servatrice/src/smtp/qxtmailattachment.h +++ b/servatrice/src/smtp/qxtmailattachment.h @@ -57,7 +57,7 @@ public: void setContentType(const QString& contentType); QHash extraHeaders() const; - QString extraHeader(const QString&) const; + QByteArray extraHeader(const QString&) const; bool hasExtraHeader(const QString&) const; void setExtraHeader(const QString& key, const QString& value); void setExtraHeaders(const QHash&); diff --git a/servatrice/src/smtp/qxtmailmessage.cpp b/servatrice/src/smtp/qxtmailmessage.cpp index d90740d9..9d6de47d 100644 --- a/servatrice/src/smtp/qxtmailmessage.cpp +++ b/servatrice/src/smtp/qxtmailmessage.cpp @@ -143,9 +143,9 @@ QHash QxtMailMessage::extraHeaders() const return qxt_d->extraHeaders; } -QString QxtMailMessage::extraHeader(const QString& key) const +QByteArray QxtMailMessage::extraHeader(const QString& key) const { - return qxt_d->extraHeaders[key.toLower()]; + return qxt_d->extraHeaders[key.toLower()].toLatin1(); } bool QxtMailMessage::hasExtraHeader(const QString& key) const diff --git a/servatrice/src/smtp/qxtmailmessage.h b/servatrice/src/smtp/qxtmailmessage.h index 5fd71507..584e8fcc 100644 --- a/servatrice/src/smtp/qxtmailmessage.h +++ b/servatrice/src/smtp/qxtmailmessage.h @@ -64,7 +64,7 @@ public: void removeRecipient(const QString&); QHash extraHeaders() const; - QString extraHeader(const QString&) const; + QByteArray extraHeader(const QString&) const; bool hasExtraHeader(const QString&) const; void setExtraHeader(const QString& key, const QString& value); void setExtraHeaders(const QHash&);