Commit 26493d12 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Use URLs with transport encryption, update links

parent c4eb1136
......@@ -99,7 +99,7 @@ int main ( int argc, char *argv[] )
KAboutLicense::LGPL_V2,
i18n( "(c) 2007-%1", QLatin1String("2016") ),
QString(),
"http://marble.kde.org/" );
"https://marble.kde.org/" );
// Active Development Team of Marble
aboutData.addAuthor( i18n( "Torsten Rahn" ),
......@@ -113,7 +113,7 @@ int main ( int argc, char *argv[] )
"tgridel@free.fr" );
aboutData.addAuthor( i18n( "Jens-Michael Hoffmann" ),
i18n( "OpenStreetMap Integration, OSM Namefinder, Download Management" ),
"jmho@c-xx.com", "http://www.c-xx.com" );
"jmho@c-xx.com" );
aboutData.addAuthor( i18n( "Florian Eßer" ),
i18n( "Elevation Profile" ),
"f.esser@rwth-aachen.de" );
......
......@@ -899,12 +899,12 @@ void MainWindow::handbook()
{
const QString code = MarbleLocale::languageCode();
QUrl handbookLocation(QLatin1String("http://docs.kde.org/stable/") + code + QLatin1String("/kdeedu/marble/index.html"));
QUrl handbookLocation(QLatin1String("https://docs.kde.org/stable/") + code + QLatin1String("/kdeedu/marble/index.html"));
// TODO: this logic seems broken. Should that check "code.isEmpty()" instead?
// and how do we konw there is a doc for the code?
// and how do we know there is a doc for the code?
if ( handbookLocation.isEmpty() )
handbookLocation = QUrl("http://docs.kde.org/stable/en/kdeedu/marble/index.html");
handbookLocation = QUrl("https://docs.kde.org/stable/en/kdeedu/marble/index.html");
if( !QDesktopServices::openUrl( handbookLocation ) )
qDebug() << "URL not opened";
......
......@@ -326,7 +326,7 @@ void ControlView::printPixmap( QPrinter * printer, const QPixmap& pixmap )
#endif
}
// QPointer is used because of issues described in http://www.kdedevelopers.org/node/3919
// QPointer is used because of issues described in https://blogs.kde.org/2009/03/26/how-crash-almost-every-qtkde-application-and-how-fix-it-0
void ControlView::printPreview()
{
#ifndef QT_NO_PRINTER
......
......@@ -108,7 +108,7 @@ public:
/**
* @brief Change the URI for resolving relative paths.
* See http://tools.ietf.org/html/rfc3986#section-5
* See https://tools.ietf.org/html/rfc3986#section-5
*/
void setBaseUri( const QString &baseUri );
......
......@@ -34,7 +34,7 @@ class GeoDataObjectPrivate;
*
* The Geodata objects are all modeled after the Google KML files as
* defined in
* http://code.google.com/apis/kml/documentation/kml_tags_21.html.
* https://developers.google.com/kml/documentation/kmlreference.
*
* A GeoDataObject contains 2 properties, both corresponding directly
* to tags in the KML files: the <b>id</b>, which is a unique
......
......@@ -30,7 +30,7 @@ class GeoDataCoordinates;
*
* GeoDataTrack implements the Track tag defined in Google's extension of the
* Open Geospatial Consortium standard KML 2.2 at
* http://code.google.com/apis/kml/documentation/kmlreference.html#gxtrack .
* https://developers.google.com/kml/documentation/kmlreference#gxtrack .
*
* A track is made of points, each point has a coordinates and a time value
* associated with the coordinates. New points can be added using the addPoint()
......
......@@ -27,7 +27,7 @@
namespace Marble
{
// Lists all known KML 2.1 tags (http://code.google.com/apis/kml/documentation/kmlTag_tags_21.html)
// Lists all known KML 2.1 tags (https://developers.google.com/kml/documentation/kmlreferencel)
namespace kml
{
GEODATA_EXPORT extern const char kmlTag_nameSpace20[];
......@@ -213,7 +213,7 @@ namespace kml
GEODATA_EXPORT extern const char kmlTag_z[];
// Google KML Extension Namespace (http://code.google.com/apis/kml/documentation/kmlreference.html#kmlextensions)
// Google KML Extension Namespace (https://developers.google.com/kml/documentation/kmlreference#kml-extension-namespace-and-the-gx-prefix)
GEODATA_EXPORT extern const char kmlTag_AnimatedUpdate[];
GEODATA_EXPORT extern const char kmlTag_FlyTo[];
GEODATA_EXPORT extern const char kmlTag_MultiTrack[];
......
......@@ -139,7 +139,7 @@ QList<OsmTagEditorWidgetPrivate::OsmTag> OsmTagEditorWidgetPrivate::recommendedT
QStringList OsmTagEditorWidgetPrivate::generateTagFilter() const
{
// TO DO: implement more dynamic criteria for the filter
// based on https://taginfo.openstreetmap.org/ and http://wiki.openstreetmap.org/wiki/
// based on https://taginfo.openstreetmap.org/ and https://wiki.openstreetmap.org/wiki/
// Contains all keys that should pass through the filter ( eg. { "amenity", "landuse", etc.. } )
QStringList filter;
......
......@@ -147,7 +147,7 @@ void OpenCachingModel::getAdditionalItems( const GeoDataLatLonAltBox& box, const
return;
}
// http://www.opencaching.de/doc/xml/xml11.htm
// https://www.opencaching.de/doc/xml/xml11.htm
const QString openCachingUrl(QLatin1String("http://www.opencaching.de/xml/ocxml11.php") +
QLatin1String("?modifiedsince=") + m_startDate.toString("yyyyMMddhhmmss") +
QLatin1String("&cache=1&cachedesc=1&picture=0&cachelog=1&removedobject=0") +
......
......@@ -87,7 +87,7 @@ QUrl BBCWeatherItem::forecastUrl() const
QString BBCWeatherItem::creditHtml() const
{
return tr( "Supported by <a href=\"http://backstage.bbc.co.uk\" target=\"_BLANK\">backstage.bbc.co.uk</a>.<br>Weather data from UK MET Office" );
return tr( "Supported by <a href=\"https://www.bbc.co.uk/blogs/bbcbackstage\" target=\"_BLANK\">backstage.bbc.co.uk</a>.<br>Weather data from UK MET Office" );
}
#include "moc_BBCWeatherItem.cpp"
......@@ -34,7 +34,7 @@ QString GeoNamesWeatherItem::service() const
QString GeoNamesWeatherItem::creditHtml() const
{
return tr( "Supported by <a href=\"http://www.geonames.org/export/JSON-webservices.html\" target=\"_BLANK\">geonames.org</a>" );
return tr( "Supported by <a href=\"https://www.geonames.org/export/JSON-webservices.html\" target=\"_BLANK\">geonames.org</a>" );
}
#include "moc_GeoNamesWeatherItem.cpp"
......@@ -26,7 +26,7 @@
namespace Marble
{
// Lists all known GPX 1.1 tags (http://www.topografix.com/GPX/1/1/)
// Lists all known GPX 1.1 tags (https://www.topografix.com/GPX/1/1/)
namespace gpx
{
extern const char gpxTag_nameSpace10[];
......
......@@ -16,7 +16,7 @@ namespace osm
{
// OSM data primitives and what they represent
// http://wiki.openstreetmap.org/wiki/Elements
// https://wiki.openstreetmap.org/wiki/Elements
const char osmTag_version06[] = "0.6";
// KML to OSM translators
......
......@@ -154,7 +154,7 @@ bool OsmWay::isAreaTag(const StyleBuilder::OsmTag &keyValue)
{
if (s_areaTags.isEmpty()) {
// All these tags can be found updated at
// http://wiki.openstreetmap.org/wiki/Map_Features#Landuse
// https://wiki.openstreetmap.org/wiki/Map_Features#Landuse
s_areaTags.insert(StyleBuilder::OsmTag(QStringLiteral("natural"), QStringLiteral("water")));
s_areaTags.insert(StyleBuilder::OsmTag(QStringLiteral("natural"), QStringLiteral("wood")));
......
......@@ -27,7 +27,7 @@ namespace Marble
block of relations: ( <relation> ...) 3rd
@endcode
See http://wiki.openstreetmap.org/wiki/OSM_XML#Contents
See https://wiki.openstreetmap.org/wiki/OSM_XML#Contents
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment