diff --git a/autotests/data/fakeplugin.desktop b/autotests/data/fakeplugin.desktop --- a/autotests/data/fakeplugin.desktop +++ b/autotests/data/fakeplugin.desktop @@ -84,7 +84,7 @@ X-KDE-PluginInfo-Email=sebas@kde.org X-KDE-PluginInfo-Name=fakeplugin X-KDE-PluginInfo-Version=1.0 -X-KDE-PluginInfo-Website=http://kde.org/ +X-KDE-PluginInfo-Website=https://kde.org/ X-KDE-PluginInfo-Category=Examples X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=LGPL diff --git a/autotests/data/hiddenplugin.desktop b/autotests/data/hiddenplugin.desktop --- a/autotests/data/hiddenplugin.desktop +++ b/autotests/data/hiddenplugin.desktop @@ -84,7 +84,7 @@ X-KDE-PluginInfo-Email=sebas@kde.org X-KDE-PluginInfo-Name=fakeplugin X-KDE-PluginInfo-Version=1.0 -X-KDE-PluginInfo-Website=http://kde.org/ +X-KDE-PluginInfo-Website=https://kde.org/ X-KDE-PluginInfo-Category=Examples X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=LGPL diff --git a/autotests/data/twostepsparsetest.desktop b/autotests/data/twostepsparsetest.desktop --- a/autotests/data/twostepsparsetest.desktop +++ b/autotests/data/twostepsparsetest.desktop @@ -13,7 +13,7 @@ X-KDE-PluginInfo-Email=sebas@kde.org X-KDE-PluginInfo-Name=fakeplugin X-KDE-PluginInfo-Version=1.0 -X-KDE-PluginInfo-Website=http://kde.org/ +X-KDE-PluginInfo-Website=https://kde.org/ X-KDE-PluginInfo-Category=Examples X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=LGPL diff --git a/autotests/kaboutdatatest.cpp b/autotests/kaboutdatatest.cpp --- a/autotests/kaboutdatatest.cpp +++ b/autotests/kaboutdatatest.cpp @@ -188,7 +188,7 @@ KAboutData data2("app", QLatin1String("program"), "version", QLatin1String("description"), KAboutLicense::LGPL, QLatin1String("copyright"), QLatin1String("hello world"), - "http://edu.kde.org/kig"); + "https://edu.kde.org/kig"); QCOMPARE(data2.organizationDomain(), QString::fromLatin1("kde.org")); QCOMPARE(data2.desktopFileName(), QStringLiteral("org.kde.app")); } diff --git a/autotests/kmacroexpandertest.cpp b/autotests/kmacroexpandertest.cpp --- a/autotests/kmacroexpandertest.cpp +++ b/autotests/kmacroexpandertest.cpp @@ -89,35 +89,35 @@ QHash map2; map2.insert('a', "%n"); map2.insert('f', "filename.txt"); - map2.insert('u', "http://www.kde.org/index.html"); + map2.insert('u', "https://www.kde.org/index.html"); map2.insert('n', "Restaurant \"Chew It\""); s = "Title: %a - %f - %u - %n - %%"; QCOMPARE(KMacroExpander::expandMacros(s, map2), - QLatin1String("Title: %n - filename.txt - http://www.kde.org/index.html - Restaurant \"Chew It\" - %")); + QLatin1String("Title: %n - filename.txt - https://www.kde.org/index.html - Restaurant \"Chew It\" - %")); QHash smap; smap.insert("foo", "%n"); smap.insert("file", "filename.txt"); - smap.insert("url", "http://www.kde.org/index.html"); + smap.insert("url", "https://www.kde.org/index.html"); smap.insert("name", "Restaurant \"Chew It\""); s = "Title: %foo - %file - %url - %name - %"; QCOMPARE(KMacroExpander::expandMacros(s, smap), - QLatin1String("Title: %n - filename.txt - http://www.kde.org/index.html - Restaurant \"Chew It\" - %")); + QLatin1String("Title: %n - filename.txt - https://www.kde.org/index.html - Restaurant \"Chew It\" - %")); s = "%foo - %file - %url - %name"; QCOMPARE(KMacroExpander::expandMacros(s, smap), - QLatin1String("%n - filename.txt - http://www.kde.org/index.html - Restaurant \"Chew It\"")); + QLatin1String("%n - filename.txt - https://www.kde.org/index.html - Restaurant \"Chew It\"")); s = "Title: %{foo} - %{file} - %{url} - %{name} - %"; QCOMPARE(KMacroExpander::expandMacros(s, smap), - QLatin1String("Title: %n - filename.txt - http://www.kde.org/index.html - Restaurant \"Chew It\" - %")); + QLatin1String("Title: %n - filename.txt - https://www.kde.org/index.html - Restaurant \"Chew It\" - %")); s = "%{foo} - %{file} - %{url} - %{name}"; QCOMPARE(KMacroExpander::expandMacros(s, smap), - QLatin1String("%n - filename.txt - http://www.kde.org/index.html - Restaurant \"Chew It\"")); + QLatin1String("%n - filename.txt - https://www.kde.org/index.html - Restaurant \"Chew It\"")); s = "Title: %foo-%file-%url-%name-%"; QCOMPARE(KMacroExpander::expandMacros(s, smap), - QLatin1String("Title: %n-filename.txt-http://www.kde.org/index.html-Restaurant \"Chew It\"-%")); + QLatin1String("Title: %n-filename.txt-https://www.kde.org/index.html-Restaurant \"Chew It\"-%")); s = "Title: %{file} %{url"; QCOMPARE(KMacroExpander::expandMacros(s, smap), @@ -163,13 +163,13 @@ QHash map2; map2.insert('a', "%n"); map2.insert('f', "filename.txt"); - map2.insert('u', "http://www.kde.org/index.html"); + map2.insert('u', "https://www.kde.org/index.html"); map2.insert('n', "Restaurant \"Chew It\""); #ifdef Q_OS_WIN s = "Title: %a - %f - %u - %n - %% - %VARIABLE% foo"; QCOMPARE(KMacroExpander::expandMacrosShellQuote(s, map2), - QLatin1String("Title: %PERCENT_SIGN%n - filename.txt - http://www.kde.org/index.html - \"Restaurant \"\\^\"\"Chew It\"\\^\" - %PERCENT_SIGN% - %VARIABLE% foo")); + QLatin1String("Title: %PERCENT_SIGN%n - filename.txt - https://www.kde.org/index.html - \"Restaurant \"\\^\"\"Chew It\"\\^\" - %PERCENT_SIGN% - %VARIABLE% foo")); s = "kedit --caption %n %f"; map2.insert('n', "Restaurant 'Chew It'"); @@ -206,7 +206,7 @@ #else s = "Title: %a - %f - %u - %n - %%"; QCOMPARE(KMacroExpander::expandMacrosShellQuote(s, map2), - QLatin1String("Title: %n - filename.txt - http://www.kde.org/index.html - 'Restaurant \"Chew It\"' - %")); + QLatin1String("Title: %n - filename.txt - https://www.kde.org/index.html - 'Restaurant \"Chew It\"' - %")); s = "kedit --caption %n %f"; map2.insert('n', "Restaurant 'Chew It'"); diff --git a/autotests/kpluginmetadatatest.cpp b/autotests/kpluginmetadatatest.cpp --- a/autotests/kpluginmetadatatest.cpp +++ b/autotests/kpluginmetadatatest.cpp @@ -122,7 +122,7 @@ " \"Copyright\": \"(c) Alex Richardson 2015\",\n" " \"Id\": \"time\",\n" " \"Version\": \"1.0\",\n" - " \"Website\": \"http://plasma.kde.org/\",\n" + " \"Website\": \"https://plasma.kde.org/\",\n" " \"MimeTypes\": [ \"image/png\" ],\n" " \"ServiceTypes\": [\"Plasma/DataEngine\"]\n" " }\n}\n", &e).object(); @@ -149,7 +149,7 @@ QCOMPARE(m.license(), QStringLiteral("LGPL")); QCOMPARE(m.copyrightText(), QStringLiteral("(c) Alex Richardson 2015")); QCOMPARE(m.version(), QStringLiteral("1.0")); - QCOMPARE(m.website(), QStringLiteral("http://plasma.kde.org/")); + QCOMPARE(m.website(), QStringLiteral("https://plasma.kde.org/")); QCOMPARE(m.serviceTypes(), QStringList() << QStringLiteral("Plasma/DataEngine")); QCOMPARE(m.mimeTypes(), QStringList() << QStringLiteral("image/png")); } @@ -235,7 +235,7 @@ QCOMPARE(md.metaDataFileName(), dfile); QCOMPARE(md.iconName(), QStringLiteral("preferences-system-time")); QCOMPARE(md.license(), QStringLiteral("LGPL")); - QCOMPARE(md.website(), QStringLiteral("http://kde.org/")); + QCOMPARE(md.website(), QStringLiteral("https://kde.org/")); QCOMPARE(md.category(), QStringLiteral("Examples")); QCOMPARE(md.version(), QStringLiteral("1.0")); QCOMPARE(md.dependencies(), QStringList()); diff --git a/autotests/kstringhandlertest.cpp b/autotests/kstringhandlertest.cpp --- a/autotests/kstringhandlertest.cpp +++ b/autotests/kstringhandlertest.cpp @@ -17,9 +17,9 @@ void KStringHandlerTest::tagURLs() { - QString test = "Click on http://foo@bar:www.kde.org/yoyo/dyne.html#a1 for info."; + QString test = "Click on https://foo@bar:www.kde.org/yoyo/dyne.html#a1 for info."; QCOMPARE(KStringHandler::tagUrls(test), - QString("Click on http://foo@bar:www.kde.org/yoyo/dyne.html#a1 for info.")); + QString("Click on https://foo@bar:www.kde.org/yoyo/dyne.html#a1 for info.")); test = "http://www.foo.org/story$806"; QCOMPARE(KStringHandler::tagUrls(test), diff --git a/autotests/ktexttohtmltest.cpp b/autotests/ktexttohtmltest.cpp --- a/autotests/ktexttohtmltest.cpp +++ b/autotests/ktexttohtmltest.cpp @@ -240,7 +240,7 @@ } // test max url length - QString url = QStringLiteral("http://www.kde.org/this/is/a_very_loooooong_url/test/test/test"); + QString url = QStringLiteral("https://www.kde.org/this/is/a_very_loooooong_url/test/test/test"); { KTextToHTMLHelper ll(url, 0, 10); QVERIFY(ll.getUrl().isEmpty()); // url too long @@ -372,20 +372,20 @@ "www.example.com/test.cpp."; // Bug 313719 - URL in parenthesis - QTest::newRow("url-in-parenthesis-1") << "KDE (website http://www.kde.org)" + QTest::newRow("url-in-parenthesis-1") << "KDE (website https://www.kde.org)" << KTextToHTML::Options(KTextToHTML::PreserveSpaces) - << "KDE (website http://www.kde.org)"; - QTest::newRow("url-in-parenthesis-2") << "KDE website (http://www.kde.org)" + << "KDE (website https://www.kde.org)"; + QTest::newRow("url-in-parenthesis-2") << "KDE website (https://www.kde.org)" << KTextToHTML::Options(KTextToHTML::PreserveSpaces) - << "KDE website (http://www.kde.org)"; - QTest::newRow("url-in-parenthesis-3") << "bla (http://www.kde.org - section 5.2)" + << "KDE website (https://www.kde.org)"; + QTest::newRow("url-in-parenthesis-3") << "bla (https://www.kde.org - section 5.2)" << KTextToHTML::Options(KTextToHTML::PreserveSpaces) - << "bla (http://www.kde.org - section 5.2)"; + << "bla (https://www.kde.org - section 5.2)"; // Fix url as foo < > when we concatened them. - QTest::newRow("url-with-url") << "foo >" + QTest::newRow("url-with-url") << "foo >" << KTextToHTML::Options(KTextToHTML::PreserveSpaces) - << "foo <http://www.kde.org/ <http://www.kde.org/>>"; + << "foo <https://www.kde.org/ <https://www.kde.org/>>"; //Fix url exploit QTest::newRow("url-exec-html") << "https://\">