Commit c4eb1136 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Use URLs with transport encryption, update some links, remove dead links

parent ca994550
......@@ -32,14 +32,14 @@
<!-- You can still appendfurther html and Marble-specific html attributes here: -->
<p>
<a href="http://en.wikipedia.org/wiki/Martin_Behaim"><img src="./legend/Martin_Behaim.jpg"></a>
<a href="https://en.wikipedia.org/wiki/Martin_Behaim"><img src="./legend/Martin_Behaim.jpg"></a>
</p>
<p><a href="http://en.wikipedia.org/wiki/Martin_Behaim">Martin Behaim</a> and collaborators created the globe at the time of <a href="http://en.wikipedia.org/wiki/Christopher_Columbus">Columbus</a>' first sea travel to the west.
<p><a href="https://en.wikipedia.org/wiki/Martin_Behaim">Martin Behaim</a> and collaborators created the globe at the time of <a href="https://en.wikipedia.org/wiki/Christopher_Columbus">Columbus</a>' first sea travel to the west.
<p>So the American continent is missing on this globe. Also note the detailed inscriptions in early modern German. The overall design of the map image follows the Ptolemaic tradition where the circumference of the earth is 5/7 of the actual value (40075 km).
</p>
<p><strong>Recommended Links:</strong>
<ul>
<li><a href="http://www.gnm.de/index.php?id=181">Digitalization of the Behaim Globe in 2011</a> (German)
<li><a href="https://www.gnm.de/index.php?id=181">Digitalization of the Behaim Globe in 2011</a> (German)
<li><a href="http://wisski.cs.fau.de/behaim/">Wisski Portal </a> (German)
<li><a href="http://www8.informatik.uni-erlangen.de/IMMD8/staff/Goerz/behaim-icom2010-nofoot-images.pdf">Semantic Annotation for Medieval Cartography:</a> The Example of the Behaim Globe of 1492
<li><a href="http://wisski.cs.fau.de/behaim/sites/default/files/poussami.3D-Modellierung_Behaim-Globus_Marble.pdf">3D-Modellierung des Behaim-Globus mit Marble (PDF)</a> (German)
......@@ -49,7 +49,7 @@
<hr>
<p>
<i><small>
Copyright: <a href="http://www.gnm.de/en">Germanisches Nationalmuseum</a> / <a href="http://www.ipf.tuwien.ac.at">IPF TU Wien</a></small></i>
Copyright: <a href="https://www.gnm.de/en">Germanisches Nationalmuseum</a> / <a href="https://www.geo.tuwien.ac.at/">IPF TU Wien</a></small></i>
<br><i>License: <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a></i>
<br>
</body>
This diff is collapsed.
......@@ -8,7 +8,7 @@
<name>Luna 2</name>
<visibility>0</visibility>
<description><![CDATA[<p><b>1959-09-13: First spacecraft to reach the surface of the moon.</b></p>
<p>Luna 2 (E-1A series) was the second of the Soviet Union's Luna programme spacecraft launched to the Moon. It was the first man-made object to land on another celestial body. <a href="http://en.wikipedia.org/wiki/Luna_2">Read more at Wikipedia.</a></p>
<p>Luna 2 (E-1A series) was the second of the Soviet Union's Luna programme spacecraft launched to the Moon. It was the first man-made object to land on another celestial body. <a href="https://en.wikipedia.org/wiki/Luna_2">Read more at Wikipedia.</a></p>
<img src="http://files.kde.org/marble/tours/clementine/Luna_2_Soviet_moon_probe.jpg" />
]]></description>
<role>i</role>
......@@ -20,7 +20,7 @@
<name>Apollo 11</name>
<visibility>0</visibility>
<description><![CDATA[<p><b>1969-07-21: First manned lunar landing mission</b></p>
<p>Apollo 11 was the spaceflight that landed the first humans on the Moon, Americans Neil Armstrong and Buzz Aldrin, on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface six hours later on July 21 at 02:56 UTC. <a href="http://en.wikipedia.org/wiki/Apollo_11">Read more at Wikipedia.</a></p>
<p>Apollo 11 was the spaceflight that landed the first humans on the Moon, Americans Neil Armstrong and Buzz Aldrin, on July 20, 1969, at 20:18 UTC. Armstrong became the first to step onto the lunar surface six hours later on July 21 at 02:56 UTC. <a href="https://en.wikipedia.org/wiki/Apollo_11">Read more at Wikipedia.</a></p>
<img src="http://files.kde.org/marble/tours/clementine/306px-Apollo_11.jpg" />
]]></description>
<role>h</role>
......@@ -31,7 +31,7 @@
<Placemark id="change3">
<name>Chang'e 3</name>
<visibility>0</visibility>
<description><![CDATA[<p><b>2013-12-14: First Chinese soft-landing</b> Chang'e 3 achieved lunar orbit on 6 December 2013 and landed on 14 December 2013, becoming the first probe in 37 years to soft-land on the Moon since Luna 24 in 1976. <a href="http://en.wikipedia.org/wiki/Chang%27e_3">Read more at Wikipedia.</a></p>]]></description>
<description><![CDATA[<p><b>2013-12-14: First Chinese soft-landing</b> Chang'e 3 achieved lunar orbit on 6 December 2013 and landed on 14 December 2013, becoming the first probe in 37 years to soft-land on the Moon since Luna 24 in 1976. <a href="https://en.wikipedia.org/wiki/Chang%27e_3">Read more at Wikipedia.</a></p>]]></description>
<role>u</role>
<Point>
<coordinates>-19.51,44.12</coordinates>
......
......@@ -154,7 +154,7 @@
</listitem>
<listitem>
<para>
<guilabel>Satellite View</guilabel>: Earth as seen from Space. The map is based on NASA's beautiful <ulink url="http://earthobservatory.nasa.gov/Features/BlueMarble/">Blue &marble; Next Generation</ulink> pictures. Credits: NASA’s Earth Observatory
<guilabel>Satellite View</guilabel>: Earth as seen from Space. The map is based on NASA's beautiful <ulink url="https://earthobservatory.nasa.gov/Features/BlueMarble/">Blue &marble; Next Generation</ulink> pictures. Credits: NASA’s Earth Observatory
</para>
</listitem>
<listitem>
......@@ -204,7 +204,7 @@
<title>Searching places using &marble;</title>
<para>
&marble; comes with a small database of more than 12,000 cities ( from
<ulink url="http://www.worldgazetteer.com"/> ) and a few mountains and volcanoes.
<ulink url="https://www.populationdata.net/monde/"/> ) and a few mountains and volcanoes.
You can find a location by entering its name into the search line on the
top of the toolbox (&marble; always uses the native name in Latin letters). As you start
typing, suggestions below the search line will appear like this:
......@@ -224,11 +224,11 @@
<itemizedlist>
<listitem>
<para>Nominatim: An online search and reverse geocoding service, using data from
<ulink url="http://www.openstreetmap.org"/></para>
<ulink url="https://www.openstreetmap.org"/></para>
</listitem>
<listitem>
<para>HostIP: A reverse geocoding based on IP address, using data from
<ulink url="http://www.hostip.info"/></para>
<ulink url="https://www.hostip.info"/></para>
</listitem>
</itemizedlist>
......@@ -349,7 +349,7 @@
<listitem>
<para>MapQuest: An online router which provides advanced turn-by-turn instructions</para>
<note>
<para>An AppKey is required for MapQuest routing to work. You can register the AppKey <ulink url="http://developer.mapquest.com/web/products/open">here</ulink>.</para>
<para>An AppKey is required for MapQuest routing to work. You can register the AppKey <ulink url="https://developer.mapquest.com/plan_purchase/steps/business_edition/business_edition_free/register">here</ulink>.</para>
</note>
</listitem>
<listitem>
......@@ -530,7 +530,7 @@
<sect2 id="recording-movie-troubleshooting">
<title>Troubleshooting</title>
<para>
There may appear an error message because avconv or ffmpeg are not installed. Download from <ulink url="http://ffmpeg.org/download.html">ffmpeg's downloads page</ulink> and <ulink url="https://libav.org/download.html">avconv's downloads page</ulink> or use packages from your distribution.
There may appear an error message because avconv or ffmpeg are not installed. Download from <ulink url="https://ffmpeg.org/download.html">ffmpeg's downloads page</ulink> and <ulink url="https://libav.org/download.html">avconv's downloads page</ulink> or use packages from your distribution.
</para>
</sect2>
</sect1>
......@@ -1051,7 +1051,7 @@ If a GPS device is connected with your computer, &marble; displays longitude and
<varlistentry>
<term><guilabel>Time Zone</guilabel></term>
<listitem>
<para>Here, you can choose a time zone for &marble;: <ulink url="http://en.wikipedia.org/wiki/Coordinated_Universal_Time">UTC</ulink>, system time zone or choose custom time zone. The chosen option changes the map view only if the map can show the light conditions on the surface.</para>
<para>Here, you can choose a time zone for &marble;: <ulink url="https://en.wikipedia.org/wiki/Coordinated_Universal_Time">UTC</ulink>, system time zone or choose custom time zone. The chosen option changes the map view only if the map can show the light conditions on the surface.</para>
</listitem>
</varlistentry>
......@@ -1264,7 +1264,7 @@ url="https://owncloud.com/">ownClowd official website</ulink>.</para>
<varlistentry>
<term><guilabel>GpsInfo</guilabel></term>
<listitem>
<para>Displays a float item that provides <ulink url="http://en.wikipedia.org/wiki/Global_Positioning_System">GPS</ulink> information.</para>
<para>Displays a float item that provides <ulink url="https://en.wikipedia.org/wiki/Global_Positioning_System">GPS</ulink> information.</para>
</listitem>
</varlistentry>
......@@ -1293,14 +1293,14 @@ url="https://owncloud.com/">ownClowd official website</ulink>.</para>
<varlistentry>
<term><guilabel>OpenCaching.com</guilabel></term>
<listitem>
<para>Displays the <ulink url="http://en.wikipedia.org/wiki/Geocaching">geocaching</ulink> markers on the map.</para>
<para>Displays the <ulink url="https://en.wikipedia.org/wiki/Geocaching">geocaching</ulink> markers on the map.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><guilabel>OpenDesktop Items</guilabel></term>
<listitem>
<para>Shows <ulink url="http://opendesktop.org/">OpenDesktop</ulink> users' avatars and some extra information about them on the map.</para>
<para>Shows <ulink url="https://opendesktop.org/">OpenDesktop</ulink> users' avatars and some extra information about them on the map.</para>
</listitem>
</varlistentry>
......@@ -1328,14 +1328,14 @@ url="https://owncloud.com/">ownClowd official website</ulink>.</para>
<varlistentry>
<term><guilabel>Position Marker</guilabel></term>
<listitem>
<para>Draws a marker at the current <ulink url="http://en.wikipedia.org/wiki/Global_Positioning_System">GPS</ulink> position.</para>
<para>Draws a marker at the current <ulink url="https://en.wikipedia.org/wiki/Global_Positioning_System">GPS</ulink> position.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><guilabel>Postal Codes</guilabel></term>
<listitem>
<para>Shows <ulink url="http://en.wikipedia.org/wiki/Postal_code">postal codes</ulink> of the area on the map.</para>
<para>Shows <ulink url="https://en.wikipedia.org/wiki/Postal_code">postal codes</ulink> of the area on the map.</para>
</listitem>
</varlistentry>
......@@ -1363,7 +1363,7 @@ url="https://owncloud.com/">ownClowd official website</ulink>.</para>
<varlistentry>
<term><guilabel>Speedometer</guilabel></term>
<listitem>
<para>Displays the current cruising speed. Needs some <ulink url="http://en.wikipedia.org/wiki/Global_Positioning_System">GPS</ulink> data.</para>
<para>Displays the current cruising speed. Needs some <ulink url="https://en.wikipedia.org/wiki/Global_Positioning_System">GPS</ulink> data.</para>
</listitem>
</varlistentry>
......@@ -1439,7 +1439,7 @@ url="https://owncloud.com/">ownClowd official website</ulink>.</para>
<answer>
<para>
No, never. But the authors always welcome feedback. &marble; is licensed
under the <ulink url="http://www.gnu.org/licenses/licenses.html#LGPL">LGPL</ulink>, so you will never have to pay for this program.
under the <ulink url="https://www.gnu.org/licenses/licenses.html#LGPL">LGPL</ulink>, so you will never have to pay for this program.
</para>
</answer>
</qandaentry>
......@@ -1493,7 +1493,7 @@ url="https://owncloud.com/">ownClowd official website</ulink>.</para>
<para>
&marble; itself can be found on the <ulink
url="http://marble.kde.org">&marble; website</ulink> and
url="https://marble.kde.org">&marble; website</ulink> and
is part of the &kde;-Edu project</para>
<para>You can find a list of changes in the file
......@@ -1506,7 +1506,7 @@ url="https://owncloud.com/">ownClowd official website</ulink>.</para>
<para>
&marble; can be compiled as a &Qt; 5-only version as well as featuring &kde; &frameworks; 5 usage.
To compile &marble; with &Qt; 5-only support check out &marble; from its &kde; Git repository into ~/marble and just do: <command>cmake -DWITH_KF5=FALSE ~/marble</command> and <command>sudo make install</command>. To compile &marble; with &kde; &frameworks; 5 usage check instructions on how to compile &kde; applications at <ulink url="http://techbase.kde.org/">&kde;'s TechBase</ulink>.
To compile &marble; with &Qt; 5-only support check out &marble; from its &kde; Git repository into ~/marble and just do: <command>cmake -DWITH_KF5=FALSE ~/marble</command> and <command>sudo make install</command>. To compile &marble; with &kde; &frameworks; 5 usage check instructions on how to compile &kde; applications at <ulink url="https://techbase.kde.org/">&kde;'s TechBase</ulink>.
</para>
</sect1>
......
See http://techbase.kde.org/Projects/Marble/FAQ
See https://techbase.kde.org/Projects/Marble/FAQ
......@@ -39,7 +39,7 @@ BookmarkManagerPrivate::BookmarkManagerPrivate( GeoDataTreeModel *treeModel ) :
BookmarkManagerPrivate::~BookmarkManagerPrivate()
{
Q_ASSERT( m_bookmarkDocument && "BookmarkManagerPrivate::m_bookmarkDocument is 0. Please report a Marble bug at http://bugs.kde.org" );
Q_ASSERT( m_bookmarkDocument && "BookmarkManagerPrivate::m_bookmarkDocument is 0. Please report a Marble bug at https://bugs.kde.org" );
if ( m_bookmarkDocument )
{
m_treeModel->removeDocument( m_bookmarkDocument );
......@@ -122,7 +122,7 @@ bool BookmarkManager::loadFile( const QString &relativeFilePath )
d->resetBookmarkDocument();
updateBookmarkFile();
} else {
Q_ASSERT( d->m_bookmarkDocument && "d->m_bookmarkDocument is 0 but must not be. Please report a bug at http://bugs.kde.org" );
Q_ASSERT( d->m_bookmarkDocument && "d->m_bookmarkDocument is 0 but must not be. Please report a bug at https://bugs.kde.org" );
d->m_treeModel->addDocument( d->m_bookmarkDocument );
}
ensureDefaultFolder();
......
......@@ -261,8 +261,8 @@ void CurrentLocationWidgetPrivate::receiveGpsCoordinates( const GeoDataCoordinat
QString html = QLatin1String("<html><body>"
"<table cellspacing=\"2\" cellpadding=\"2\">"
"<tr><td>Longitude</td><td><a href=\"http://edu.kde.org/marble\">%1</a></td></tr>"
"<tr><td>Latitude</td><td><a href=\"http://edu.kde.org/marble\">%2</a></td></tr>"
"<tr><td>Longitude</td><td><a href=\"https://edu.kde.org/marble\">%1</a></td></tr>"
"<tr><td>Latitude</td><td><a href=\"https://edu.kde.org/marble\">%2</a></td></tr>"
"<tr><td>Altitude</td><td>%3</td></tr>"
"<tr><td>Speed</td><td>%4</td></tr>"
"<tr><td>Distance</td><td>%5</td></tr>"
......
......@@ -19,7 +19,7 @@ namespace Marble {
/**
* A class for parsing Geo: URIs.
* Wikipage: http://en.wikipedia.org/wiki/Geo_URI
* Wikipage: https://en.wikipedia.org/wiki/Geo_URI
* RFC: 5870 (8 June 2010)
*/
class MARBLE_EXPORT GeoUriParser {
......
......@@ -215,7 +215,7 @@ QVariant TargetModel::bookmarkData ( int index, int role ) const
switch( role ) {
case Qt::DisplayRole: {
const GeoDataFolder *folder = geodata_cast<GeoDataFolder>(m_bookmarks[index]->parent());
Q_ASSERT( folder && "Internal bookmark representation has changed. Please report this as a bug at http://bugs.kde.org." );
Q_ASSERT( folder && "Internal bookmark representation has changed. Please report this as a bug at https://bugs.kde.org." );
if ( folder ) {
return QString(folder->name() + QLatin1String(" / ") + m_bookmarks[index]->name());
}
......
......@@ -286,8 +286,8 @@ void MarbleAboutDialogPrivate::loadPageContents( int idx )
"Data courtesy Marc Imhoff of NASA GSFC and Christopher Elvidge of NOAA NGDC. "
"Image by Craig Mayhew and Robert Simmon, NASA GSFC.</p>")+
QObject::tr("<p><i>Shuttle Radar Topography Mission (SRTM30, 1 km / pixel )</i><br />"
"NASA Jet Propulsion Laboratory <a href=\"http://www2.jpl.nasa.gov/srtm/\">"
"http://www2.jpl.nasa.gov/srtm/</a></p>")+
"NASA Jet Propulsion Laboratory <a href=\"https://www2.jpl.nasa.gov/srtm/\">"
"https://www2.jpl.nasa.gov/srtm/</a></p>")+
QObject::tr("<p><i>Micro World Data Bank in Polygons (\"MWDB-POLY / MWDBII\")</i><br />"
"CIA ; Global Associates, Ltd.; Fred Pospeschil and Antonio Rivera</p>")+
QObject::tr("<p><i>Temperature and Precipitation Maps (July and December)</i><br />"
......@@ -300,62 +300,62 @@ void MarbleAboutDialogPrivate::loadPageContents( int idx )
"http://www.ngdc.noaa.gov/ecosys/cdroms/ged_iia/datasets/a04/lw.htm</a></li>"
"<li>CRU CL 2.0: New, M., Lister, D., Hulme, M. and Makin, I., 2002: A high-resolution "
"data set of surface climate over global land areas. Climate Research 21."
"<a href=\"http://www.cru.uea.ac.uk/cru/data/hrg\">"
"http://www.cru.uea.ac.uk/cru/data/hrg</a></li></ul></p>")+
"<a href=\"https://crudata.uea.ac.uk/cru/data/hrg\">"
"https://crudata.uea.ac.uk/cru/data/hrg</a></li></ul></p>")+
QObject::tr("<b>Street Map</b>")+
QObject::tr("<p><i>OpenStreetMap</i><br />"
"The street maps used in Marble via download are provided by the <a href=\""
"http://www.openstreetmap.org\">OpenStreetMap</a> Project (\"OSM\"). "
"https://www.openstreetmap.org\">OpenStreetMap</a> Project (\"OSM\"). "
"OSM is an open community which creates free editable maps.<br />"
"<i>License</i>: OpenStreetMap data can be used freely under the terms of the "
"<a href=\"http://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
"<a href=\"https://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
"Creative Commons Attribution-ShareAlike 2.0 license</a>.</p>")+
QObject::tr( "<p><i>Icons</i><br />"
"Some icons are taken from <a href=\"http://www.sjjb.co.uk/mapicons\">SJJB Management</a> and <a href=\"http://thenounproject.com\">NounProject</a>. "
"Some icons are taken from <a href=\"https://www.sjjb.co.uk/mapicons\">SJJB Management</a> and <a href=\"https://thenounproject.com\">NounProject</a>. "
"These icons can be used freely under the terms of the "
"<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">CC0 1.0 Universal</a> license.</p>") +
QObject::tr( "<p>Some icons are taken from <a href=\"http://fortawesome.github.com/Font-Awesome\">Font Awesome</a>. "
"<a href=\"https://creativecommons.org/publicdomain/zero/1.0/\">CC0 1.0 Universal</a> license.</p>") +
QObject::tr( "<p>Some icons are taken from <a href=\"https://fortawesome.github.com/Font-Awesome\">Font Awesome</a>. "
"These icons can be used freely under the terms of the "
"<a href=\"http://creativecommons.org/licenses/by/3.0/\">CC BY 3.0</a> license.</p>") +
"<a href=\"https://creativecommons.org/licenses/by/3.0/\">CC BY 3.0</a> license.</p>") +
QObject::tr("<p><i>OpenRouteService</i><br />"
"Some of the routes used in Marble via download are provided by the <a href=\""
"http://www.openrouteservice.org\">OpenRouteService</a> Project (\"ORS\"). <br />"
"https://maps.openrouteservice.org\">OpenRouteService</a> Project (\"ORS\"). <br />"
"<i>License</i>: OpenRouteService data can be used freely under the terms of the "
"<a href=\"http://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
"<a href=\"https://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
"Creative Commons Attribution-ShareAlike 2.0 license</a>.</p>")+
QObject::tr("<p><i>Open Source Routing Machine</i><br />"
"Some of the routes used in Marble via download are provided by the <a href=\""
"http://project-osrm.org\">Open Source Routing Machine</a> Project (\"OSRM\"). <br />"
"<i>License</i>: Open Source Routing Machine data can be used freely under the terms of the "
"<a href=\"http://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
"<a href=\"https://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
"Creative Commons Attribution-ShareAlike 2.0 license</a>.</p>")+
QObject::tr("<p><i>MapQuest</i><br />"
"Some of the routes used in Marble via download are provided by <a href=\""
"http://www.mapquest.com/\">MapQuest</a> and their Open Data Map APIs and Web Services.<br />"
"https://www.mapquest.com/\">MapQuest</a> and their Open Data Map APIs and Web Services.<br />"
"Directions courtesy of MapQuest working on OpenStreetMap data that can be used freely under the terms of the "
"<a href=\"http://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
"<a href=\"https://wiki.openstreetmap.org/index.php/OpenStreetMap_License\">"
"Creative Commons Attribution-ShareAlike 2.0 license</a>. Usage of the MapQuest routing "
"service is subject to the <a href=\"http://info.mapquest.com/terms-of-use/\">MapQuest terms of use</a>.</p>")+
"service is subject to the <a href=\"https://info.mapquest.com/terms-of-use/\">MapQuest terms of use</a>.</p>")+
QObject::tr("<b>Cities and Locations</b>")+
QObject::tr("<p><i>World Gazetteer</i><br />Stefan Helders "
"<a href=\"http://www.world-gazetteer.com\">http://www.world-gazetteer.com</a></p>")+
QObject::tr("<p><i>Geonames.org</i><br />"
"<a href=\"http://www.geonames.org/\">http://www.geonames.org/</a>"
"<a href=\"https://www.geonames.org/\">https://www.geonames.org/</a>"
"<i>License</i>: Geonames.org data can be used freely under the terms of the "
"<a href=\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0 license</a>.</p>")+
"<a href=\"https://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution 3.0 license</a>.</p>")+
QObject::tr("<p><i>Czech Statistical Office</i><br />Public database "
"<a href=\"http://www.czso.cz/eng/redakce.nsf/i/home\">http://www.czso.cz</a></p>")+
"<a href=\"https://vdb.czso.cz/vdbvo2\">https://www.czso.cz</a></p>")+
QObject::tr("<b>Flags</b>")+
QObject::tr("<p><i>Flags of the World</i><br />The flags were taken from Wikipedia "
"(<a href=\"http://www.wikipedia.org\">http://www.wikipedia.org</a>) "
"which in turn took a subset from <a href=\"http://www.openclipart.org\">"
"http://www.openclipart.org</a> and reworked them. "
"(<a href=\"https://www.wikipedia.org\">https://www.wikipedia.org</a>) "
"which in turn took a subset from <a href=\"https://www.openclipart.org\">"
"https://www.openclipart.org</a> and reworked them. "
"All flags are under the public domain (see comments inside the svg files).</p>")+
QObject::tr("<b>Stars</b>")+
QObject::tr("<p><i>The Bright Star Catalogue</i><br />5th Revised Ed. (Preliminary Version) " // krazy:exclude=spelling
"Hoffleit D., Warren Jr W.H., Astronomical Data Center, NSSDC/ADC (1991)"
"<a href=\"http://adc.gsfc.nasa.gov/adc-cgi/cat.pl?/catalogs/5/5050\"> "
"http://adc.gsfc.nasa.gov</a></p>") );
"<a href=\"https://heasarc.gsfc.nasa.gov/W3Browse/star-catalog/bsc5p.html\"> "
"https://heasarc.gsfc.nasa.gov</a></p>") );
QTextFrameFormat format = browser->document()->rootFrame()->frameFormat();
format.setMargin(12);
browser->document()->rootFrame()->setFrameFormat( format );
......@@ -393,7 +393,7 @@ void MarbleAboutDialog::setApplicationTitle( const QString &title )
if( MarbleGlobal::getInstance()->profiles() & MarbleGlobal::SmallScreen ) {
text = titleHtml + QLatin1String("<br />") + applicationVersion + QLatin1String("<br />");
}
browser->setHtml( text + tr("<br />(c) 2007-%1 by the authors of Marble Virtual Globe<br /><br /><a href=\"http://edu.kde.org/marble\">http://edu.kde.org/marble</a>").arg( 2015 ) );
browser->setHtml( text + tr("<br />(c) 2007-%1 by the authors of Marble Virtual Globe<br /><br /><a href=\"https://edu.kde.org/marble\">https://edu.kde.org/marble</a>").arg( 2015 ) );
QTextFrameFormat format = browser->document()->rootFrame()->frameFormat();
format.setMargin(12);
browser->document()->rootFrame()->setFrameFormat( format );
......
......@@ -9,7 +9,7 @@
//
// Oxygen color definitions from
// http://lists.kde.org/?l=kde-artists&m=116559781726568&q=p3
// https://lists.kde.org/?l=kde-artists&m=116559781726568&q=p3
#ifndef MARBLECOLORS_H
#define MARBLECOLORS_H
......
......@@ -7,7 +7,7 @@
//
// The code in this file is largely based on KDE's KLineEdit class
// as included in KDE 4.5. See there for its authors:
// http://api.kde.org/4.x-api/kdelibs-apidocs/kdeui/html/klineedit_8cpp.html
// https://api.kde.org/4.x-api/kdelibs-apidocs/kdeui/html/klineedit_8cpp.html
//
// Copyright 2010,2012 Dennis Nienhüser <nienhueser@kde.org>
//
......
......@@ -7,7 +7,7 @@
//
// The code in this file is largely based on KDE's KLineEdit class
// as included in KDE 4.5. See there for its authors:
// http://api.kde.org/4.x-api/kdelibs-apidocs/kdeui/html/klineedit_8cpp.html
// https://api.kde.org/4.x-api/kdelibs-apidocs/kdeui/html/klineedit_8cpp.html
//
// Copyright 2010,2012 Dennis Nienhüser <nienhueser@kde.org>
//
......
......@@ -42,7 +42,7 @@ namespace Marble
/**
* @brief This method calculates the shortest distance between two points on a sphere.
* @brief See: http://en.wikipedia.org/wiki/Great-circle_distance
* @brief See: https://en.wikipedia.org/wiki/Great-circle_distance
* @param lon1 longitude of first point in radians
* @param lat1 latitude of first point in radians
* @param lon2 longitude of second point in radians
......@@ -62,7 +62,7 @@ inline qreal distanceSphere( qreal lon1, qreal lat1, qreal lon2, qreal lat2 ) {
* @brief This method roughly calculates the shortest distance between two points on a sphere.
* @brief It's probably faster than distanceSphere(...) but for 7 significant digits only has
* @brief an accuracy of about 1 arcmin.
* @brief See: http://en.wikipedia.org/wiki/Great-circle_distance
* @brief See: https://en.wikipedia.org/wiki/Great-circle_distance
*/
inline qreal distanceSphereApprox( qreal lon1, qreal lat1, qreal lon2, qreal lat2 ) {
return acos( sin( lat1 ) * sin( lat2 ) + cos( lat1 ) * cos( lat2 ) * cos( lon1 - lon2 ) );
......@@ -73,7 +73,7 @@ inline qreal distanceSphereApprox( qreal lon1, qreal lat1, qreal lon2, qreal lat
* @brief This method is a fast Mac Laurin power series approximation of the
* @brief inverse Gudermannian. The inverse Gudermannian gives the vertical
* @brief position y in the Mercator projection in terms of the latitude.
* @brief See: http://en.wikipedia.org/wiki/Mercator_projection
* @brief See: https://en.wikipedia.org/wiki/Mercator_projection
*/
inline qreal gdInv( qreal x ) {
const qreal x2 = x * x;
......@@ -91,7 +91,7 @@ inline qreal gdInv( qreal x ) {
* @brief This method is a fast Mac Laurin power series approximation of the
* Gudermannian. The Gudermannian gives the latitude
* in the Mercator projection in terms of the vertical position y.
* See: http://en.wikipedia.org/wiki/Mercator_projection
* See: https://en.wikipedia.org/wiki/Mercator_projection
*/
inline qreal gd( qreal x ) {
......
......@@ -59,7 +59,7 @@ void MarblePluginSettingsWidgetPrivate::showPluginAboutDialog( const QModelIndex
aboutDialog->setIcon( qvariant_cast<QIcon>( m_pluginModel->data( index, RenderPluginModel::Icon ) ) );
aboutDialog->setVersion( m_pluginModel->data( index, RenderPluginModel::Version ).toString() );
aboutDialog->setDataText( m_pluginModel->data( index, RenderPluginModel::AboutDataText ).toString() );
const QString copyrightText = QObject::tr( "<br/>(c) %1 The Marble Project<br /><br/><a href=\"http://edu.kde.org/marble\">http://edu.kde.org/marble</a>" );
const QString copyrightText = QObject::tr( "<br/>(c) %1 The Marble Project<br /><br/><a href=\"https://edu.kde.org/marble\">https://edu.kde.org/marble</a>" );
aboutDialog->setAboutText( copyrightText.arg( m_pluginModel->data( index, RenderPluginModel::CopyrightYears ).toString() ) );
aboutDialog->setAuthors( m_pluginModel->pluginAuthors( index ) );
......
......@@ -7,12 +7,12 @@
//
// This file is based on qzip.cpp from Qt with the original license
// below, taken from
// http://code.qt.io/cgit/qt/qt.git/plain/src/gui/text/qzip.cpp
// https://code.qt.io/cgit/qt/qt.git/plain/src/gui/text/qzip.cpp
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
**
......@@ -22,8 +22,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
......@@ -32,7 +32,7 @@
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
** https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
......@@ -44,7 +44,7 @@
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
** met: https://www.gnu.org/copyleft/gpl.html.
**
** $QT_END_LICENSE$
**
......
......@@ -7,13 +7,13 @@
//
// This file is based on qzipreader_p.h from Qt with the original license
// below, taken from
// http://code.qt.io/cgit/qt/qt.git/plain/src/gui/text/qzipreader_p.h
// https://code.qt.io/cgit/qt/qt.git/plain/src/gui/text/qzipreader_p.h
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
**
......@@ -23,8 +23,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
......@@ -33,7 +33,7 @@
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
** https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
......@@ -45,7 +45,7 @@
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
** met: https://www.gnu.org/copyleft/gpl.html.
**
** $QT_END_LICENSE$
**
......
......@@ -7,12 +7,12 @@
//
// This file is based on qzipwriter_p.h from Qt with the original license
// below, taken from
// http://code.qt.io/cgit/qt/qt.git/plain/src/gui/text/qzipwriter_p.h
// https://code.qt.io/cgit/qt/qt.git/plain/src/gui/text/qzipwriter_p.h
/****************************************************************************
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
** Contact: https://www.qt.io/licensing/
**
** This file is part of the QtGui module of the Qt Toolkit.
**
......@@ -22,8 +22,8 @@
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
......@@ -32,7 +32,7 @@
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
** https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
......@@ -44,7 +44,7 @@
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
** met: https://www.gnu.org/copyleft/gpl.html.
**
** $QT_END_LICENSE$
**
......
......@@ -43,7 +43,7 @@ Planet PlanetFactory::construct( const QString &id )
Planet planet;
planet.setId( id );
// constants taken from http://aa.quae.nl/en/reken/zonpositie.html
// constants taken from https://aa.quae.nl/en/reken/zonpositie.html
if (id == QLatin1String("mercury")) {
planet.setM_0( 174.7948*DEG2RAD );
......
......@@ -216,7 +216,7 @@ QUrl TmsServerLayout::downloadUrl( const QUrl &prototypeUrl, const TileId &id )
// y coordinate in TMS start at the bottom of the map (South) and go upwards,
// opposed to OSM which start at the top.
//
// http://wiki.osgeo.org/wiki/Tile_Map_Service_Specification
// https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification
int y_frombottom = ( 1<<id.zoomLevel() ) - id.y() - 1 ;
const QString path = QString( "%1/%2/%3.%4" ).arg( id.zoomLevel() )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment