aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix QByteArray::append(QString) deprecation in qt 5.15.1 (#4102)

Browse source
This commit is contained in:
ebbit1q 2020-09-22 22:09:48 +02:00 committed by GitHub
parent bec02b4952
commit 02935be14f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/deckstats_interface.cpp
View file

@ -52,7 +52,7 @@ void DeckStatsInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
urlQuery.addQueryItem("deck", deckWithoutTokens.writeToString_Plain()); urlQuery.addQueryItem("deck", deckWithoutTokens.writeToString_Plain());
urlQuery.addQueryItem("decktitle", deck->getName()); urlQuery.addQueryItem("decktitle", deck->getName());
params.setQuery(urlQuery); params.setQuery(urlQuery);
data->append(params.query(QUrl::EncodeReserved)); data->append(params.query(QUrl::EncodeReserved).toUtf8());
} }
void DeckStatsInterface::analyzeDeck(DeckList *deck) void DeckStatsInterface::analyzeDeck(DeckList *deck)

2
cockatrice/src/tappedout_interface.cpp
View file

@ -78,7 +78,7 @@ void TappedOutInterface::getAnalyzeRequestData(DeckList *deck, QByteArray *data)
urlQuery.addQueryItem("mainboard", mainboard.writeToString_Plain(false, true)); urlQuery.addQueryItem("mainboard", mainboard.writeToString_Plain(false, true));
urlQuery.addQueryItem("sideboard", sideboard.writeToString_Plain(false, true)); urlQuery.addQueryItem("sideboard", sideboard.writeToString_Plain(false, true));
params.setQuery(urlQuery); params.setQuery(urlQuery);
data->append(params.query(QUrl::EncodeReserved)); data->append(params.query(QUrl::EncodeReserved).toUtf8());
} }
void TappedOutInterface::analyzeDeck(DeckList *deck) void TappedOutInterface::analyzeDeck(DeckList *deck)

4
servatrice/src/smtp/qxtmailattachment.cpp
View file

@ -143,9 +143,9 @@ QHash<QString, QString> QxtMailAttachment::extraHeaders() const
return qxt_d->extraHeaders; 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 bool QxtMailAttachment::hasExtraHeader(const QString& key) const

2
servatrice/src/smtp/qxtmailattachment.h
View file

@ -57,7 +57,7 @@ public:
void setContentType(const QString& contentType); void setContentType(const QString& contentType);
QHash<QString, QString> extraHeaders() const; QHash<QString, QString> extraHeaders() const;
QString extraHeader(const QString&) const; QByteArray extraHeader(const QString&) const;
bool hasExtraHeader(const QString&) const; bool hasExtraHeader(const QString&) const;
void setExtraHeader(const QString& key, const QString& value); void setExtraHeader(const QString& key, const QString& value);
void setExtraHeaders(const QHash<QString, QString>&); void setExtraHeaders(const QHash<QString, QString>&);

4
servatrice/src/smtp/qxtmailmessage.cpp
View file

@ -143,9 +143,9 @@ QHash<QString, QString> QxtMailMessage::extraHeaders() const
return qxt_d->extraHeaders; 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 bool QxtMailMessage::hasExtraHeader(const QString& key) const

2
servatrice/src/smtp/qxtmailmessage.h
View file

@ -64,7 +64,7 @@ public:
void removeRecipient(const QString&); void removeRecipient(const QString&);
QHash<QString, QString> extraHeaders() const; QHash<QString, QString> extraHeaders() const;
QString extraHeader(const QString&) const; QByteArray extraHeader(const QString&) const;
bool hasExtraHeader(const QString&) const; bool hasExtraHeader(const QString&) const;
void setExtraHeader(const QString& key, const QString& value); void setExtraHeader(const QString& key, const QString& value);
void setExtraHeaders(const QHash<QString, QString>&); void setExtraHeaders(const QHash<QString, QString>&);