From c2e3479b87e7d0713d302d26fb2d7d01d7b8c9c2 Mon Sep 17 00:00:00 2001 From: phuzion Date: Tue, 27 Feb 2018 21:25:35 +0000 Subject: [PATCH] Change HTTP links to HTTPS for quassel-irc.org and subdomains Closes GH-335. --- ChangeLog | 4 ++-- README.md | 6 +++--- data/quassel.appdata.xml | 4 ++-- data/quasselclient.appdata.xml | 4 ++-- scripts/build/NullsoftInstaller.nsi | 2 +- src/common/identity.cpp | 4 ++-- src/common/main.cpp | 2 +- src/core/coresessioneventprocessor.cpp | 2 +- src/core/sslserver.cpp | 6 +++--- src/qtui/aboutdlg.cpp | 10 +++++----- src/uisupport/aboutdata.cpp | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index a75f62c9..f8bb58f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,10 +6,10 @@ contains end-user visible, mostly major new features. It does not contain (most) bugfixes, nor is it guaranteed to be complete or up-to-date at all. Also, it does start at 0.3.0 only, since this was the first version widely available. -Please have a look at for a +Please have a look at for a list of closed bug/feature reports (which still does not cover bugs we have fixed but which were never reported, of course), and for a full list of -changes, the git history at is your friend. +changes, the git history at is your friend. Without further ado, let's start: diff --git a/README.md b/README.md index 60a45324..2c467187 100644 --- a/README.md +++ b/README.md @@ -52,10 +52,10 @@ Thanks for reading, ~ *The Quassel IRC Team* -[web-home]: http://quassel-irc.org -[dev-bugs]: http://bugs.quassel-irc.org +[web-home]: https://quassel-irc.org +[dev-bugs]: https://bugs.quassel-irc.org [dev-email]: mailto:devel@quassel-irc.org [dev-pr-new]: https://github.com/quassel/quassel/pull/new/master -[docs-wiki]: http://bugs.quassel-irc.org/projects/quassel-irc/wiki +[docs-wiki]: https://bugs.quassel-irc.org/projects/quassel-irc/wiki [help-freenode]: https://webchat.freenode.net?channels=%23quassel [repo-changelog]: ChangeLog diff --git a/data/quassel.appdata.xml b/data/quassel.appdata.xml index 3efefa6f..50905ce4 100644 --- a/data/quassel.appdata.xml +++ b/data/quassel.appdata.xml @@ -25,11 +25,11 @@ without setting up a core. - http://quassel-irc.org/files/images/20080914-011743-quasselkde4.preview.png + https://quassel-irc.org/files/images/20080914-011743-quasselkde4.preview.png Quassel, with a dark theme enabled - http://quassel-irc.org/files/images/quassel_win7.preview.png + https://quassel-irc.org/files/images/quassel_win7.preview.png The default quassel white theme. Quassel runs on all major desktop platforms, and many smartphones as well. diff --git a/data/quasselclient.appdata.xml b/data/quasselclient.appdata.xml index 2649dcef..47c283a2 100644 --- a/data/quasselclient.appdata.xml +++ b/data/quasselclient.appdata.xml @@ -25,11 +25,11 @@ This application is the client-only version of Quassel. You must first set up - http://quassel-irc.org/files/images/20080914-011743-quasselkde4.preview.png + https://quassel-irc.org/files/images/20080914-011743-quasselkde4.preview.png Quassel, with a dark theme enabled - http://quassel-irc.org/files/images/quassel_win7.preview.png + https://quassel-irc.org/files/images/quassel_win7.preview.png The default quassel white theme. Quassel runs on all major desktop platforms, and many smartphones as well. diff --git a/scripts/build/NullsoftInstaller.nsi b/scripts/build/NullsoftInstaller.nsi index af69ad46..6a7375d6 100644 --- a/scripts/build/NullsoftInstaller.nsi +++ b/scripts/build/NullsoftInstaller.nsi @@ -24,7 +24,7 @@ var nameOfToBeRunend Var StartMenuFolder -!define PRODUCT_WEB_SITE http://quassel-irc.org/ +!define PRODUCT_WEB_SITE https://quassel-irc.org/ !define MyApp_AppUserModelId QuasselProject.QuasselIRC !define SnoreToastExe "$INSTDIR\SnoreToast.exe" diff --git a/src/common/identity.cpp b/src/common/identity.cpp index ea7e3ee9..c416a1dd 100644 --- a/src/common/identity.cpp +++ b/src/common/identity.cpp @@ -191,8 +191,8 @@ void Identity::setToDefaults() setDetachAwayReasonEnabled(false); setIdent("quassel"); setKickReason(tr("Kindergarten is elsewhere!")); - setPartReason(tr("http://quassel-irc.org - Chat comfortably. Anywhere.")); - setQuitReason(tr("http://quassel-irc.org - Chat comfortably. Anywhere.")); + setPartReason(tr("https://quassel-irc.org - Chat comfortably. Anywhere.")); + setQuitReason(tr("https://quassel-irc.org - Chat comfortably. Anywhere.")); } diff --git a/src/common/main.cpp b/src/common/main.cpp index 8f75984b..47ad3d48 100644 --- a/src/common/main.cpp +++ b/src/common/main.cpp @@ -118,7 +118,7 @@ int main(int argc, char **argv) ki18n("A modern, distributed IRC client")); aboutData.addLicense(KAboutData::License_GPL_V2); aboutData.addLicense(KAboutData::License_GPL_V3); - aboutData.setBugAddress("http://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); + aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); KCmdLineArgs::init(argc, argv, &aboutData); diff --git a/src/core/coresessioneventprocessor.cpp b/src/core/coresessioneventprocessor.cpp index ec875690..9a0e0363 100644 --- a/src/core/coresessioneventprocessor.cpp +++ b/src/core/coresessioneventprocessor.cpp @@ -1550,6 +1550,6 @@ void CoreSessionEventProcessor::handleCtcpTime(CtcpEvent *e) void CoreSessionEventProcessor::handleCtcpVersion(CtcpEvent *e) { - e->setReply(QString("Quassel IRC %1 (built on %2) -- http://www.quassel-irc.org") + e->setReply(QString("Quassel IRC %1 (built on %2) -- https://www.quassel-irc.org") .arg(Quassel::buildInfo().plainVersionString).arg(Quassel::buildInfo().commitDate)); } diff --git a/src/core/sslserver.cpp b/src/core/sslserver.cpp index b6becaf6..8b0d0657 100644 --- a/src/core/sslserver.cpp +++ b/src/core/sslserver.cpp @@ -57,7 +57,7 @@ SslServer::SslServer(QObject *parent) quWarning() << "SslServer: Unable to set certificate file\n" << " Quassel Core will still work, but cannot provide SSL for client connections.\n" - << " Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support."; + << " Please see https://quassel-irc.org/faq/cert to learn how to enable SSL support."; sslWarningShown = true; } } @@ -112,12 +112,12 @@ bool SslServer::reloadCerts() quWarning() << "SslServer: Unable to reload certificate file, reverting\n" << " Quassel Core will use the previous key to provide SSL for client connections.\n" - << " Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support."; + << " Please see https://quassel-irc.org/faq/cert to learn how to enable SSL support."; } else { quWarning() << "SslServer: Unable to reload certificate file\n" << " Quassel Core will still work, but cannot provide SSL for client connections.\n" - << " Please see http://quassel-irc.org/faq/cert to learn how to enable SSL support."; + << " Please see https://quassel-irc.org/faq/cert to learn how to enable SSL support."; } return false; } diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp index c597f4ed..5b08b643 100644 --- a/src/qtui/aboutdlg.cpp +++ b/src/qtui/aboutdlg.cpp @@ -52,15 +52,15 @@ QString AboutDlg::about() const { QString res {tr("A modern, distributed IRC Client

