From 3536fa8a75b3769e4f4bf1153eab688d0c56f242 Mon Sep 17 00:00:00 2001 From: Zach H Date: Sun, 23 Aug 2020 17:24:26 -0400 Subject: [PATCH] Fix #4072 by changing outdated HTTP to HTTPS calls within the codebase (#4073) --- cockatrice/src/chatview/chatview.cpp | 2 +- cockatrice/src/dlg_settings.cpp | 4 ++-- cockatrice/src/settings/downloadsettings.cpp | 4 ++-- cockatrice/src/tappedout_interface.cpp | 4 ++-- common/decklist.cpp | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cockatrice/src/chatview/chatview.cpp b/cockatrice/src/chatview/chatview.cpp index 028e5a32..858166f7 100644 --- a/cockatrice/src/chatview/chatview.cpp +++ b/cockatrice/src/chatview/chatview.cpp @@ -128,7 +128,7 @@ void ChatView::appendCardTag(QTextCursor &cursor, const QString &cardName) void ChatView::appendUrlTag(QTextCursor &cursor, QString url) { if (!url.contains("://")) - url.prepend("http://"); + url.prepend("https://"); QTextCharFormat oldFormat = cursor.charFormat(); QTextCharFormat anchorFormat = oldFormat; diff --git a/cockatrice/src/dlg_settings.cpp b/cockatrice/src/dlg_settings.cpp index c6d7e179..5a0c3298 100644 --- a/cockatrice/src/dlg_settings.cpp +++ b/cockatrice/src/dlg_settings.cpp @@ -1328,7 +1328,7 @@ void DlgSettings::closeEvent(QCloseEvent *event) break; case NotLoaded: loadErrorMessage = tr("Your card database did not finish loading\n\n" - "Please file a ticket at http://github.com/Cockatrice/Cockatrice/issues with your " + "Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your " "cards.xml attached\n\n" "Would you like to change your database location setting?"); break; @@ -1342,7 +1342,7 @@ void DlgSettings::closeEvent(QCloseEvent *event) break; default: loadErrorMessage = tr("Unknown card database load status\n\n" - "Please file a ticket at http://github.com/Cockatrice/Cockatrice/issues\n\n" + "Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues\n\n" "Would you like to change your database location setting?"); break; diff --git a/cockatrice/src/settings/downloadsettings.cpp b/cockatrice/src/settings/downloadsettings.cpp index fdda815d..f24b157d 100644 --- a/cockatrice/src/settings/downloadsettings.cpp +++ b/cockatrice/src/settings/downloadsettings.cpp @@ -32,8 +32,8 @@ void DownloadSettings::populateDefaultURLs() downloadURLs.clear(); downloadURLs.append("https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!"); downloadURLs.append("https://api.scryfall.com/cards/multiverse/!set:muid!?format=image"); - downloadURLs.append("http://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card"); - downloadURLs.append("http://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"); + downloadURLs.append("https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card"); + downloadURLs.append("https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"); setValue(QVariant::fromValue(downloadURLs), "urls", "downloads"); } diff --git a/cockatrice/src/tappedout_interface.cpp b/cockatrice/src/tappedout_interface.cpp index 6c7428ed..45edabb0 100644 --- a/cockatrice/src/tappedout_interface.cpp +++ b/cockatrice/src/tappedout_interface.cpp @@ -34,7 +34,7 @@ void TappedOutInterface::queryFinished(QNetworkReply *reply) */ QString deckUrl = reply->rawHeader("Location"); qDebug() << "Tappedout: good reply, http status" << httpStatus << "location" << deckUrl; - QDesktopServices::openUrl("http://tappedout.net" + deckUrl); + QDesktopServices::openUrl("https://tappedout.net" + deckUrl); } else { /* * Otherwise, the deck has not been parsed correctly. Error messages can be extracted @@ -86,7 +86,7 @@ void TappedOutInterface::analyzeDeck(DeckList *deck) QByteArray data; getAnalyzeRequestData(deck, &data); - QNetworkRequest request(QUrl("http://tappedout.net/mtg-decks/paste/")); + QNetworkRequest request(QUrl("https://tappedout.net/mtg-decks/paste/")); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); manager->post(request, data); diff --git a/common/decklist.cpp b/common/decklist.cpp index 9e255f5e..e28084de 100644 --- a/common/decklist.cpp +++ b/common/decklist.cpp @@ -336,7 +336,7 @@ DeckList::DeckList() root = new InnerDecklistNode; } -// TODO: http://qt-project.org/doc/qt-4.8/qobject.html#no-copy-constructor-or-assignment-operator +// TODO: https://qt-project.org/doc/qt-4.8/qobject.html#no-copy-constructor-or-assignment-operator DeckList::DeckList(const DeckList &other) : QObject(), name(other.name), comments(other.comments), deckHash(other.deckHash) {