[marble] /: Use URLs with transport encryption, update some links, remove dead links
Yuri Chornoivan
null at kde.org
Wed Dec 4 17:36:58 GMT 2019
Git commit c4eb1136b65a3474da2309172962b5f508ee5e57 by Yuri Chornoivan.
Committed on 04/12/2019 at 17:36.
Pushed by yurchor into branch 'master'.
Use URLs with transport encryption, update some links, remove dead links
M +4 -4 data/maps/earth/behaim1492/legend.html
M +56 -56 data/maps/earth/openstreetmap/tour.kml
M +3 -3 data/maps/moon/clementine/tour.kml
M +16 -16 doc/index.docbook
M +1 -1 docs/FAQ
M +2 -2 src/lib/marble/BookmarkManager.cpp
M +2 -2 src/lib/marble/CurrentLocationWidget.cpp
M +1 -1 src/lib/marble/GeoUriParser.h
M +1 -1 src/lib/marble/GoToDialog.cpp
M +25 -25 src/lib/marble/MarbleAboutDialog.cpp
M +1 -1 src/lib/marble/MarbleColors.h
M +1 -1 src/lib/marble/MarbleLineEdit.cpp
M +1 -1 src/lib/marble/MarbleLineEdit.h
M +4 -4 src/lib/marble/MarbleMath.h
M +1 -1 src/lib/marble/MarblePluginSettingsWidget.cpp
M +6 -6 src/lib/marble/MarbleZip.cpp
M +6 -6 src/lib/marble/MarbleZipReader.h
M +6 -6 src/lib/marble/MarbleZipWriter.h
M +1 -1 src/lib/marble/PlanetFactory.cpp
M +1 -1 src/lib/marble/ServerLayout.cpp
M +1 -1 src/lib/marble/StyleBuilder.cpp
M +2 -2 src/lib/marble/VectorTileModel.cpp
M +1 -1 src/lib/marble/ViewportParams.h
M +2 -2 src/lib/marble/geodata/data/GeoDataCoordinates.cpp
M +1 -1 src/lib/marble/geodata/data/GeoDataCoordinates.h
M +1 -1 src/lib/marble/routing/AlternativeRoutesModel.cpp
M +1 -1 src/lib/marble/routing/instructions/RoutingPoint.cpp
M +2 -2 src/lib/marble/routing/instructions/RoutingPoint.h
M +1 -1 src/plugins/render/graticule/GraticulePlugin.cpp
M +1 -1 src/plugins/render/satellites/SatellitesModel.cpp
M +1 -1 src/plugins/render/satellites/SatellitesModel.h
M +41 -42 src/plugins/render/satellites/SatellitesPlugin.cpp
M +1 -1 src/plugins/render/satellites/SatellitesTLEItem.cpp
M +9 -9 src/plugins/render/satellites/data/satellite.html
M +1 -1 src/plugins/runner/local-osm-search/OsmDatabase.cpp
M +1 -1 tools/gen-sat-catalog/gen-sat-catalog.py
M +1 -1 tools/mbtile-import/MbTileWriter.cpp
M +1 -1 tools/osm-addresses/OsmParser.cpp
M +2 -2 tools/speaker-files/main.cpp
M +6 -6 tools/vectorosm-tilecreator/clipper/clipper.cpp
M +5 -5 tools/vectorosm-tilecreator/clipper/clipper.hpp
https://commits.kde.org/marble/c4eb1136b65a3474da2309172962b5f508ee5e57
diff --git a/data/maps/earth/behaim1492/legend.html b/data/maps/earth/behaim1492/legend.html
index 2acb0df2b..29f977ecf 100644
--- a/data/maps/earth/behaim1492/legend.html
+++ b/data/maps/earth/behaim1492/legend.html
@@ -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>
diff --git a/data/maps/earth/openstreetmap/tour.kml b/data/maps/earth/openstreetmap/tour.kml
index 592381ca3..449834203 100644
--- a/data/maps/earth/openstreetmap/tour.kml
+++ b/data/maps/earth/openstreetmap/tour.kml
@@ -25,9 +25,9 @@
<p>This Dutch Baroque building was designed by Jacob Roman and Johan van Swieten.</p>
<p>The building is a state museum and is among the Top 100 Dutch heritage sites.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Palacehetloo.jpg#mediaviewer/File:Palacehetloo.jpg"><img src="Palace Het Loo.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Het_Loo_Palace">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Het_Loo_Palace">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Het_Loo_Palace">"Het Loo Palace"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Het_Loo_Palace">"Het Loo Palace"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
<IconStyle>
<Icon>
@@ -146,9 +146,9 @@
<p>The Nazca Lines are a series of ancient geoglyphs.</p>
<p>They were designated as a UNESCO World Heritage Site in 1994. </p>
<center><a href="http://commons.wikimedia.org/wiki/File:Nasca_Condor_2007_08.JPG#mediaviewer/File:Nasca_Condor_2007_08.JPG"><img src="Nazca Lines.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Nazca_Lines">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Nazca_Lines">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Nazca_Lines">"Nazca Lines"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Nazca_Lines">"Nazca Lines"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Nasca_Condor_2007_08.JPG#mediaviewer/File:Nasca_Condor_2007_08.JPG">Nasca Condor 2007 08</a>" by <a href="//commons.wikimedia.org/wiki/User:Zigomar" title="User:Zigomar">Raymond Ostertag</a> - <span class="int-own-work">Self-photographed</span>. Licensed under <a title="Creative Commons Attribution 3.0" href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -241,9 +241,9 @@
<p>Brasília is the federal capital of Brazil.</p>
<p>Brasília was planned and developed by Lúcio Costa and Oscar Niemeyer in 1956 in order to move the capital from Rio de Janeiro to a more central location.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Brasilia_aerea_eixo_monumental.jpg#mediaviewer/File:Brasilia_aerea_eixo_monumental.jpg"><img src="Brasilia.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Brasília">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Brasília">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Brasília">"Brasília"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Brasília">"Brasília"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Brasilia_aerea_eixo_monumental.jpg#mediaviewer/File:Brasilia_aerea_eixo_monumental.jpg">Brasilia aerea eixo monumental</a>" by Governo do Brasil - <a rel="nofollow" class="external text" href="http://www.copa2014.gov.br/pt-br/galeria">Portal da Copa</a>. Licensed under <a title="Creative Commons Attribution 3.0 br" href="http://creativecommons.org/licenses/by/3.0/br/deed.en">CC BY 3.0 br</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -345,9 +345,9 @@
<p>Spiral Jetty is an earthwork sculpture constructed in April 1970 by American sculptor Robert Smithson.</p>
<p>Smithson documented the construction of the sculpture in a 32-minute color film also titled Spiral Jetty.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Spiral-jetty-from-rozel-point.png#mediaviewer/File:Spiral-jetty-from-rozel-point.png"><img src="Spiral Jetty.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Spiral_Jetty">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Spiral_Jetty">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Spiral_Jetty">"Spiral Jetty"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Spiral_Jetty">"Spiral Jetty"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
<IconStyle>
<Icon>
@@ -448,9 +448,9 @@
<p>The Great Wall of China is a series of fortifications made of stone, brick, tamped earth, wood, and other materials.</p>
<p>Several walls were being built as early as the 7th century BC; these, later joined together and made bigger and stronger, are now collectively referred to as the Great Wall.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:The_Great_Wall_of_China_at_Jinshanling.jpg#mediaviewer/File:The_Great_Wall_of_China_at_Jinshanling.jpg"><img src="The Great Wall of China.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Great_Wall_of_China">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Great_Wall_of_China">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Great_Wall_of_China">"Great Wall of China"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Great_Wall_of_China">"Great Wall of China"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:The_Great_Wall_of_China_at_Jinshanling.jpg#mediaviewer/File:The_Great_Wall_of_China_at_Jinshanling.jpg">The Great Wall of China at Jinshanling</a>" by <a href="//commons.wikimedia.org/wiki/User:Severin.stalder" title="User:Severin.stalder">Severin.stalder</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -543,9 +543,9 @@
<p>The Taj Mahal is a white marble mausoleum located in Arga, Uttar Pradesh, India.</p>
<p>It is widely recognized as "the jewel of Muslim art in India and one of the universally admired masterpieces of the world's heritage".</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Taj_Mahal_(Edited).jpeg#mediaviewer/File:Taj_Mahal_(Edited).jpeg"><img src="Taj Mahal.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Taj_Mahal">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Taj_Mahal">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Taj_Mahal">"Taj Mahal"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Taj_Mahal">"Taj Mahal"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Taj_Mahal_(Edited).jpeg#mediaviewer/File:Taj_Mahal_(Edited).jpeg">Taj Mahal (Edited)</a>" by <a href="//commons.wikimedia.org/wiki/User:Yann" title="User:Yann">Yann</a>; edited by <a href="//commons.wikimedia.org/wiki/User:Jim_Cartar" title="User:Jim Cartar" class="mw-redirect">Jim Cartar</a> - Edited version of <a href="//commons.wikimedia.org/wiki/File:Taj_Mahal,_Agra,_India.jpg" title="File:Taj Mahal, Agra, India.jpg">File:Taj Mahal, Agra, India.jpg</a>. Licensed under <a title="Creative Commons Attribution-Share Alike 4.0-3.0-2.5-2.0-1.0" href="http://creativecommons.org/licenses/by-sa/4.0-3.0-2.5-2.0-1.0">CC BY-SA 4.0-3.0-2.5-2.0-1.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -735,9 +735,9 @@
<description><![CDATA[<p style="font-size: x-large; text-align:center">Palm Jebel Ali</p>
<p>The Palm Jebel Ali is an artificial archipelago in Dubai, United Arab Emirates.</p>
<center><a href="https://commons.wikimedia.org/wiki/File:59F1_The-Palm_Dubai_2005-08-26_H.png#mediaviewer/File:59F1_The-Palm_Dubai_2005-08-26_H.png"><img src="Palm Jebel Ali.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Palm_Jebel_Ali">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Palm_Jebel_Ali">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Palm_Jebel_Ali">"Palm Jebel Ali"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Palm_Jebel_Ali">"Palm Jebel Ali"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
<IconStyle>
<Icon>
@@ -810,9 +810,9 @@
<description><![CDATA[<p style="font-size: x-large; text-align:center">Palm Jumeirah</p>
<p>The Palm Jumeirah is an artificial archipelago created using land reclamation by Nakheel, a company owned by the Dubai government in United Arab Emirates and was designed and developed by HHCP architects.</p>
<center><a href="https://en.wikipedia.org/wiki/Palm_Jumeirah#mediaviewer/File:Palm_Island_Resort.jpg"><img src="Palm Jumeirah.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Palm_Jumeirah">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Palm_Jumeirah">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Palm_Jumeirah">"Palm Jumeirah"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Palm_Jumeirah">"Palm Jumeirah"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
<IconStyle>
<Icon>
@@ -885,9 +885,9 @@
<description><![CDATA[<p style="font-size: x-large; text-align:center">The World</p>
<p>The World or World Islands is an artificial archipelago of various small islands constructed in the rough shape of a world map.</p>
<center><a href="https://en.wikipedia.org/wiki/The_World_%28archipelago%29#mediaviewer/File:Dubaiworld.jpg"><img src="The World.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/The_World_(archipelago)">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/The_World_(archipelago)">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/The_World_(archipelago)">"The World (archipelago)"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/The_World_(archipelago)">"The World (archipelago)"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
<IconStyle>
<Icon>
@@ -979,9 +979,9 @@
<p>St. Peter's Basilica is a Late Renaissance church located within Vatican City.</p>
<p>It's one of four Papal Basilicas or Major Basilicas of Rome.</p>
<center><a href="https://commons.wikimedia.org/wiki/File:0_Place_Saint-Pierre_-_Vatican_(4).JPG#mediaviewer/File:0_Place_Saint-Pierre_-_Vatican_(4).JPG"><img src="St Peter's Basilica.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/St._Peter%27s_Basilica">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/St._Peter%27s_Basilica">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/St._Peter%27s_Basilica">"St. Peter's Basilica"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/St._Peter%27s_Basilica">"St. Peter's Basilica"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="https://commons.wikimedia.org/wiki/File:0_Place_Saint-Pierre_-_Vatican_(4).JPG#mediaviewer/File:0_Place_Saint-Pierre_-_Vatican_(4).JPG">0 Place Saint-Pierre - Vatican (4)</a>" by <a href="//commons.wikimedia.org/wiki/User:Jean-Pol_GRANDMONT" title="User:Jean-Pol GRANDMONT">Jean-Pol GRANDMONT</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -1092,9 +1092,9 @@
<p>The Great Pyramid of Giza (also known as the Pyramid of Khufu or the Pyramid of Cheops) is the oldest and largest of the three pyramids in the Giza Necropolis.</p>
<p>Egyptologists believe that the pyramid was built as a tomb over a 10 to 20-year period concluding around 2560 BC.</p>
<center><a href="https://commons.wikimedia.org/wiki/File:Kheops-Pyramid.jpg#mediaviewer/File:Kheops-Pyramid.jpg"><img src="Kheops Pyramid.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Great_Pyramid_of_Giza">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Great_Pyramid_of_Giza">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Great_Pyramid_of_Giza">"Great Pyramid of Giza"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Great_Pyramid_of_Giza">"Great Pyramid of Giza"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="https://commons.wikimedia.org/wiki/File:Kheops-Pyramid.jpg#mediaviewer/File:Kheops-Pyramid.jpg">Kheops-Pyramid</a>" by <a href="//no.wikipedia.org/wiki/User:Nina" class="extiw" title="no:User:Nina">Nina</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution 2.5" href="http://creativecommons.org/licenses/by/2.5">CC BY 2.5</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -1214,9 +1214,9 @@
<p>The Moscow Kremlin, usually referred to as simply the Kremlin, is a historic fortified complex at the heart of Moscow.</p>
<p>The existing Kremlin walls and towers were built by Italian masters over the years 1485 to 1495.</p>
<center><a href="https://commons.wikimedia.org/wiki/File:Moscow_Kremlin_from_Kamenny_bridge.jpg#mediaviewer/File:Moscow_Kremlin_from_Kamenny_bridge.jpg"><img src="Moscow Kremlin.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Moscow_Kremlin">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Moscow_Kremlin">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Moscow_Kremlin">"Moscow Kremlin"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Moscow_Kremlin">"Moscow Kremlin"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="https://commons.wikimedia.org/wiki/File:Moscow_Kremlin_from_Kamenny_bridge.jpg#mediaviewer/File:Moscow_Kremlin_from_Kamenny_bridge.jpg">Moscow Kremlin from Kamenny bridge</a>" by <a href="//commons.wikimedia.org/wiki/User:Julmin" title="User:Julmin">Минеева Ю. (Julmin)</a> (retouched by <a href="//commons.wikimedia.org/wiki/User:Surendil" title="User:Surendil" class="mw-redirect">Surendil</a>) - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 1.0" href="http://creativecommons.org/licenses/by-sa/1.0">CC BY-SA 1.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -1345,9 +1345,9 @@
<p>The Eiffel Tower is an iron lattice tower located on the Champ de Mars in Paris.</p>
<p>The tower is 324 metres (1,063 ft) tall, about the same height as an 81-storey building.</p>
<center><a href="https://commons.wikimedia.org/wiki/File:Tour_Eiffel_Wikimedia_Commons.jpg#mediaviewer/File:Tour_Eiffel_Wikimedia_Commons.jpg"><img src="Eiffel Tower.jpg" height="35%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Eiffel_Tower">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Eiffel_Tower">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Eiffel_Tower">"Eiffel Tower"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Eiffel_Tower">"Eiffel Tower"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="https://commons.wikimedia.org/wiki/File:Tour_Eiffel_Wikimedia_Commons.jpg#mediaviewer/File:Tour_Eiffel_Wikimedia_Commons.jpg">Tour Eiffel Wikimedia Commons</a>" by <a href="//commons.wikimedia.org/wiki/User:Benh" title="User:Benh">Benh LIEU SONG</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -1458,9 +1458,9 @@
<p>Stonehenge is a prehistoric monument located in Wiltshire, England, about 2 miles (3 km) west of Amesbury and 8 miles (13 km) north of Salisbury.</p>
<p>Archaeologists believe it was built anywhere from 3000 BC to 2000 BC.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Stonehenge_on_27.01.08.jpg#mediaviewer/File:Stonehenge_on_27.01.08.jpg"><img src="Stonehenge.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Stonehenge">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Stonehenge">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Stonehenge">"Stonehenge"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Stonehenge">"Stonehenge"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
<IconStyle>
<Icon>
@@ -1582,9 +1582,9 @@
<p>Mount Vesuvius is a stratovolcano in the Gulf of Naples, Italy, about 9 km (5.6 mi) east of Naples and a short distance from the shore. </p>
<p>Mount Vesuvius is best known for its eruption in AD 79 that led to the burying and destruction of the Roman cities of Pompeii and Herculaneum.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Vesuvius_from_Naples_at_sunset.jpg#mediaviewer/File:Vesuvius_from_Naples_at_sunset.jpg"><img src="Vesuvius.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Mount_Vesuvius">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Mount_Vesuvius">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Mount_Vesuvius">"Mount Vesuvius"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Mount_Vesuvius">"Mount Vesuvius"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Vesuvius_from_Naples_at_sunset.jpg#mediaviewer/File:Vesuvius_from_Naples_at_sunset.jpg">Vesuvius from Naples at sunset</a>" by <a href="//commons.wikimedia.org/wiki/User:Finizio" title="User:Finizio">Massimo Finizio</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 2.0 it" href="http://creativecommons.org/licenses/by-sa/2.0/it/deed.en">CC BY-SA 2.0 it</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -1698,9 +1698,9 @@
<p>Mount Taranaki, or Mount Egmont, is an active but quiescent stratovolcano in the Taranaki region on the west coast of New Zealand's North Island.</p>
<p>The 2518-metre-high mountain is one of the most symmetrical volcanic cones in the world.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Mt_Taranaki.JPG#mediaviewer/File:Mt_Taranaki.JPG"><img src="Taranaki.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Mount_Taranaki">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Mount_Taranaki">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Mount_Taranaki">"Mount Taranaki"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Mount_Taranaki">"Mount Taranaki"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
<IconStyle>
<Icon>
@@ -1804,9 +1804,9 @@
<p>The Alcatraz Federal Penitentiary (often just referred to as Alcatraz) was a maximum high-security Federal prison on Alcatraz Island, which operated from 1934 to 1963.</p>
<p>One of the world's most notorious and best known prisons over the years, Alcatraz housed some 1,576 of America's most ruthless criminals.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Alcatraz_Island_photo_D_Ramey_Logan.jpg#mediaviewer/File:Alcatraz_Island_photo_D_Ramey_Logan.jpg"><img src="Alcatraz.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Alcatraz_Federal_Penitentiary">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Alcatraz_Federal_Penitentiary">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Alcatraz_Federal_Penitentiary">"Alcatraz Federal Penitentiary"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Alcatraz_Federal_Penitentiary">"Alcatraz Federal Penitentiary"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Alcatraz_Island_photo_D_Ramey_Logan.jpg#mediaviewer/File:Alcatraz_Island_photo_D_Ramey_Logan.jpg">Alcatraz Island photo D Ramey Logan</a>" by <a href="//commons.wikimedia.org/wiki/User:WPPilot" title="User:WPPilot">WPPilot</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -1911,9 +1911,9 @@
<p>The Disneyland Resort, commonly known as Disneyland, is an entertainment resort in Anaheim, California.</p>
<p>It is owned and operated by The Walt Disney Company through its Parks and Resorts division and is home to two theme parks, three hotels, and a shopping, dining, and entertainment complex known as Downtown Disney.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:SleepingBeautyCastle.JPG#mediaviewer/File:SleepingBeautyCastle.JPG"><img src="Disneyland.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Disneyland_Resort">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Disneyland_Resort">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Disneyland_Resort">"Disneyland Resort"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Disneyland_Resort">"Disneyland Resort"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:SleepingBeautyCastle.JPG#mediaviewer/File:SleepingBeautyCastle.JPG">SleepingBeautyCastle</a>" by <a href="//commons.wikimedia.org/w/index.php?title=User:Cd637&action=edit&redlink=1" class="new" title="User:Cd637 (page does not exist)">Cd637</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -2110,7 +2110,7 @@
<p>Klyuchevskaya Sopka is a stratovolcano, the highest mountain on the Kamchatka Peninsula of Russia and the highest active volcano of Eurasia.</p>
<p>The volcano is part of the natural Volcanoes of Kamchatka UNESCO World Heritage Site.</p>
<center><a href="https://commons.wikimedia.org/wiki/File:Klju%C4%8Devskaja_za_v%C3%BDchodu_slunce.jpg#mediaviewer/File:Klju%C4%8Devskaja_za_v%C3%BDchodu_slunce.jpg"><img src="Klyuchevskaya Sopka.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Klyuchevskaya_Sopka">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Klyuchevskaya_Sopka">Wikipedia</a>.</p>
<hr/>
<p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Klyuchevskaya_Sopka">"Klyuchevskaya Sopka"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
@@ -2297,9 +2297,9 @@
<p>The Church of the Holy Sepulchre is a church within the Christian Quarter of the UNESCO World Heritage-listed walled Old City of Jerusalem.</p>
<p>The site is venerated as Calvary (Golgotha), where Jesus was crucified, and also contains the place where Jesus is said to have been buried.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:The_Church_of_the_Holy_Sepulchre-Jerusalem.JPG#mediaviewer/File:The_Church_of_the_Holy_Sepulchre-Jerusalem.JPG"><img src="Church of the Holy Sepulchre.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Church_of_the_Holy_Sepulchre">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Church_of_the_Holy_Sepulchre">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Church_of_the_Holy_Sepulchre">"Church of the Holy Sepulchre"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Church_of_the_Holy_Sepulchre">"Church of the Holy Sepulchre"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:The_Church_of_the_Holy_Sepulchre-Jerusalem.JPG#mediaviewer/File:The_Church_of_the_Holy_Sepulchre-Jerusalem.JPG">The Church of the Holy Sepulchre-Jerusalem</a>" by <a rel="nofollow" class="external free" href="http://www.flickr.com/photos/jlascar/">http://www.flickr.com/photos/jlascar/</a> - <a rel="nofollow" class="external free" href="http://www.flickr.com/photos/jlascar/10350972756/in/set-72157636698118263/">http://www.flickr.com/photos/jlascar/10350972756/in/set-72157636698118263/</a>. Licensed under <a title="Creative Commons Attribution 2.0" href="http://creativecommons.org/licenses/by/2.0">CC BY 2.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -2392,9 +2392,9 @@
<p>Death Valley is a desert valley located in Eastern California's Mojave Desert, the lowest, driest, and hottest area in North America.</p>
<p>Death Valley's Furnace Creek holds the record for the highest reliably reported air temperature in the world, 134 °F (56.7 °C) on July 10, 1913.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Death_Valley_Mesquite_Flats_Sand_Dunes_2013.jpg#mediaviewer/File:Death_Valley_Mesquite_Flats_Sand_Dunes_2013.jpg"><img src="Death Valley.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Death_Valley">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Death_Valley">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Death_Valley">"Death Valley"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Death_Valley">"Death Valley"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Death_Valley_Mesquite_Flats_Sand_Dunes_2013.jpg#mediaviewer/File:Death_Valley_Mesquite_Flats_Sand_Dunes_2013.jpg">Death Valley Mesquite Flats Sand Dunes 2013</a>" by Tuxyso / <a href="//commons.wikimedia.org/wiki/Main_Page" title="Main Page">Wikimedia Commons</a>. Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -2487,9 +2487,9 @@
<p>Russell Square is a large garden square in Bloomsbury, in the London Borough of Camden.</p>
<p>The square is named after the surname of the Earls and Dukes of Bedford, who developed the family's London landholdings in the 17th and 18th centuries.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:RussellSquare.jpg#mediaviewer/File:RussellSquare.jpg"><img src="Russell Square.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Russell_Square">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Russell_Square">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Russell_Square">"Russell Square"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Russell_Square">"Russell Square"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:RussellSquare.jpg#mediaviewer/File:RussellSquare.jpg">RussellSquare</a>". Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0/">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -2582,9 +2582,9 @@
<p>Dunnottar Castle is a ruined medieval fortress located upon a rocky headland on the north-east coast of Scotland, about 3 kilometres (1.9 mi) south of Stonehaven.</p>
<p>The surviving buildings are largely of the 15th and 16th centuries, but the site is believed to have been fortified in the Early Middle Ages.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Dunnottar_Castle_2.jpg#mediaviewer/File:Dunnottar_Castle_2.jpg"><img src="Dunnottar Castle.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Dunnottar_Castle">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Dunnottar_Castle">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Dunnottar_Castle">"Dunnottar Castle"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Dunnottar_Castle">"Dunnottar Castle"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Dunnottar_Castle_2.jpg#mediaviewer/File:Dunnottar_Castle_2.jpg">Dunnottar Castle 2</a>" by <a rel="nofollow" class="external text" href="http://www.flickr.com/people/62113742@N08">Eduardo Unda</a> from Aberdeen, UK - <a rel="nofollow" class="external text" href="http://www.flickr.com/photos/62113742@N08/5644372018/">Dunnottar Castle</a>. Licensed under <a title="Creative Commons Attribution 2.0" href="http://creativecommons.org/licenses/by/2.0">CC BY 2.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -2707,9 +2707,9 @@
<p>The Shuttle Landing Facility is an airport located on Merritt Island in Brevard County, Florida, USA.</p>
<p>It is a part of the John F. Kennedy Space Center (KSC), and was used by NASA's Space Shuttle for landing until the program's end in 2011.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Shuttle_Landing_Facility.jpg#mediaviewer/File:Shuttle_Landing_Facility.jpg"><img src="Shuttle Landing Facility.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Shuttle_Landing_Facility">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Shuttle_Landing_Facility">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Shuttle_Landing_Facility">"Shuttle Landing Facility"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Shuttle_Landing_Facility">"Shuttle Landing Facility"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
<IconStyle>
<Icon>
@@ -2907,9 +2907,9 @@
<p>The Sydney Opera House is a multi-venue performing arts centre in Sydney, New South Wales, Australia.</p>
<p>Identified as one of the 20th century's most distinctive buildings and one of the most famous performing arts centres in the world, the facility is managed by the Sydney Opera House Trust, under the auspices of the New South Wales Ministry of the Arts.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Sydney_Opera_House_at_Sunset.jpg#mediaviewer/File:Sydney_Opera_House_at_Sunset.jpg"><img src="Sydney Opera House.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Sydney_Opera_House">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Sydney_Opera_House">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Sydney_Opera_House">"Sydney Opera House"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Sydney_Opera_House">"Sydney Opera House"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Sydney_Opera_House_at_Sunset.jpg#mediaviewer/File:Sydney_Opera_House_at_Sunset.jpg">Sydney Opera House at Sunset</a>" by <a href="//commons.wikimedia.org/w/index.php?title=User:Hpeterswald&action=edit&redlink=1" class="new" title="User:Hpeterswald (page does not exist)">Hpeterswald</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -3002,9 +3002,9 @@
<p>The Marree Man, or Stuart's Giant, is a modern geoglyph discovered by air on 26 June 1998.</p>
<p>It appears to depict an indigenous Australian man hunting birds or wallabies with a boomerang.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Maree_Man.jpg#mediaviewer/File:Maree_Man.jpg"><img src="Maree Man.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Marree_Man">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Marree_Man">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Marree_Man">"Marree Man"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Marree_Man">"Marree Man"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Maree_Man.jpg#mediaviewer/File:Maree_Man.jpg">Maree Man</a>" by <a href="//commons.wikimedia.org/wiki/User:Peter_Campbell" title="User:Peter Campbell">Peter Campbell</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -3113,9 +3113,9 @@
<name>Memorial for UTA Flight 772</name>
<description><![CDATA[<p style="font-size: x-large; text-align:center">Memorial for UTA Flight 772</p>
<p>The memorial is constructed of black rock in the shape and dimensions of the DC10 airplane inside a compass, with one of the plane's wings used as a compass point, and over 170 broken mirrors to reflect the victims of the crash.</p>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/UTA_Flight_772#Memorial">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/UTA_Flight_772#Memorial">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/UTA_Flight_772">"UTA Flight 772"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/UTA_Flight_772">"UTA Flight 772"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>]]></description>
<Style>
<IconStyle>
<Icon>
@@ -3206,9 +3206,9 @@
<description><![CDATA[<p style="font-size: x-large; text-align:center">Santorini</p>
<p>Santorini, classically Thera, and officially Thira, is an island in the southern Aegean Sea, about 200 km (120 mi) southeast of Greece's mainland. It is the largest island of a small, circular archipelago which bears the same name and is the remnant of a volcanic caldera.</p>
<center><a href="http://commons.wikimedia.org/wiki/File:Ia_Santorini-2009-1.JPG#mediaviewer/File:Ia_Santorini-2009-1.JPG"><img src="Santorini.jpg" width="80%" ></a></center>
- <p>Read more at <a href="http://en.wikipedia.org/wiki/Santorini">Wikipedia</a>.</p>
+ <p>Read more at <a href="https://en.wikipedia.org/wiki/Santorini">Wikipedia</a>.</p>
<hr/>
- <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="http://en.wikipedia.org/wiki/Santorini">"Santorini"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
+ <p style="font-style:italic; font-size: smaller">This article uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Santorini">"Santorini"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.</p>
<p style="font-style:italic; font-size: smaller">"<a href="http://commons.wikimedia.org/wiki/File:Ia_Santorini-2009-1.JPG#mediaviewer/File:Ia_Santorini-2009-1.JPG">Ia Santorini-2009-1</a>" by <a href="//commons.wikimedia.org/wiki/User:Simm" title="User:Simm">Simm</a> - <span class="int-own-work">Own work</span>. Licensed under <a title="Creative Commons Attribution-Share Alike 3.0" href="http://creativecommons.org/licenses/by-sa/3.0">CC BY-SA 3.0</a> via <a href="//commons.wikimedia.org/wiki/">Wikimedia Commons</a>.</p>]]></description>
<Style>
<IconStyle>
@@ -3238,4 +3238,4 @@
</gx:Playlist>
</gx:Tour>
</Document>
-</kml>
\ No newline at end of file
+</kml>
diff --git a/data/maps/moon/clementine/tour.kml b/data/maps/moon/clementine/tour.kml
index 4a71c4ec3..7b7b81bca 100644
--- a/data/maps/moon/clementine/tour.kml
+++ b/data/maps/moon/clementine/tour.kml
@@ -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>
diff --git a/doc/index.docbook b/doc/index.docbook
index 06d460560..374829a82 100644
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@ -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>
diff --git a/docs/FAQ b/docs/FAQ
index 545495393..80d29d3bb 100644
--- a/docs/FAQ
+++ b/docs/FAQ
@@ -1 +1 @@
-See http://techbase.kde.org/Projects/Marble/FAQ
+See https://techbase.kde.org/Projects/Marble/FAQ
diff --git a/src/lib/marble/BookmarkManager.cpp b/src/lib/marble/BookmarkManager.cpp
index 8ec2dbfff..f8d0940d5 100644
--- a/src/lib/marble/BookmarkManager.cpp
+++ b/src/lib/marble/BookmarkManager.cpp
@@ -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();
diff --git a/src/lib/marble/CurrentLocationWidget.cpp b/src/lib/marble/CurrentLocationWidget.cpp
index 1dbe74209..50f34196a 100644
--- a/src/lib/marble/CurrentLocationWidget.cpp
+++ b/src/lib/marble/CurrentLocationWidget.cpp
@@ -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>"
diff --git a/src/lib/marble/GeoUriParser.h b/src/lib/marble/GeoUriParser.h
index d069de1d4..3c1741707 100644
--- a/src/lib/marble/GeoUriParser.h
+++ b/src/lib/marble/GeoUriParser.h
@@ -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 {
diff --git a/src/lib/marble/GoToDialog.cpp b/src/lib/marble/GoToDialog.cpp
index 12abee61f..0cca72f2d 100644
--- a/src/lib/marble/GoToDialog.cpp
+++ b/src/lib/marble/GoToDialog.cpp
@@ -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());
}
diff --git a/src/lib/marble/MarbleAboutDialog.cpp b/src/lib/marble/MarbleAboutDialog.cpp
index efedcdda2..cca6446a4 100644
--- a/src/lib/marble/MarbleAboutDialog.cpp
+++ b/src/lib/marble/MarbleAboutDialog.cpp
@@ -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 );
diff --git a/src/lib/marble/MarbleColors.h b/src/lib/marble/MarbleColors.h
index 52dd3740f..8ae336112 100644
--- a/src/lib/marble/MarbleColors.h
+++ b/src/lib/marble/MarbleColors.h
@@ -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
diff --git a/src/lib/marble/MarbleLineEdit.cpp b/src/lib/marble/MarbleLineEdit.cpp
index 32f8ca9a4..a925dc0d1 100644
--- a/src/lib/marble/MarbleLineEdit.cpp
+++ b/src/lib/marble/MarbleLineEdit.cpp
@@ -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 at kde.org>
//
diff --git a/src/lib/marble/MarbleLineEdit.h b/src/lib/marble/MarbleLineEdit.h
index 9944201ca..7d88c6584 100644
--- a/src/lib/marble/MarbleLineEdit.h
+++ b/src/lib/marble/MarbleLineEdit.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 at kde.org>
//
diff --git a/src/lib/marble/MarbleMath.h b/src/lib/marble/MarbleMath.h
index 574487187..8083e8fe4 100644
--- a/src/lib/marble/MarbleMath.h
+++ b/src/lib/marble/MarbleMath.h
@@ -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 ) {
diff --git a/src/lib/marble/MarblePluginSettingsWidget.cpp b/src/lib/marble/MarblePluginSettingsWidget.cpp
index 7d5a40e16..d2bb99fcc 100644
--- a/src/lib/marble/MarblePluginSettingsWidget.cpp
+++ b/src/lib/marble/MarblePluginSettingsWidget.cpp
@@ -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 ) );
diff --git a/src/lib/marble/MarbleZip.cpp b/src/lib/marble/MarbleZip.cpp
index beeaf3782..d08a07d88 100644
--- a/src/lib/marble/MarbleZip.cpp
+++ b/src/lib/marble/MarbleZip.cpp
@@ -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$
**
diff --git a/src/lib/marble/MarbleZipReader.h b/src/lib/marble/MarbleZipReader.h
index 9dd360932..86126b816 100644
--- a/src/lib/marble/MarbleZipReader.h
+++ b/src/lib/marble/MarbleZipReader.h
@@ -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$
**
diff --git a/src/lib/marble/MarbleZipWriter.h b/src/lib/marble/MarbleZipWriter.h
index b2613b577..6debce6bd 100644
--- a/src/lib/marble/MarbleZipWriter.h
+++ b/src/lib/marble/MarbleZipWriter.h
@@ -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$
**
diff --git a/src/lib/marble/PlanetFactory.cpp b/src/lib/marble/PlanetFactory.cpp
index b19a31c2e..228ee5bad 100644
--- a/src/lib/marble/PlanetFactory.cpp
+++ b/src/lib/marble/PlanetFactory.cpp
@@ -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 );
diff --git a/src/lib/marble/ServerLayout.cpp b/src/lib/marble/ServerLayout.cpp
index 8c865ef36..3adb748d9 100644
--- a/src/lib/marble/ServerLayout.cpp
+++ b/src/lib/marble/ServerLayout.cpp
@@ -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() )
diff --git a/src/lib/marble/StyleBuilder.cpp b/src/lib/marble/StyleBuilder.cpp
index 2945fd1ab..0af7625cd 100644
--- a/src/lib/marble/StyleBuilder.cpp
+++ b/src/lib/marble/StyleBuilder.cpp
@@ -3011,7 +3011,7 @@ GeoDataPlacemark::GeoDataVisualCategory StyleBuilder::determineVisualCategory(co
QString const capital(QStringLiteral("capital"));
QString const admin_level(QStringLiteral("admin_level"));
// National capitals have admin_level=2
- // More at http://wiki.openstreetmap.org/wiki/Key:capital#Using_relations_for_capitals
+ // More at https://wiki.openstreetmap.org/wiki/Key:capital#Using_relations_for_capitals
QString const national_level(QStringLiteral("2"));
for (auto iter = osmData.tagsBegin(), end = osmData.tagsEnd(); iter != end; ++iter) {
diff --git a/src/lib/marble/VectorTileModel.cpp b/src/lib/marble/VectorTileModel.cpp
index 7f7f28b00..1e796bb1a 100644
--- a/src/lib/marble/VectorTileModel.cpp
+++ b/src/lib/marble/VectorTileModel.cpp
@@ -104,8 +104,8 @@ void VectorTileModel::setViewport(const GeoDataLatLonBox &latLonBox)
/** LOGIC FOR DOWNLOADING ALL THE TILES THAT ARE INSIDE THE SCREEN AT THE CURRENT ZOOM LEVEL **/
// New tiles X and Y for moved screen coordinates
- // More info: http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Subtiles
- // More info: http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#C.2FC.2B.2B
+ // More info: https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Subtiles
+ // More info: https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#C.2FC.2B.2B
const QRect rect = m_layer->tileProjection()->tileIndexes(latLonBox, tileLoadLevel);
// Download tiles and send them to VectorTileLayer
diff --git a/src/lib/marble/ViewportParams.h b/src/lib/marble/ViewportParams.h
index 5d99f839d..c6c9da79b 100644
--- a/src/lib/marble/ViewportParams.h
+++ b/src/lib/marble/ViewportParams.h
@@ -70,7 +70,7 @@ class MARBLE_EXPORT ViewportParams
// - to display two points as distinct points if they are separated by a
// an angular distance that is smaller. Instead only one point should be shown.
// So this method helps to filter out details.
- // It's somewhat related to http://en.wikipedia.org/wiki/Angular_resolution
+ // It's somewhat related to https://en.wikipedia.org/wiki/Angular_resolution
qreal angularResolution() const;
diff --git a/src/lib/marble/geodata/data/GeoDataCoordinates.cpp b/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
index 64989f9ef..39c072454 100644
--- a/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
+++ b/src/lib/marble/geodata/data/GeoDataCoordinates.cpp
@@ -1097,8 +1097,8 @@ int GeoDataCoordinatesPrivate::lonLatToZone( qreal lon, qreal lat ){
}
// Obtains the zone number handling all the so called "exceptions"
- // See problem: http://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system#Exceptions
- // See solution: http://gis.stackexchange.com/questions/13291/computing-utm-zone-from-lat-long-point
+ // See problem: https://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system#Exceptions
+ // See solution: https://gis.stackexchange.com/questions/13291/computing-utm-zone-from-lat-long-point
// General
int zoneNumber = static_cast<int>( (lonDeg+180) / 6.0 ) + 1;
diff --git a/src/lib/marble/geodata/data/GeoDataCoordinates.h b/src/lib/marble/geodata/data/GeoDataCoordinates.h
index f8048e62d..c91b4de3b 100644
--- a/src/lib/marble/geodata/data/GeoDataCoordinates.h
+++ b/src/lib/marble/geodata/data/GeoDataCoordinates.h
@@ -321,7 +321,7 @@ class GEODATA_EXPORT GeoDataCoordinates
/**
* @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
*/
qreal sphericalDistanceTo(const GeoDataCoordinates &other) const;
diff --git a/src/lib/marble/routing/AlternativeRoutesModel.cpp b/src/lib/marble/routing/AlternativeRoutesModel.cpp
index 3f1a917b3..656739c3c 100644
--- a/src/lib/marble/routing/AlternativeRoutesModel.cpp
+++ b/src/lib/marble/routing/AlternativeRoutesModel.cpp
@@ -48,7 +48,7 @@ public:
/**
* Returns the bearing of the great circle path defined by the coordinates one and two
- * Based on http://www.movable-type.co.uk/scripts/latlong.html
+ * Based on https://www.movable-type.co.uk/scripts/latlong.html
*/
static qreal bearing( const GeoDataCoordinates &one, const GeoDataCoordinates &two );
diff --git a/src/lib/marble/routing/instructions/RoutingPoint.cpp b/src/lib/marble/routing/instructions/RoutingPoint.cpp
index c66210f48..f4ed69f15 100644
--- a/src/lib/marble/routing/instructions/RoutingPoint.cpp
+++ b/src/lib/marble/routing/instructions/RoutingPoint.cpp
@@ -34,7 +34,7 @@ qreal RoutingPoint::lat() const
return m_lat;
}
-// Code based on http://www.movable-type.co.uk/scripts/latlong.html
+// Code based on https://www.movable-type.co.uk/scripts/latlong.html
qreal RoutingPoint::bearing( const RoutingPoint &other ) const
{
qreal deltaLon = other.m_lonRad - m_lonRad;
diff --git a/src/lib/marble/routing/instructions/RoutingPoint.h b/src/lib/marble/routing/instructions/RoutingPoint.h
index 890009673..de3e7d22e 100644
--- a/src/lib/marble/routing/instructions/RoutingPoint.h
+++ b/src/lib/marble/routing/instructions/RoutingPoint.h
@@ -37,14 +37,14 @@ public:
/**
* Calculates the bearing of the line defined by this point
* and the given other point.
- * Code based on http://www.movable-type.co.uk/scripts/latlong.html
+ * Code based on https://www.movable-type.co.uk/scripts/latlong.html
*/
qreal bearing( const RoutingPoint &other ) const;
/**
* Calculates the distance in meter between this point and the
* given other point.
- * Code based on http://www.movable-type.co.uk/scripts/latlong.html
+ * Code based on https://www.movable-type.co.uk/scripts/latlong.html
*/
qreal distance( const RoutingPoint &other ) const;
diff --git a/src/plugins/render/graticule/GraticulePlugin.cpp b/src/plugins/render/graticule/GraticulePlugin.cpp
index 923814c79..afc99f9c5 100644
--- a/src/plugins/render/graticule/GraticulePlugin.cpp
+++ b/src/plugins/render/graticule/GraticulePlugin.cpp
@@ -554,7 +554,7 @@ void GraticulePlugin::renderUtmExceptions( GeoPainter *painter,
LabelPositionFlags labelPositionFlags )
{
// This code renders the so called "exceptions" in the UTM coordinate grid
- // See: http://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system#Exceptions
+ // See: https://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system#Exceptions
if ( northPolarGap == 6.0 && southPolarGap == 162.0) {
if (label == QLatin1String("33")) {
renderLongitudeLine( painter, itStep-3.0, viewLatLonAltBox, northPolarGap,
diff --git a/src/plugins/render/satellites/SatellitesModel.cpp b/src/plugins/render/satellites/SatellitesModel.cpp
index 8daac829d..71e015823 100644
--- a/src/plugins/render/satellites/SatellitesModel.cpp
+++ b/src/plugins/render/satellites/SatellitesModel.cpp
@@ -140,7 +140,7 @@ void SatellitesModel::parseCatalog( const QString &id,
const QByteArray &data )
{
// For details see:
- // http://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat
+ // https://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat
mDebug() << "Reading satellite catalog from:" << id;
diff --git a/src/plugins/render/satellites/SatellitesModel.h b/src/plugins/render/satellites/SatellitesModel.h
index db12a2639..02aa275bc 100644
--- a/src/plugins/render/satellites/SatellitesModel.h
+++ b/src/plugins/render/satellites/SatellitesModel.h
@@ -42,7 +42,7 @@ protected:
/**
* Parse the Marble Satellite Catalog @p id with content @p data.
* A description of the Marble Satellites Catalog format can be found at:
- * http://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat
+ * https://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat
*/
void parseCatalog( const QString &id, const QByteArray &data );
/**
diff --git a/src/plugins/render/satellites/SatellitesPlugin.cpp b/src/plugins/render/satellites/SatellitesPlugin.cpp
index 0bacb247c..aa2ebfcee 100644
--- a/src/plugins/render/satellites/SatellitesPlugin.cpp
+++ b/src/plugins/render/satellites/SatellitesPlugin.cpp
@@ -121,11 +121,10 @@ QString SatellitesPlugin::aboutDataText() const
{
return tr(
"Earth-Satellites orbital elements from <ul><li>"
- "<a href=\"http://www.celestrak.com\">http://www.celestrak.com</a>"
+ "<a href=\"https://www.celestrak.com\">https://www.celestrak.com</a>"
"</li></ul>"
"Planetary-Satellites orbital elements from <ul><li>"
- "<a href=\"http://tasc.esa.int/\">ESA TASC service</a></li><li>"
- "<a href=\"http://ssd.jpl.nasa.gov/?horizons\">"
+ "<a href=\"https://ssd.jpl.nasa.gov/?horizons\">"
"JPL Horizons</a></li></ul>" );
}
@@ -284,7 +283,7 @@ void SatellitesPlugin::setSettings( const QHash<QString, QVariant> &settings )
// add default data sources
if (!settings.contains(QStringLiteral("dataSources"))) {
QStringList dsList;
- dsList << QStringLiteral("http://www.celestrak.com/NORAD/elements/visual.txt");
+ dsList << QStringLiteral("https://www.celestrak.com/NORAD/elements/visual.txt");
m_settings.insert(QStringLiteral("dataSources"), dsList);
m_settings.insert(QStringLiteral("idList"), dsList);
}
@@ -447,54 +446,54 @@ void SatellitesPlugin::addBuiltInDataSources()
QString currentCategory;
currentCategory = tr("Special-Interest Satellites" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Last 30 Days' Launches", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/tle-new.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Space Stations", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/stations.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "100 (or so) Brightest", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/visual.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "FENGYUN 1C Debris", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/1999-025.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "IRIDIUM 33 Debris", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/iridium-33-debris.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "COSMOS 2251 Debris", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/cosmos-2251-debris.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Last 30 Days' Launches", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/tle-new.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Space Stations", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/stations.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "100 (or so) Brightest", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/visual.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "FENGYUN 1C Debris", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/1999-025.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "IRIDIUM 33 Debris", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/iridium-33-debris.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "COSMOS 2251 Debris", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/cosmos-2251-debris.txt" );
currentCategory = tr( "Weather & Earth Resources Satellites" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Weather", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/weather.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "NOAA", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/noaa.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "GOES", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/goes.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Earth Resources", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/resource.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Search & Rescue (SARSAT)", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/sarsat.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Disaster Monitoring", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/dmc.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Tracking and Data Relay Satellite System (TDRSS)", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/tdrss.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Weather", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/weather.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "NOAA", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/noaa.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "GOES", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/goes.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Earth Resources", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/resource.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Search & Rescue (SARSAT)", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/sarsat.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Disaster Monitoring", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/dmc.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Tracking and Data Relay Satellite System (TDRSS)", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/tdrss.txt" );
currentCategory = tr( "Communications Satellites" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Geostationary", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/geo.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Intelsat", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/intelsat.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Gorizont", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/gorizont.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Raduga", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/raduga.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Molniya", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/molniya.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Iridium", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/iridium.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Orbcomm", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/orbcomm.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Globalstar", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/globalstar.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Amateur radio", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/amateur.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Experimental", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/x-comm.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Other", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/other-comm.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Geostationary", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/geo.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Intelsat", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/intelsat.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Gorizont", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/gorizont.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Raduga", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/raduga.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Molniya", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/molniya.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Iridium", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/iridium.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Orbcomm", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/orbcomm.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Globalstar", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/globalstar.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Amateur radio", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/amateur.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Experimental", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/x-comm.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Other", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/other-comm.txt" );
currentCategory = tr( "Navigation Satellites" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "GPS Operational", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/gps-ops.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Glonass Operational", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/glo-ops.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Galileo", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/galileo.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Satellite-Based Augmentation System (WAAS/EGNOS/MSAS)", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/sbas.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Navy Navigation Satellite System (NNSS)", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/nnss.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Russian LEO Navigation", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/musson.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "GPS Operational", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/gps-ops.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Glonass Operational", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/glo-ops.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Galileo", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/galileo.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Satellite-Based Augmentation System (WAAS/EGNOS/MSAS)", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/sbas.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Navy Navigation Satellite System (NNSS)", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/nnss.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Russian LEO Navigation", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/musson.txt" );
currentCategory = tr( "Scientific Satellites" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Space & Earth Science", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/science.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Geodetic", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/geodetic.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Engineering", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/engineering.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Education", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/education.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Space & Earth Science", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/science.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Geodetic", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/geodetic.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Engineering", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/engineering.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Education", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/education.txt" );
currentCategory = tr( "Miscellaneous Satellites" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Miscellaneous Military", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/military.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Radar Calibration", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/radar.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "CubeSats", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/cubesat.txt" );
- m_configDialog->addTLESatelliteItem( currentCategory, tr( "Other", "Name of a satellite group" ), "http://www.celestrak.com/NORAD/elements/other.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Miscellaneous Military", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/military.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Radar Calibration", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/radar.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "CubeSats", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/cubesat.txt" );
+ m_configDialog->addTLESatelliteItem( currentCategory, tr( "Other", "Name of a satellite group" ), "https://www.celestrak.com/NORAD/elements/other.txt" );
readSettings();
m_configDialog->update();
diff --git a/src/plugins/render/satellites/SatellitesTLEItem.cpp b/src/plugins/render/satellites/SatellitesTLEItem.cpp
index 943a81755..cf0224f56 100644
--- a/src/plugins/render/satellites/SatellitesTLEItem.cpp
+++ b/src/plugins/render/satellites/SatellitesTLEItem.cpp
@@ -176,7 +176,7 @@ GeoDataCoordinates SatellitesTLEItem::fromTEME( double x,
double lat = atan2( z, sqrt( x*x + y*y ) );
//TODO: determine if this is worth the extra precision
- // Algorithm from http://celestrak.com/columns/v02n03/
+ // Algorithm from https://celestrak.com/columns/v02n03/
//TODO: demonstrate it.
double a = m_earthSemiMajorAxis;
double planetRadius = sqrt( x*x + y*y );
diff --git a/src/plugins/render/satellites/data/satellite.html b/src/plugins/render/satellites/data/satellite.html
index 62caef351..c388d8157 100644
--- a/src/plugins/render/satellites/data/satellite.html
+++ b/src/plugins/render/satellites/data/satellite.html
@@ -15,10 +15,10 @@
<td colspan="2">Coordinates</td>
</tr>
<tr>
- <td><a href="http://en.m.wikipedia.org/wiki/Longitude">Longitude</a></td><td>%longitude%</td>
+ <td><a href="https://en.m.wikipedia.org/wiki/Longitude">Longitude</a></td><td>%longitude%</td>
</tr>
<tr>
- <td><a href="http://en.m.wikipedia.org/wiki/Latitude">Latitude</a></td><td>%latitude%</td>
+ <td><a href="https://en.m.wikipedia.org/wiki/Latitude">Latitude</a></td><td>%latitude%</td>
</tr>
<tr>
<td>Altitude</a></td><td>%altitude% m</td>
@@ -35,26 +35,26 @@
<td colspan="2">Orbital data</td>
</tr>
<tr>
- <td><a href="http://en.m.wikipedia.org/wiki/Apsis">Perigee</a></td><td>%perigee% km</td>
+ <td><a href="https://en.m.wikipedia.org/wiki/Apsis">Perigee</a></td><td>%perigee% km</td>
</tr>
<tr>
- <td><a href="http://en.m.wikipedia.org/wiki/Apsis">Apogee</a></td><td>%apogee% km</td>
+ <td><a href="https://en.m.wikipedia.org/wiki/Apsis">Apogee</a></td><td>%apogee% km</td>
</tr>
<tr>
- <td><a href="http://en.m.wikipedia.org/wiki/Inclination">Inclination</a> (<i>i</i>)</td><td>%inclination%°</td>
+ <td><a href="https://en.m.wikipedia.org/wiki/Inclination">Inclination</a> (<i>i</i>)</td><td>%inclination%°</td>
</tr>
<tr>
- <td><a href="http://en.m.wikipedia.org/wiki/Orbital_period">Period</a> (<i>P</i>)</td><td>%period% min</td>
+ <td><a href="https://en.m.wikipedia.org/wiki/Orbital_period">Period</a> (<i>P</i>)</td><td>%period% min</td>
</tr>
<tr>
- <td><a href="http://en.m.wikipedia.org/wiki/Semi-major_axis">Semi-major axis</a> (<i>a</i>)</td><td>%semiMajorAxis% km</td>
+ <td><a href="https://en.m.wikipedia.org/wiki/Semi-major_axis">Semi-major axis</a> (<i>a</i>)</td><td>%semiMajorAxis% km</td>
</tr>
</table>
<hr>
-<p>Earth-Satellites orbital elements from <a href="http://www.celestrak.com">http://www.celestrak.com</a>.
-<p>Planetary-Satellites orbital elements from <a href="http://tasc.esa.int/">ESA TASC service</a> and <a href="http://ssd.jpl.nasa.gov/?horizons">JPL Horizons</a>
+<p>Earth-Satellites orbital elements from <a href="https://www.celestrak.com">http://www.celestrak.com</a>.
+<p>Planetary-Satellites orbital elements from <a href="https://ssd.jpl.nasa.gov/?horizons">JPL Horizons</a>
</body>
</html>
diff --git a/src/plugins/runner/local-osm-search/OsmDatabase.cpp b/src/plugins/runner/local-osm-search/OsmDatabase.cpp
index fa3cd7cc8..3e476110b 100644
--- a/src/plugins/runner/local-osm-search/OsmDatabase.cpp
+++ b/src/plugins/runner/local-osm-search/OsmDatabase.cpp
@@ -93,7 +93,7 @@ QVector<OsmPlacemark> OsmDatabase::find( const DatabaseQuery &userQuery )
if ( !userQuery.region().isEmpty() ) {
QTime regionTimer;
regionTimer.start();
- // Nested set model to support region hierarchies, see http://en.wikipedia.org/wiki/Nested_set_model
+ // Nested set model to support region hierarchies, see https://en.wikipedia.org/wiki/Nested_set_model
const QString regionsQueryString = QLatin1String("SELECT lft, rgt FROM regions WHERE name LIKE '%") + userQuery.region() + QLatin1String("%';");
QSqlQuery regionsQuery( regionsQueryString, database );
if ( regionsQuery.lastError().isValid() ) {
diff --git a/tools/gen-sat-catalog/gen-sat-catalog.py b/tools/gen-sat-catalog/gen-sat-catalog.py
index 4f8631bbd..9ca18aabc 100755
--- a/tools/gen-sat-catalog/gen-sat-catalog.py
+++ b/tools/gen-sat-catalog/gen-sat-catalog.py
@@ -10,7 +10,7 @@
#
# Create a Marble Satellite Catalog file with data from various sources.
-# See also: http://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat
+# See also: https://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat
from __future__ import print_function
diff --git a/tools/mbtile-import/MbTileWriter.cpp b/tools/mbtile-import/MbTileWriter.cpp
index 99d9844fa..2b0b62101 100644
--- a/tools/mbtile-import/MbTileWriter.cpp
+++ b/tools/mbtile-import/MbTileWriter.cpp
@@ -47,7 +47,7 @@ MbTileWriter::MbTileWriter(const QString &filename, const QString &extension) :
setMetaData("version", "1.0");
setMetaData("description", "A global roadmap created by the OpenStreetMap (OSM) project");
setMetaData("format", extension);
- setMetaData("attribution", "Data from <a href=\"http://openstreetmap.org/\">OpenStreetMap</a> and <a href=\"http://www.naturalearthdata.com/\">Natural Earth</a> contributors");
+ setMetaData("attribution", "Data from <a href=\"https://openstreetmap.org/\">OpenStreetMap</a> and <a href=\"https://www.naturalearthdata.com/\">Natural Earth</a> contributors");
}
execQuery("BEGIN TRANSACTION");
}
diff --git a/tools/osm-addresses/OsmParser.cpp b/tools/osm-addresses/OsmParser.cpp
index 986b1f989..aa24d523f 100644
--- a/tools/osm-addresses/OsmParser.cpp
+++ b/tools/osm-addresses/OsmParser.cpp
@@ -631,7 +631,7 @@ void OsmParser::setCategory( Element &element, const QString &key, const QString
}
}
-// From http://en.wikipedia.org/wiki/Graham_scan#Pseudocode
+// From https://en.wikipedia.org/wiki/Graham_scan#Pseudocode
GeoDataLinearRing* OsmParser::convexHull() const
{
Q_ASSERT(m_coordinates.size()>2);
diff --git a/tools/speaker-files/main.cpp b/tools/speaker-files/main.cpp
index 4f9990c2c..e2d8e201a 100644
--- a/tools/speaker-files/main.cpp
+++ b/tools/speaker-files/main.cpp
@@ -153,7 +153,7 @@ void createLegalFiles( const QString &directory, const QString &name, const QStr
if ( licenseFile.open( QFile::WriteOnly | QFile::Truncate ) ) {
QTextStream stream( &licenseFile );
stream << "The ogg files in this directory are licensed under the creative commons Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) license. ";
- stream << "See http://creativecommons.org/licenses/by-sa/3.0/ and the file CC-BY-SA-3.0 in this directory.";
+ stream << "See https://creativecommons.org/licenses/by-sa/3.0/ and the file CC-BY-SA-3.0 in this directory.";
}
licenseFile.close();
@@ -163,7 +163,7 @@ void createLegalFiles( const QString &directory, const QString &name, const QStr
stream << "To install this voice guidance speaker in Marble, copy the entire directory to the audio/speakers/ directory in Marble's data path.\n\n";
stream << "For example, if this directory is called 'MySpeaker' and you want to use it on the Nokia N900, copy the directory with all files to /home/user/MyDocs/.local/share/marble/audio/speakers/MySpeaker\n\n";
stream << "Afterwards start Marble on the N900 and press the routing info box (four icons on the bottom) for two seconds with the pen. Enter the configuration dialog and choose the 'MySpeaker' speaker.\n\n";
- stream << "Check http://edu.kde.org/marble/speakers.php for updates and more speakers.";
+ stream << "Check https://edu.kde.org/marble/speakers.php for updates and more speakers.";
}
installFile.close();
}
diff --git a/tools/vectorosm-tilecreator/clipper/clipper.cpp b/tools/vectorosm-tilecreator/clipper/clipper.cpp
index 24a197994..ea0db410b 100644
--- a/tools/vectorosm-tilecreator/clipper/clipper.cpp
+++ b/tools/vectorosm-tilecreator/clipper/clipper.cpp
@@ -8,18 +8,18 @@
* *
* License: *
* Use, modification & distribution is subject to Boost Software License Ver 1. *
-* http://www.boost.org/LICENSE_1_0.txt *
+* https://www.boost.org/LICENSE_1_0.txt *
* *
* Attributions: *
* The code in this library is an extension of Bala Vatti's clipping algorithm: *
* "A generic solution to polygon clipping" *
* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. *
-* http://portal.acm.org/citation.cfm?id=129906 *
+* https://dl.acm.org/citation.cfm?id=129906 *
* *
* Computer graphics and geometric modeling: implementation and algorithms *
* By Max K. Agoston *
* Springer; 1 edition (January 4, 2005) *
-* http://books.google.com/books?q=vatti+clipping+agoston *
+* https://books.google.com/books?q=vatti+clipping+agoston *
* *
* See also: *
* "Polygon Offsetting by Computing Winding Numbers" *
@@ -27,7 +27,7 @@
* ASME 2005 International Design Engineering Technical Conferences *
* and Computers and Information in Engineering Conference (IDETC/CIE2005) *
* September 24-28, 2005 , Long Beach, California, USA *
-* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf *
+* https://mcmains.me.berkeley.edu/pubs/DAC05OffsetPolygon.pdf *
* *
*******************************************************************************/
@@ -438,7 +438,7 @@ bool PointIsVertex(const IntPoint &Pt, OutPt *pp)
//------------------------------------------------------------------------------
//See "The Point in Polygon Problem for Arbitrary Polygons" by Hormann & Agathos
-//http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.88.5498&rep=rep1&type=pdf
+//https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.88.5498&rep=rep1&type=pdf
int PointInPolygon(const IntPoint &pt, const Path &path)
{
//returns 0 if false, +1 if true, -1 if pt ON polygon boundary
@@ -4328,7 +4328,7 @@ double DistanceFromLineSqrd(
//(y¹ - y²)x + (x² - x¹)y + (y² - y¹)x¹ - (x² - x¹)y¹ = 0
//A = (y¹ - y²); B = (x² - x¹); C = (y² - y¹)x¹ - (x² - x¹)y¹
//perpendicular distance of point (x³,y³) = (Ax³ + By³ + C)/Sqrt(A² + B²)
- //see http://en.wikipedia.org/wiki/Perpendicular_distance
+ //see https://en.wikipedia.org/wiki/Perpendicular_distance
double A = double(ln1.Y - ln2.Y);
double B = double(ln2.X - ln1.X);
double C = A * ln1.X + B * ln1.Y;
diff --git a/tools/vectorosm-tilecreator/clipper/clipper.hpp b/tools/vectorosm-tilecreator/clipper/clipper.hpp
index 96e2fb441..d64f7b7eb 100644
--- a/tools/vectorosm-tilecreator/clipper/clipper.hpp
+++ b/tools/vectorosm-tilecreator/clipper/clipper.hpp
@@ -8,18 +8,18 @@
* *
* License: *
* Use, modification & distribution is subject to Boost Software License Ver 1. *
-* http://www.boost.org/LICENSE_1_0.txt *
+* https://www.boost.org/LICENSE_1_0.txt *
* *
* Attributions: *
* The code in this library is an extension of Bala Vatti's clipping algorithm: *
* "A generic solution to polygon clipping" *
* Communications of the ACM, Vol 35, Issue 7 (July 1992) pp 56-63. *
-* http://portal.acm.org/citation.cfm?id=129906 *
+* https://dl.acm.org/citation.cfm?id=129906 *
* *
* Computer graphics and geometric modeling: implementation and algorithms *
* By Max K. Agoston *
* Springer; 1 edition (January 4, 2005) *
-* http://books.google.com/books?q=vatti+clipping+agoston *
+* https://books.google.com/books?q=vatti+clipping+agoston *
* *
* See also: *
* "Polygon Offsetting by Computing Winding Numbers" *
@@ -27,7 +27,7 @@
* ASME 2005 International Design Engineering Technical Conferences *
* and Computers and Information in Engineering Conference (IDETC/CIE2005) *
* September 24-28, 2005 , Long Beach, California, USA *
-* http://www.me.berkeley.edu/~mcmains/pubs/DAC05OffsetPolygon.pdf *
+* https://mcmains.me.berkeley.edu/pubs/DAC05OffsetPolygon.pdf *
* *
*******************************************************************************/
@@ -68,7 +68,7 @@ enum PolyType { ptSubject, ptClip };
//By far the most widely used winding rules for polygon filling are
//EvenOdd & NonZero (GDI, GDI+, XLib, OpenGL, Cairo, AGG, Quartz, SVG, Gr32)
//Others rules include Positive, Negative and ABS_GTR_EQ_TWO (only in OpenGL)
-//see http://glprogramming.com/red/chapter11.html
+//see https://glprogramming.com/red/chapter11.html
enum PolyFillType { pftEvenOdd, pftNonZero, pftPositive, pftNegative };
#ifdef use_int32
More information about the kde-doc-english
mailing list