Git commit b0cd6c5cf3284e2690b718d278d277b70deb096c by Yuri Chornoivan. Committed on 15/09/2019 at 07:13. Pushed by yurchor into branch 'master'.
Update links + minor documentation update M +23 -15 doc/index.docbook M +5 -5 src/backends/CMakeLists.txt M +1 -1 src/backends/R/cantor_r.knsrc M +1 -1 src/backends/R/rbackend.cpp M +1 -1 src/backends/R/rbackend.json M +1 -1 src/backends/R/rserver/org.kde.Cantor.R.xml M +4 -4 src/backends/R/rserver/rserver.kcfg M +1 -1 src/backends/julia/juliabackend.cpp M +1 -1 src/backends/julia/juliabackend.h M +1 -1 src/backends/julia/juliabackend.json M +4 -4 src/backends/julia/juliabackend.kcfg M +1 -1 src/backends/julia/juliaextensions.cpp M +1 -1 src/backends/julia/juliaextensions.h M +1 -1 src/backends/julia/juliaserver/juliaserver.h M +1 -1 src/backends/kalgebra/cantor_kalgebra.knsrc M +1 -1 src/backends/kalgebra/kalgebrabackend.cpp M +1 -1 src/backends/kalgebra/kalgebrabackend.json M +4 -4 src/backends/kalgebra/kalgebrabackend.kcfg M +1 -1 src/backends/lua/cantor_lua.knsrc M +1 -1 src/backends/lua/luabackend.cpp M +1 -1 src/backends/lua/luabackend.json M +4 -4 src/backends/lua/luabackend.kcfg M +1 -1 src/backends/maxima/cantor_maxima.knsrc M +4 -4 src/backends/maxima/maximabackend.kcfg M +1 -1 src/backends/octave/cantor_octave.knsrc M +1 -1 src/backends/octave/octavebackend.cpp M +1 -1 src/backends/octave/octavebackend.json M +4 -4 src/backends/octave/octavebackend.kcfg M +1 -1 src/backends/python2/cantor_python2.knsrc M +1 -1 src/backends/python2/python2backend.cpp M +1 -1 src/backends/python2/python2backend.json M +4 -4 src/backends/python2/python2backend.kcfg M +1 -1 src/backends/python3/cantor_python3.knsrc M +1 -1 src/backends/python3/python3backend.cpp M +1 -1 src/backends/python3/python3backend.json M +4 -4 src/backends/python3/python3backend.kcfg M +1 -1 src/backends/qalculate/cantor_qalculate.knsrc M +1 -1 src/backends/qalculate/qalculatebackend.cpp M +1 -1 src/backends/qalculate/qalculatebackend.json M +4 -4 src/backends/qalculate/qalculatebackend.kcfg M +1 -1 src/backends/sage/cantor_sage.knsrc M +1 -1 src/backends/sage/sagebackend.cpp M +1 -1 src/backends/sage/sagebackend.json M +4 -4 src/backends/sage/sagebackend.kcfg M +2 -2 src/backends/sage/sagekeywords.h M +1 -1 src/backends/scilab/cantor_scilab.knsrc M +1 -1 src/backends/scilab/scilabbackend.cpp M +1 -1 src/backends/scilab/scilabbackend.json M +4 -4 src/backends/scilab/scilabbackend.kcfg M +1 -2 src/cantor.cpp M +4 -4 src/cantor.kcfg M +1 -1 src/cantor.knsrc M +1 -1 src/cantor_part.cpp M +1 -1 src/lib/backend.h M +4 -4 src/lib/cantor_libs.kcfg M +3 -5 src/main.cpp M +1 -1 src/xslt/latex.xsl https://commits.kde.org/cantor/b0cd6c5cf3284e2690b718d278d277b70deb096c diff --git a/doc/index.docbook b/doc/index.docbook index 85438141..2a68a015 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -27,8 +27,8 @@ </copyright> <legalnotice>&FDLNotice;</legalnotice> -<date>2016-08-25</date> -<releaseinfo>Applications 16.12</releaseinfo> +<date>2019-09-15</date> +<releaseinfo>Applications 19.12</releaseinfo> <abstract> <para> @@ -142,7 +142,7 @@ Screenshot: and graphical techniques, and is highly extensible. The S language is often the vehicle of choice for research in statistical methodology, and R provides an open-source route to this. - See <ulink url="http://www.r-project.org";>http://www.r-project.org</ulink> for more information. + See <ulink url="https://www.r-project.org";>https://www.r-project.org</ulink> for more information. </para> </listitem> </varlistentry> @@ -155,7 +155,7 @@ Screenshot: other technical computing environments. It provides a sophisticated compiler, distributed parallel execution, numerical accuracy, and an extensive mathematical function library. - See <ulink url="http://docs.julialang.org/en/latest/";>Julia documentation</ulink> for more information. + See <ulink url="https://docs.julialang.org/en/latest/";>Julia documentation</ulink> for more information. </para> </listitem> </varlistentry> @@ -164,7 +164,7 @@ Screenshot: <listitem> <para> &kalgebra; is a MathML-based graph calculator, that ships with &kde; Education project. - See <ulink url="http://edu.kde.org/kalgebra/";>http://edu.kde.org/kalgebra/</ulink> for more information. + See <ulink url="https://edu.kde.org/kalgebra/";>https://edu.kde.org/kalgebra/</ulink> for more information. </para> </listitem> </varlistentry> @@ -183,7 +183,7 @@ Screenshot: errors. Qalculate! will simplify as far as it can and answer with an expression. In addition to numbers and arithmetic operators, an expression may contain any combination of variables, units, and functions. - See <ulink url="http://qalculate.sourceforge.net/";>http://qalculate.sourceforge.net/</ulink> for more information. + See <ulink url="https://qalculate.github.io/";>https://qalculate.github.io/</ulink> for more information. </para> </listitem> </varlistentry> @@ -196,7 +196,7 @@ in a wide variety of application domains. There are several Python packages to scientific programming. </para> <para>Python is distributed under Python Software Foundation license (GPL compatible). - See the <ulink url="http://www.python.org/";>official website</ulink> for more information. + See the <ulink url="https://www.python.org/";>official website</ulink> for more information. </para> <note> <para> @@ -213,7 +213,7 @@ to scientific programming. and a high-level, numerically oriented programming language. </para> <para>Scilab is distributed under CeCILL license (GPL compatible). - See <ulink url="http://www.scilab.org/";>http://www.scilab.org/</ulink> for more information. + See <ulink url="https://www.scilab.org/";>https://www.scilab.org/</ulink> for more information. </para> <warning> <para> @@ -229,8 +229,8 @@ to scientific programming. &GNU; Octave is a high-level language, primarily intended for numerical computations. It provides a convenient command line interface for solving linear and nonlinear problems numerically, and for performing other - numerical experiments using a language that is mostly compatible with <ulink url="http://www.mathworks.com/products/matlab/";>MATLAB</ulink>. - See <ulink url="http://www.gnu.org/software/octave/";>http://www.gnu.org/software/octave/</ulink> for more information. + numerical experiments using a language that is mostly compatible with <ulink url="https://www.mathworks.com/products/matlab.html";>MATLAB</ulink>. + See <ulink url="https://www.gnu.org/software/octave/";>https://www.gnu.org/software/octave/</ulink> for more information. </para> </listitem> </varlistentry> @@ -241,10 +241,10 @@ to scientific programming. Lua is a fast and lightweight scripting language, with a simple procedural syntax. There are several libraries in Lua aimed at math and science. </para> <para> - See <ulink url="http://www.lua.org/";>http://www.lua.org/</ulink> for more information. + See <ulink url="https://www.lua.org/";>https://www.lua.org/</ulink> for more information. </para> <para> - This backend supports <ulink url="http://luajit.org/";>luajit 2</ulink>. + This backend supports <ulink url="https://luajit.org/";>luajit 2</ulink>. </para> </listitem> </varlistentry> @@ -352,6 +352,14 @@ to scientific programming. </para> </listitem> </varlistentry> + <varlistentry> + <term>Embedded Math</term> + <listitem> + <para> + This setting controls whether rendering math expressions inside <literal>$$..$$</literal> in Text and Markdown entries is enabled by default (needs <application>pdflatex</application> installed). + </para> + </listitem> + </varlistentry> </variablelist> </sect3> </sect2> @@ -582,7 +590,7 @@ This dialog allows entering expression of the function, its variables and the li <guimenuitem>Download Example Worksheets</guimenuitem> </menuchoice></term> <listitem><para><action>Opens the dialog to download examples uploaded by other &cantor; users with - <ulink url="http://userbase.kde.org/Special:MyLanguage/Glossary#Get_Hot_New_Stuff";>GetHotNewStuff</ulink>.</action></para></listitem> + <ulink url="https://userbase.kde.org/Special:MyLanguage/Glossary#Get_Hot_New_Stuff";>GetHotNewStuff</ulink>.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> @@ -612,7 +620,7 @@ This dialog allows entering expression of the function, its variables and the li <guimenuitem>Publish Worksheet</guimenuitem> </menuchoice></term> <listitem><para><action>Opens the dialog to publish your current worksheet and make it available to other &cantor; users through - <ulink url="http://userbase.kde.org/Special:MyLanguage/Glossary#Get_Hot_New_Stuff";>GetHotNewStuff</ulink>.</action></para></listitem> + <ulink url="https://userbase.kde.org/Special:MyLanguage/Glossary#Get_Hot_New_Stuff";>GetHotNewStuff</ulink>.</action></para></listitem> </varlistentry> <varlistentry> <term><menuchoice> @@ -896,7 +904,7 @@ of the &kde; Fundamentals. </qandaentry> <qandaentry> <question><para>What a peculiar name - what does it have to do with mathematics?</para></question> - <answer><para>&cantor; is named after the German mathematician <ulink url="http://en.wikipedia.org/wiki/Georg_Cantor";>Georg Cantor</ulink>, the creator of set theory.</para></answer> + <answer><para>&cantor; is named after the German mathematician <ulink url="https://en.wikipedia.org/wiki/Georg_Cantor";>Georg Cantor</ulink>, the creator of set theory.</para></answer> </qandaentry> </qandaset> </chapter> diff --git a/src/backends/CMakeLists.txt b/src/backends/CMakeLists.txt index d47835b7..d318781c 100644 --- a/src/backends/CMakeLists.txt +++ b/src/backends/CMakeLists.txt @@ -19,7 +19,7 @@ if(NOT WIN32) endif(NOT WIN32) set_package_properties(Analitza5 PROPERTIES DESCRIPTION "A library provided by KAlgebra." - URL "http://edu.kde.org/kalgebra/"; + URL "https://edu.kde.org/kalgebra/"; TYPE OPTIONAL PURPOSE "Backend to use KAlgebra with Cantor.") @@ -29,7 +29,7 @@ if(Analitza5_FOUND) endif(Analitza5_FOUND) set_package_properties(R PROPERTIES DESCRIPTION "A free software environment for statistical computing and graphics." - URL "http://www.r-project.org/"; + URL "https://www.r-project.org/"; TYPE OPTIONAL PURPOSE "Backend to use R with Cantor.") @@ -39,7 +39,7 @@ if(R_FOUND) endif(R_FOUND) set_package_properties(Qalculate PROPERTIES DESCRIPTION "A multi-purpose desktop calculator with support for customizable functions, units and arbitrary precision." - URL "http://qalculate.sourceforge.net/"; + URL "https://qalculate.github.io/"; TYPE OPTIONAL PURPOSE "Backend to use Qalculate with Cantor.") @@ -80,7 +80,7 @@ if(PYTHONLIBS3_FOUND) endif(PYTHONLIBS3_FOUND) set_package_properties(LuaJIT PROPERTIES DESCRIPTION "A lightweight, extensible programming language (luajit implementation)." - URL "http://www.lua.org/"; + URL "https://www.lua.org/"; TYPE OPTIONAL PURPOSE "Backend to use Lua (luajit2) with Cantor.") @@ -92,7 +92,7 @@ endif(LUAJIT_FOUND) set_package_properties( Julia PROPERTIES DESCRIPTION "A high-level, high-performance dynamic programming language for technical computing" - URL "http://julialang.org/"; + URL "https://julialang.org/"; TYPE OPTIONAL PURPOSE "Backend to use Julia with Cantor.") diff --git a/src/backends/R/cantor_r.knsrc b/src/backends/R/cantor_r.knsrc index 32801004..898bd6e3 100644 --- a/src/backends/R/cantor_r.knsrc +++ b/src/backends/R/cantor_r.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (R) TargetDir=cantor/examples diff --git a/src/backends/R/rbackend.cpp b/src/backends/R/rbackend.cpp index 637e1e19..6fd638fc 100644 --- a/src/backends/R/rbackend.cpp +++ b/src/backends/R/rbackend.cpp @@ -91,7 +91,7 @@ QUrl RBackend::helpUrl() const return localDoc; else return QUrl(i18nc("the url to the documentation of R, please check if there is a translated version and use the correct url", - "http://rwiki.sciviews.org/doku.php?id=rdoc:rdoc";)); + "https://cran.r-project.org/manuals.html";)); } QString RBackend::description() const diff --git a/src/backends/R/rbackend.json b/src/backends/R/rbackend.json index ee3dde46..5cba176d 100644 --- a/src/backends/R/rbackend.json +++ b/src/backends/R/rbackend.json @@ -62,6 +62,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://www.r-project.org/"; + "Website": "https://www.r-project.org/"; } } diff --git a/src/backends/R/rserver/org.kde.Cantor.R.xml b/src/backends/R/rserver/org.kde.Cantor.R.xml index f31de1cb..4cdf539c 100644 --- a/src/backends/R/rserver/org.kde.Cantor.R.xml +++ b/src/backends/R/rserver/org.kde.Cantor.R.xml @@ -1,4 +1,4 @@ -<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd";> +<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "https://specifications.freedesktop.org/dbus/1.0/introspect.dtd";> <node> <interface name="org.kde.Cantor.R"> <signal name="ready"> diff --git a/src/backends/R/rserver/rserver.kcfg b/src/backends/R/rserver/rserver.kcfg index caccc17f..0d80dd92 100644 --- a/src/backends/R/rserver/rserver.kcfg +++ b/src/backends/R/rserver/rserver.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <kcfgfile name="cantorrc" /> <group name="RBackend"> <entry name="localDoc" type="Url"> diff --git a/src/backends/julia/juliabackend.cpp b/src/backends/julia/juliabackend.cpp index 37be41e0..73799318 100644 --- a/src/backends/julia/juliabackend.cpp +++ b/src/backends/julia/juliabackend.cpp @@ -82,7 +82,7 @@ QUrl JuliaBackend::helpUrl() const return QUrl(i18nc( "The url to the documentation of Julia, please check if there is a" " translated version and use the correct url", - "http://docs.julialang.org/en/latest/"; + "https://docs.julialang.org/en/latest/"; )); } diff --git a/src/backends/julia/juliabackend.h b/src/backends/julia/juliabackend.h index 78425829..e12fff07 100644 --- a/src/backends/julia/juliabackend.h +++ b/src/backends/julia/juliabackend.h @@ -24,7 +24,7 @@ /** * Backend for Julia language * - * @see http://julialang.org/ + * @see https://julialang.org/ * @see JuliaServer */ class JuliaBackend: public Cantor::Backend diff --git a/src/backends/julia/juliabackend.json b/src/backends/julia/juliabackend.json index b6f45f44..9311617e 100644 --- a/src/backends/julia/juliabackend.json +++ b/src/backends/julia/juliabackend.json @@ -60,6 +60,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://julialang.org/"; + "Website": "https://julialang.org/"; } } diff --git a/src/backends/julia/juliabackend.kcfg b/src/backends/julia/juliabackend.kcfg index 11cfe1d1..614d0522 100644 --- a/src/backends/julia/juliabackend.kcfg +++ b/src/backends/julia/juliabackend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <include>QStandardPaths</include> <kcfgfile name="cantorrc"/> <group name="JuliaBackend"> diff --git a/src/backends/julia/juliaextensions.cpp b/src/backends/julia/juliaextensions.cpp index df1d1cd7..71678b2f 100644 --- a/src/backends/julia/juliaextensions.cpp +++ b/src/backends/julia/juliaextensions.cpp @@ -241,7 +241,7 @@ QString JuliaVariableManagementExtension::setValue( QString JuliaVariableManagementExtension::removeVariable(const QString &name) { // There is no way to completely delete object from scope: - // http://docs.julialang.org/en/release-0.4/manual/faq/#how-do-i-delete-an-object-in-memory + // https://docs.julialang.org/en/v1/manual/faq/#How-do-I-delete-an-object-in-memory?-1 return QString::fromLatin1("%1 = \"%2\"") .arg(name).arg(REMOVED_VARIABLE_MARKER); } diff --git a/src/backends/julia/juliaextensions.h b/src/backends/julia/juliaextensions.h index 29c072bd..55720ee4 100644 --- a/src/backends/julia/juliaextensions.h +++ b/src/backends/julia/juliaextensions.h @@ -164,7 +164,7 @@ public: JULIA_EXT_CDTOR_DECL(VariableManagement) // There is no way to completely delete object from scope: - // http://docs.julialang.org/en/release-0.4/manual/faq/#how-do-i-delete-an-object-in-memory + // https://docs.julialang.org/en/v1/manual/faq/#How-do-I-delete-an-object-in-memory?-1 // So we are saving special marker to variable to mark it as removed static const QString REMOVED_VARIABLE_MARKER; diff --git a/src/backends/julia/juliaserver/juliaserver.h b/src/backends/julia/juliaserver/juliaserver.h index 3c39d00f..381c26c8 100644 --- a/src/backends/julia/juliaserver/juliaserver.h +++ b/src/backends/julia/juliaserver/juliaserver.h @@ -31,7 +31,7 @@ * language. * * Uses Julia embedding - * http://docs.julialang.org/en/release-0.4/manual/embedding/ to get results. + * https://docs.julialang.org/en/v1/manual/embedding/ to get results. */ class JuliaServer: public QObject { diff --git a/src/backends/kalgebra/cantor_kalgebra.knsrc b/src/backends/kalgebra/cantor_kalgebra.knsrc index b19190c8..e50d3cf0 100644 --- a/src/backends/kalgebra/cantor_kalgebra.knsrc +++ b/src/backends/kalgebra/cantor_kalgebra.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (KAlgebra) TargetDir=cantor/examples diff --git a/src/backends/kalgebra/kalgebrabackend.cpp b/src/backends/kalgebra/kalgebrabackend.cpp index 274890e5..ed5870a3 100644 --- a/src/backends/kalgebra/kalgebrabackend.cpp +++ b/src/backends/kalgebra/kalgebrabackend.cpp @@ -65,7 +65,7 @@ KConfigSkeleton* KAlgebraBackend::config() const QUrl KAlgebraBackend::helpUrl() const { return QUrl(i18nc("The url to the documentation of KAlgebra, please check if there is a translated version and use the correct url", - "http://docs.kde.org/stable/en/kdeedu/kalgebra/";)); + "https://docs.kde.org/stable/en/kdeedu/kalgebra/";)); } bool KAlgebraBackend::requirementsFullfilled(QString* const reason) const diff --git a/src/backends/kalgebra/kalgebrabackend.json b/src/backends/kalgebra/kalgebrabackend.json index c0ebf8bc..654c70b9 100644 --- a/src/backends/kalgebra/kalgebrabackend.json +++ b/src/backends/kalgebra/kalgebrabackend.json @@ -62,6 +62,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://edu.kde.org/kalgebra"; + "Website": "https://edu.kde.org/kalgebra"; } } diff --git a/src/backends/kalgebra/kalgebrabackend.kcfg b/src/backends/kalgebra/kalgebrabackend.kcfg index 94fcb6bd..1287913a 100644 --- a/src/backends/kalgebra/kalgebrabackend.kcfg +++ b/src/backends/kalgebra/kalgebrabackend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <kcfgfile name="cantorrc"/> <group name="KAlgebraBackend"> <entry name="autorunScripts" type="StringList"> diff --git a/src/backends/lua/cantor_lua.knsrc b/src/backends/lua/cantor_lua.knsrc index 9b627a4e..e5d81b5f 100644 --- a/src/backends/lua/cantor_lua.knsrc +++ b/src/backends/lua/cantor_lua.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Lua) TargetDir=cantor/examples diff --git a/src/backends/lua/luabackend.cpp b/src/backends/lua/luabackend.cpp index 4d1fe00a..aab64ddf 100644 --- a/src/backends/lua/luabackend.cpp +++ b/src/backends/lua/luabackend.cpp @@ -62,7 +62,7 @@ bool LuaBackend::requirementsFullfilled(QString* const reason) const QUrl LuaBackend::helpUrl() const { - return QUrl(i18nc("Lua official documentation", "http://www.lua.org/docs.html";)); + return QUrl(i18nc("Lua official documentation", "https://www.lua.org/docs.html";)); } QString LuaBackend::description() const diff --git a/src/backends/lua/luabackend.json b/src/backends/lua/luabackend.json index 70f92d86..99613c01 100644 --- a/src/backends/lua/luabackend.json +++ b/src/backends/lua/luabackend.json @@ -62,6 +62,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://luajit.org"; + "Website": "https://luajit.org"; } } diff --git a/src/backends/lua/luabackend.kcfg b/src/backends/lua/luabackend.kcfg index 60adb581..936398c6 100644 --- a/src/backends/lua/luabackend.kcfg +++ b/src/backends/lua/luabackend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <include>QStandardPaths</include> <kcfgfile name="cantorrc"/> <group name="LuaBackend"> diff --git a/src/backends/maxima/cantor_maxima.knsrc b/src/backends/maxima/cantor_maxima.knsrc index e30d69f5..76a8aa86 100644 --- a/src/backends/maxima/cantor_maxima.knsrc +++ b/src/backends/maxima/cantor_maxima.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Maxima) TargetDir=cantor/examples diff --git a/src/backends/maxima/maximabackend.kcfg b/src/backends/maxima/maximabackend.kcfg index 6c77fb51..3f9d56ab 100644 --- a/src/backends/maxima/maximabackend.kcfg +++ b/src/backends/maxima/maximabackend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <include>QStandardPaths</include> <kcfgfile name="cantorrc"/> <group name="MaximaBackend"> diff --git a/src/backends/octave/cantor_octave.knsrc b/src/backends/octave/cantor_octave.knsrc index 3ac33de5..019c147a 100644 --- a/src/backends/octave/cantor_octave.knsrc +++ b/src/backends/octave/cantor_octave.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Octave) TargetDir=cantor/examples diff --git a/src/backends/octave/octavebackend.cpp b/src/backends/octave/octavebackend.cpp index feb2b258..4f570ff6 100644 --- a/src/backends/octave/octavebackend.cpp +++ b/src/backends/octave/octavebackend.cpp @@ -74,7 +74,7 @@ QUrl OctaveBackend::helpUrl() const return localDoc; else return QUrl(i18nc("the url to the documentation of Octave, please check if there is a translated version (currently Czech and Japanese) and use the correct url", - "http://www.gnu.org/software/octave/doc/interpreter/";)); + "https://octave.org/doc/interpreter/";)); } QString OctaveBackend::description() const diff --git a/src/backends/octave/octavebackend.json b/src/backends/octave/octavebackend.json index 8f972298..170a1634 100644 --- a/src/backends/octave/octavebackend.json +++ b/src/backends/octave/octavebackend.json @@ -62,6 +62,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://www.octave.org/"; + "Website": "https://www.gnu.org/software/octave/"; } } diff --git a/src/backends/octave/octavebackend.kcfg b/src/backends/octave/octavebackend.kcfg index da9b14d9..f5cb46f7 100644 --- a/src/backends/octave/octavebackend.kcfg +++ b/src/backends/octave/octavebackend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <include>QStandardPaths</include> <kcfgfile name="cantorrc"/> <group name="OctaveBackend"> diff --git a/src/backends/python2/cantor_python2.knsrc b/src/backends/python2/cantor_python2.knsrc index 9cf08144..aef132c5 100644 --- a/src/backends/python2/cantor_python2.knsrc +++ b/src/backends/python2/cantor_python2.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Python2) TargetDir=cantor/examples diff --git a/src/backends/python2/python2backend.cpp b/src/backends/python2/python2backend.cpp index 3dbf6a36..f658e3df 100644 --- a/src/backends/python2/python2backend.cpp +++ b/src/backends/python2/python2backend.cpp @@ -71,7 +71,7 @@ QUrl Python2Backend::helpUrl() const if (!localDoc.isEmpty()) return localDoc; else - return QUrl(i18nc("The url to the documentation Python 2", "http://docs.python.org/2/";)); + return QUrl(i18nc("The url to the documentation Python 2", "https://docs.python.org/2/";)); } QString Python2Backend::description() const diff --git a/src/backends/python2/python2backend.json b/src/backends/python2/python2backend.json index cf7481ec..16424d74 100644 --- a/src/backends/python2/python2backend.json +++ b/src/backends/python2/python2backend.json @@ -62,6 +62,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://python.org/"; + "Website": "https://python.org/"; } } diff --git a/src/backends/python2/python2backend.kcfg b/src/backends/python2/python2backend.kcfg index 12afafd9..3b914afb 100644 --- a/src/backends/python2/python2backend.kcfg +++ b/src/backends/python2/python2backend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <kcfgfile name="cantorrc"/> <group name="Python2Backend"> <entry name="localDoc" type="Url"> diff --git a/src/backends/python3/cantor_python3.knsrc b/src/backends/python3/cantor_python3.knsrc index 0127e295..efd4b3b1 100644 --- a/src/backends/python3/cantor_python3.knsrc +++ b/src/backends/python3/cantor_python3.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Python3) TargetDir=cantor/examples diff --git a/src/backends/python3/python3backend.cpp b/src/backends/python3/python3backend.cpp index 4576012a..7fd9e91e 100644 --- a/src/backends/python3/python3backend.cpp +++ b/src/backends/python3/python3backend.cpp @@ -67,7 +67,7 @@ QUrl Python3Backend::helpUrl() const if (!localDoc.isEmpty()) return localDoc; else - return QUrl(i18nc("The url to the documentation Python 3", "http://docs.python.org/3/";)); + return QUrl(i18nc("The url to the documentation Python 3", "https://docs.python.org/3/";)); } QString Python3Backend::description() const diff --git a/src/backends/python3/python3backend.json b/src/backends/python3/python3backend.json index 666791f6..efaec55b 100644 --- a/src/backends/python3/python3backend.json +++ b/src/backends/python3/python3backend.json @@ -62,6 +62,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://python.org/"; + "Website": "https://python.org/"; } } diff --git a/src/backends/python3/python3backend.kcfg b/src/backends/python3/python3backend.kcfg index 4e9e6daa..b4716ef6 100644 --- a/src/backends/python3/python3backend.kcfg +++ b/src/backends/python3/python3backend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <kcfgfile name="cantorrc"/> <group name="Python3Backend"> <entry name="localDoc" type="Url"> diff --git a/src/backends/qalculate/cantor_qalculate.knsrc b/src/backends/qalculate/cantor_qalculate.knsrc index b14c01dc..b885f8e8 100644 --- a/src/backends/qalculate/cantor_qalculate.knsrc +++ b/src/backends/qalculate/cantor_qalculate.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Qalculate) TargetDir=cantor/examples diff --git a/src/backends/qalculate/qalculatebackend.cpp b/src/backends/qalculate/qalculatebackend.cpp index 88bf5ab8..e34a0db9 100644 --- a/src/backends/qalculate/qalculatebackend.cpp +++ b/src/backends/qalculate/qalculatebackend.cpp @@ -68,7 +68,7 @@ QString QalculateBackend::description() const QUrl QalculateBackend::helpUrl() const { // A sub-optimal solution but still this manual is fairly complete - return QUrl(QString::fromLatin1("http://qalculate.sourceforge.net/gtk-manual/index.html";)); + return QUrl(QString::fromLatin1("https://qalculate.github.io/manual/index.html";)); } KConfigSkeleton* QalculateBackend::config() const diff --git a/src/backends/qalculate/qalculatebackend.json b/src/backends/qalculate/qalculatebackend.json index 5d24ab96..a12c312a 100644 --- a/src/backends/qalculate/qalculatebackend.json +++ b/src/backends/qalculate/qalculatebackend.json @@ -62,6 +62,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://qalculate.sourceforge.net/"; + "Website": "https://qalculate.github.io/"; } } diff --git a/src/backends/qalculate/qalculatebackend.kcfg b/src/backends/qalculate/qalculatebackend.kcfg index 5a52788d..1eafaedd 100644 --- a/src/backends/qalculate/qalculatebackend.kcfg +++ b/src/backends/qalculate/qalculatebackend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <kcfgfile name="cantorrc"/> <group name="QalculateBackend"> <entry name="postConversion" type="Bool"> diff --git a/src/backends/sage/cantor_sage.knsrc b/src/backends/sage/cantor_sage.knsrc index cd6715a8..2f5b5f20 100644 --- a/src/backends/sage/cantor_sage.knsrc +++ b/src/backends/sage/cantor_sage.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Sage) TargetDir=cantor/examples diff --git a/src/backends/sage/sagebackend.cpp b/src/backends/sage/sagebackend.cpp index dbc05669..6b4259a2 100644 --- a/src/backends/sage/sagebackend.cpp +++ b/src/backends/sage/sagebackend.cpp @@ -91,7 +91,7 @@ QUrl SageBackend::helpUrl() const return localDoc; else return QUrl(i18nc("the url to the documentation of Sage, please check if there is a translated version and use the correct url", - "http://www.sagemath.org/doc/reference/index.html";)); + "http://doc.sagemath.org/html/en/reference/index.html";)); } QString SageBackend::description() const diff --git a/src/backends/sage/sagebackend.json b/src/backends/sage/sagebackend.json index 3e979aba..ca35c887 100644 --- a/src/backends/sage/sagebackend.json +++ b/src/backends/sage/sagebackend.json @@ -62,6 +62,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://www.sagemath.org/"; + "Website": "https://www.sagemath.org/"; } } diff --git a/src/backends/sage/sagebackend.kcfg b/src/backends/sage/sagebackend.kcfg index efb5bfa7..29ff2108 100644 --- a/src/backends/sage/sagebackend.kcfg +++ b/src/backends/sage/sagebackend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <include>QStandardPaths</include> <kcfgfile name="cantorrc"/> <group name="SageBackend"> diff --git a/src/backends/sage/sagekeywords.h b/src/backends/sage/sagekeywords.h index 229114ca..7b5b144a 100644 --- a/src/backends/sage/sagekeywords.h +++ b/src/backends/sage/sagekeywords.h @@ -6,7 +6,7 @@ published by the Free Software Foundation; either version 2 of the License or (at your option) version 3 or any later version accepted by the membership of KDE e.V. (or its successor approved - by the membership of KDE e.V.), which shall act as a proxy + by the membership of KDE e.V.), which shall act as a proxy defined in Section 14 of version 3 of the license. This program is distributed in the hope that it will be useful, @@ -15,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. + along with this program. If not, see <https://www.gnu.org/licenses/>. */ #ifndef _SAGEKEYWORDS_H diff --git a/src/backends/scilab/cantor_scilab.knsrc b/src/backends/scilab/cantor_scilab.knsrc index 8ef05644..35e4bd6a 100644 --- a/src/backends/scilab/cantor_scilab.knsrc +++ b/src/backends/scilab/cantor_scilab.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Scilab) TargetDir=cantor/examples diff --git a/src/backends/scilab/scilabbackend.cpp b/src/backends/scilab/scilabbackend.cpp index a6de985b..19ad775c 100644 --- a/src/backends/scilab/scilabbackend.cpp +++ b/src/backends/scilab/scilabbackend.cpp @@ -82,7 +82,7 @@ KConfigSkeleton* ScilabBackend::config() const QUrl ScilabBackend::helpUrl() const { return QUrl(i18nc("The url to the documentation of Scilab, please check if there is a translated version and use the correct url", - "http://www.scilab.org/support/documentation";)); + "https://www.scilab.org/support/documentation";)); } QString ScilabBackend::description() const diff --git a/src/backends/scilab/scilabbackend.json b/src/backends/scilab/scilabbackend.json index eedd5cc7..9b0dfb41 100644 --- a/src/backends/scilab/scilabbackend.json +++ b/src/backends/scilab/scilabbackend.json @@ -61,6 +61,6 @@ "ServiceTypes": [ "Cantor/Backend" ], - "Website": "http://scilab.org/"; + "Website": "https://scilab.org/"; } } diff --git a/src/backends/scilab/scilabbackend.kcfg b/src/backends/scilab/scilabbackend.kcfg index a502e795..2330819f 100644 --- a/src/backends/scilab/scilabbackend.kcfg +++ b/src/backends/scilab/scilabbackend.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <include>QStandardPaths</include> <kcfgfile name="cantorrc"/> <group name="ScilabBackend"> diff --git a/src/cantor.cpp b/src/cantor.cpp index f7532e6e..f1bd2b72 100644 --- a/src/cantor.cpp +++ b/src/cantor.cpp @@ -230,8 +230,7 @@ void CantorShell::fileOpen() if (url.isEmpty() == false) { - // About this function, the style guide ( - // http://developer.kde.org/documentation/standards/kde/style/basics/index.html ) + // About this function, the style guide // says that it should open a new window if the document is _not_ // in its initial state. This is what we do here.. /*if ( m_part->url().isEmpty() && ! m_part->isModified() ) diff --git a/src/cantor.kcfg b/src/cantor.kcfg index 654bada1..44559d01 100644 --- a/src/cantor.kcfg +++ b/src/cantor.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <include>cantor_export.h</include> <kcfgfile/> <group name="Cantor"> diff --git a/src/cantor.knsrc b/src/cantor.knsrc index 2ffc29f8..a5dcb85b 100644 --- a/src/cantor.knsrc +++ b/src/cantor.knsrc @@ -1,5 +1,5 @@ [KNewStuff3] -ProvidersUrl=http://download.kde.org/ocs/providers.xml +ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml Categories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) UploadCategories=Cantor (Maxima),Cantor (Sage),Cantor (KAlgebra),Cantor (Qalculate),Cantor (Python 2),Cantor (Python 3),Cantor (Scilab),Cantor (Octave),Cantor (R),Cantor (Lua) TargetDir=cantor/examples diff --git a/src/cantor_part.cpp b/src/cantor_part.cpp index ee11eecd..9dd63870 100644 --- a/src/cantor_part.cpp +++ b/src/cantor_part.cpp @@ -408,7 +408,7 @@ KAboutData& CantorPart::createAboutData() KAboutLicense::GPL, i18n("(C) 2009-2015 Alexander Rieder"), QString(), - QLatin1String("http://edu.kde.org/cantor";)); + QLatin1String("https://edu.kde.org/cantor/";)); about.addAuthor( i18n("Alexander Rieder"), QString(), QLatin1String("[email protected]") ); return about; diff --git a/src/lib/backend.h b/src/lib/backend.h index 680912e1..fed8568a 100644 --- a/src/lib/backend.h +++ b/src/lib/backend.h @@ -146,7 +146,7 @@ class CANTOR_EXPORT Backend : public QObject, public KXMLGUIClient * The method should be overwritten by all Backends(who have an online help) * You should make the returned Url translatable, e.g. by doing something like: * return i18nc("the url to the documentation of KAlgebra, please check if there is a translated version and use the correct url", - * "http://docs.kde.org/stable/en/kdeedu/kalgebra/";); + * "https://docs.kde.org/stable5/en/kdeedu/kalgebra/index.html";); * @return Url of the help */ virtual QUrl helpUrl() const = 0; diff --git a/src/lib/cantor_libs.kcfg b/src/lib/cantor_libs.kcfg index 2e396a91..ca93fcfd 100644 --- a/src/lib/cantor_libs.kcfg +++ b/src/lib/cantor_libs.kcfg @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 - http://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > +<kcfg xmlns="https://www.kde.org/standards/kcfg/1.0"; + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="https://www.kde.org/standards/kcfg/1.0 + https://www.kde.org/standards/kcfg/1.0/kcfg.xsd"; > <include>QStandardPaths</include> <kcfgfile/> <group name="Cantor"> diff --git a/src/main.cpp b/src/main.cpp index dbf31d74..129a866f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -84,10 +84,9 @@ int main(int argc, char **argv) KAboutLicense::GPL, i18n("(C) 2016 Filipe Saraiva<br/>(C) 2009-2015 Alexander Rieder"), QString(), - QLatin1String("http://edu.kde.org/cantor";)); + QLatin1String("https://edu.kde.org/cantor/";)); - about.addAuthor( i18n("Filipe Saraiva"), i18n("Maintainer<br/>Qt5/KF5 port, Scilab and Python backends"), QLatin1String("[email protected]"), - QLatin1String("http://filipesaraiva.info/";) ); + about.addAuthor( i18n("Filipe Saraiva"), i18n("Maintainer<br/>Qt5/KF5 port, Scilab and Python backends"), QLatin1String("[email protected]") ); about.addAuthor( i18n("Nikita Sirgienko"), i18nc("@info:credit", "Developer"), QLatin1String("[email protected]>")); about.addAuthor( i18n("Alexander Semke"), i18nc("@info:credit", "Developer"), QLatin1String("[email protected]")); about.addAuthor( i18n("Alexander Rieder"), i18n("Original author<br/>Maintainer (2009 - 2015)"), QLatin1String("[email protected]") ); @@ -96,8 +95,7 @@ int main(int argc, char **argv) about.addAuthor( i18n("Martin Küttler"), i18n("Interface"), QLatin1String("[email protected]") ); about.addCredit(QLatin1String("Andreas Kainz"), i18n("Cantor icon"), QLatin1String("[email protected]")); - about.addCredit(QLatin1String("Uri Herrera"), i18n("Cantor icon"), QLatin1String("[email protected]"), - QLatin1String("http://nitrux.in/";)); + about.addCredit(QLatin1String("Uri Herrera"), i18n("Cantor icon"), QLatin1String("[email protected]")); QCommandLineParser parser; KAboutData::setApplicationData(about); diff --git a/src/xslt/latex.xsl b/src/xslt/latex.xsl index 5b38f0dc..25e2bc14 100644 --- a/src/xslt/latex.xsl +++ b/src/xslt/latex.xsl @@ -1,4 +1,4 @@ -<xsl:stylesheet version = "1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";> +<xsl:stylesheet version = "1.0" xmlns:xsl="https://www.w3.org/1999/XSL/Transform";> <xsl:output method = "text"/> <xsl:strip-space elements = "*"/>