" "©%1 by the Quassel Project
" - "http://quassel-irc.org
" - "#quassel on Freenode

" - "Quassel IRC is dual-licensed under GPLv2 and " - "GPLv3.
" + "https://quassel-irc.org
" + "#quassel on Freenode

" + "Quassel IRC is dual-licensed under GPLv2 and " + "GPLv3.
" "Breeze icon theme © Uri Herrera and others, licensed under the " "LGPLv3.
" "Oxygen icon theme © Nuno Pinheiro and others, licensed under the " "LGPLv3.

" - "Please use http://bugs.quassel-irc.org to report bugs." + "Please use https://bugs.quassel-irc.org to report bugs." ).arg("2005-2016") }; diff --git a/src/uisupport/aboutdata.cpp b/src/uisupport/aboutdata.cpp index 7bd9acd9..25adf627 100644 --- a/src/uisupport/aboutdata.cpp +++ b/src/uisupport/aboutdata.cpp @@ -140,7 +140,7 @@ KAboutData AboutData::kAboutData() const aboutData.addLicense(KAboutLicense::GPL_V3); aboutData.setShortDescription(tr("A modern, distributed IRC client")); aboutData.setProgramLogo(QVariant::fromValue(QImage(":/pics/quassel-logo.png"))); - aboutData.setBugAddress("http://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); + aboutData.setBugAddress("https://bugs.quassel-irc.org/projects/quassel-irc/issues/new"); aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8()); for (const auto &person : authors()) { -- 2.20.1