From kde-commits Fri Sep 28 19:23:06 2018 From: Yuri Chornoivan Date: Fri, 28 Sep 2018 19:23:06 +0000 To: kde-commits Subject: [marble] /: Fix minor EBN issues and typos Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=153848039927827 Git commit 118bbcbd7fd24d9efb6acfa9fa44a407711c7291 by Yuri Chornoivan. Committed on 28/09/2018 at 19:22. Pushed by yurchor into branch 'master'. Fix minor EBN issues and typos M +1 -1 examples/cpp/marble-game/ClickOnThat.cpp M +1 -1 examples/cpp/marble-game/CountryByShape.cpp M +1 -1 src/3rdparty/sgp4/sgp4io.cpp M +2 -2 src/3rdparty/sgp4/sgp4unit.cpp M +1 -1 src/3rdparty/zlib/zlib.h M +2 -2 src/apps/marble-kde/KdeMainWindow.h M +2 -2 src/apps/marble-qt/QtMainWindow.h M +1 -1 src/lib/astro/astr2lib.cpp M +1 -1 src/lib/astro/astrolib.cpp M +2 -3 src/lib/astro/attlib.cpp M +4 -4 src/lib/astro/eclsolar.cpp M +1 -1 src/lib/astro/planetarySats.cpp M +2 -2 src/lib/astro/solarsystem.cpp M +17 -17 src/lib/astro/solarsystem.h M +1 -1 src/lib/marble/CelestialSortFilterProxyModel.cpp M +1 -1 src/lib/marble/CelestialSortFilterProxyModel.h M +1 -1 src/lib/marble/DataMigration.cpp M +4 -4 src/lib/marble/EditPlacemarkDialog.cpp M +1 -1 src/lib/marble/EquirectScanlineTextureMapper.cpp M +2 -1 src/lib/marble/FlyToEditWidget.cpp M +3 -2 src/lib/marble/GeoUriParser.cpp M +1 -1 src/lib/marble/MapViewItemDelegate.cpp M +1 -1 src/lib/marble/MapViewItemDelegate.h M +1 -1 src/lib/marble/MapViewWidget.cpp M +1 -1 src/lib/marble/MarbleLocale.cpp M +1 -1 src/lib/marble/MarbleMap.h M +1 -1 src/lib/marble/MarbleWidget.h M +6 -6 src/lib/marble/MarbleZipReader.h M +5 -5 src/lib/marble/MarbleZipWriter.h M +3 -3 src/lib/marble/OsmcSymbol.cpp M +1 -1 src/lib/marble/PlaybackSoundCueItem.h M +1 -1 src/lib/marble/PluginManager.cpp M +2 -2 src/lib/marble/RemoteIconLoader.cpp M +2 -3 src/lib/marble/RemoveItemEditWidget.cpp M +3 -0 src/lib/marble/RemoveItemEditWidget.h M +3 -3 src/lib/marble/RenderPlugin.h M +2 -1 src/lib/marble/SoundCueEditWidget.cpp M +2 -1 src/lib/marble/TourControlEditWidget.cpp M +2 -1 src/lib/marble/TourItemDelegate.cpp M +1 -1 src/lib/marble/TourWidget.h M +1 -1 src/lib/marble/VectorTileModel.cpp M +2 -1 src/lib/marble/WaitEditWidget.cpp M +1 -1 src/lib/marble/cloudsync/BookmarkSyncManager.cpp M +2 -2 src/lib/marble/cloudsync/CloudSyncManager.h M +1 -1 src/lib/marble/cloudsync/OwncloudSyncBackend.cpp M +2 -2 src/lib/marble/cloudsync/OwncloudSyncBackend.h M +1 -1 src/lib/marble/declarative/RouteRelationModel.h M +1 -1 src/lib/marble/geodata/data/GeoDataCoordinates.cpp M +1 -1 src/lib/marble/geodata/data/GeoDataExtendedData.h M +3 -2 src/lib/marble/geodata/data/GeoDataIconStyle.cpp M +2 -2 src/lib/marble/geodata/data/GeoDataObject.h M +1 -1 src/lib/marble/geodata/data/GeoDataPlacemark.h M +1 -1 src/lib/marble/geodata/data/GeoDataPolygon.cpp M +1 -4 src/lib/marble/geodata/data/GeoDataSimpleData.cpp M +4 -0 src/lib/marble/geodata/data/GeoDataSimpleData.h M +2 -1 src/lib/marble/geodata/data/GeoDataSimpleField.cpp M +2 -2 src/lib/marble/geodata/graphicsitem/BuildingGraphicsItem.h M +1 -1 src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandle= r.cpp M +1 -1 src/lib/marble/geodata/scene/GeoSceneEquirectTileProjection.h M +1 -1 src/lib/marble/geodata/scene/GeoSceneMercatorTileProjection.h M +2 -1 src/lib/marble/geodata/writers/kml/KmlSchemaDataTagWriter.cpp M +2 -2 src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.c= pp M +5 -6 src/lib/marble/layers/GeometryLayer.cpp M +1 -1 src/lib/marble/layers/PopupLayer.h M +2 -2 src/lib/marble/layers/VectorTileLayer.cpp M +2 -2 src/lib/marble/osm/OsmRelationEditorDialog.cpp M +8 -8 src/lib/marble/osm/OsmRelationManagerWidget.cpp M +10 -10 src/lib/marble/osm/OsmTagEditorWidget.cpp M +1 -1 src/lib/marble/projections/VerticalPerspectiveProjection.cpp M +1 -1 src/lib/marble/routing/RoutingInputWidget.h M +12 -12 src/plugins/render/annotate/AnnotatePlugin.cpp M +1 -1 src/plugins/render/annotate/AreaAnnotation.cpp M +7 -8 src/plugins/render/annotate/DownloadOsmDialog.cpp M +2 -1 src/plugins/render/annotate/DownloadOsmDialog.h M +8 -8 src/plugins/render/annotate/EditPolygonDialog.cpp M +4 -4 src/plugins/render/annotate/EditPolylineDialog.cpp M +1 -1 src/plugins/render/annotate/NodeItemDelegate.cpp M +1 -1 src/plugins/render/annotate/PolylineAnnotation.cpp M +1 -1 src/plugins/render/aprs/AprsGatherer.cpp M +1 -1 src/plugins/render/atmosphere/AtmospherePlugin.cpp M +1 -1 src/plugins/render/eclipses/EclipsesModel.cpp M +1 -1 src/plugins/render/eclipses/EclipsesModel.h M +1 -1 src/plugins/render/eclipses/EclipsesPlugin.cpp M +1 -1 src/plugins/render/elevationprofilefloatitem/ElevationProfil= eFloatItem.h M +1 -1 src/plugins/render/measure/MeasureConfigDialog.cpp M +1 -1 src/plugins/render/panoramio/PanoramioParser.h M +1 -1 src/plugins/render/satellites/SatellitesModel.cpp M +1 -1 src/plugins/render/stars/StarsPlugin.cpp M +2 -2 src/plugins/runner/log/LogPlugin.h M +2 -2 src/plugins/runner/log/LogRunner.h M +1 -1 src/plugins/runner/monav/MonavMap.cpp M +1 -1 src/plugins/runner/nominatim-reversegeocoding/OsmNominatimRe= verseGeocodingRunner.cpp M +2 -2 src/plugins/runner/nominatim-reversegeocoding/OsmNominatimRe= verseGeocodingRunner.h M +2 -2 src/plugins/runner/nominatim-search/OsmNominatimSearchRunner= .h M +2 -2 tests/TestEquality.cpp M +2 -2 tests/TestUtils.h M +2 -2 tools/shp2osm/polyshp2osm.py M +1 -1 tools/tilecreator-srtm2/tccore.cpp M +1 -1 tools/vectorosm-tilecreator/NodeReducer.cpp M +4 -0 tools/vectorosm-tilecreator/PeakAnalyzer.h M +5 -1 tools/vectorosm-tilecreator/SpellChecker.h M +2 -1 tools/vectorosm-tilecreator/TagsFilter.cpp M +3 -3 tools/vectorosm-tilecreator/VectorClipper.h M +2 -1 tools/vectorosm-tilecreator/WayChunk.cpp M +2 -1 tools/vectorosm-tilecreator/WayConcatenator.cpp M +1 -1 tools/vectorosm-tilecreator/WayConcatenator.h M +1 -1 tools/vectorosm-tilecreator/clipper/clipper.cpp https://commits.kde.org/marble/118bbcbd7fd24d9efb6acfa9fa44a407711c7291 diff --git a/examples/cpp/marble-game/ClickOnThat.cpp b/examples/cpp/marble= -game/ClickOnThat.cpp index a0ef76a03..7f0756025 100644 --- a/examples/cpp/marble-game/ClickOnThat.cpp +++ b/examples/cpp/marble-game/ClickOnThat.cpp @@ -74,7 +74,7 @@ public: * we can highlight and zoom in * ( to fit in the current view port ) * to this placemark when user - * choses to view the right answer. + * chooses to view the right answer. */ GeoDataPlacemark *m_correctAnswerPlacemark; GeoDataCoordinates m_correctAnswer; diff --git a/examples/cpp/marble-game/CountryByShape.cpp b/examples/cpp/mar= ble-game/CountryByShape.cpp index 4a138f264..647369dc9 100644 --- a/examples/cpp/marble-game/CountryByShape.cpp +++ b/examples/cpp/marble-game/CountryByShape.cpp @@ -235,7 +235,7 @@ void CountryByShape::postQuestion( QObject *gameObject ) = /** * Now disable the highlight feature so that - * the user click doesn't disturbe the highlight + * the user click doesn't disturb the highlight * we did to ask question. */ = d->m_marbleWidget->setHighlightEnabled( false ); diff --git a/src/3rdparty/sgp4/sgp4io.cpp b/src/3rdparty/sgp4/sgp4io.cpp index ecf92a476..0db25ce1e 100644 --- a/src/3rdparty/sgp4/sgp4io.cpp +++ b/src/3rdparty/sgp4/sgp4io.cpp @@ -93,7 +93,7 @@ void twoline2rv = satrec.error =3D 0; = - // set the implied decimal points since doing a formated read + // set the implied decimal points since doing a formatted read // fixes for bad input data values (missing, ...) for (j =3D 10; j <=3D 15; j++) if (longstr1[j] =3D=3D ' ') diff --git a/src/3rdparty/sgp4/sgp4unit.cpp b/src/3rdparty/sgp4/sgp4unit.cpp index d64a65c84..61f3ee9e3 100644 --- a/src/3rdparty/sgp4/sgp4unit.cpp +++ b/src/3rdparty/sgp4/sgp4unit.cpp @@ -1202,7 +1202,7 @@ static void initl getgravconst( whichconst, tumin, mu, radiusearthkm, xke, j2, j3, j4, = j3oj2 ); x2o3 =3D 2.0 / 3.0; = - /* ------------- calculate auxillary epoch quantities ---------- */ + /* ------------- calculate auxilary epoch quantities ---------- */ eccsq =3D ecco * ecco; omeosq =3D 1.0 - eccsq; rteosq =3D sqrt(omeosq); @@ -2029,7 +2029,7 @@ double gstime * function getgravconst * * this function gets constants for the propagator. note that mu is identi= fied to -* facilitiate comparisons with newer models. the common useage is wgs72. +* facilitiate comparisons with newer models. the common usage is wgs72. * * author : david vallado 719-573-2600 21 jul 20= 06 * diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h index 3e0c7672a..bdc2bedf9 100644 --- a/src/3rdparty/zlib/zlib.h +++ b/src/3rdparty/zlib/zlib.h @@ -848,7 +848,7 @@ ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp = strm, to dictionary. dictionary must have enough space, where 32768 bytes is always enough. If inflateGetDictionary() is called with dictionary equ= al to Z_NULL, then only the dictionary length is returned, and nothing is cop= ied. - Similary, if dictLength is Z_NULL, then it is not set. + Similarily, if dictLength is Z_NULL, then it is not set. = inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the stream state is inconsistent. diff --git a/src/apps/marble-kde/KdeMainWindow.h b/src/apps/marble-kde/KdeM= ainWindow.h index d9c23d938..a39daa2f2 100644 --- a/src/apps/marble-kde/KdeMainWindow.h +++ b/src/apps/marble-kde/KdeMainWindow.h @@ -10,8 +10,8 @@ // = = -#ifndef MARBLE_MAINWINDOW_H -#define MARBLE_MAINWINDOW_H +#ifndef MARBLE_KDEMAINWINDOW_H +#define MARBLE_KDEMAINWINDOW_H = = #include diff --git a/src/apps/marble-qt/QtMainWindow.h b/src/apps/marble-qt/QtMainW= indow.h index 14797271a..6421fd510 100644 --- a/src/apps/marble-qt/QtMainWindow.h +++ b/src/apps/marble-qt/QtMainWindow.h @@ -11,8 +11,8 @@ // = = -#ifndef MARBLE_MAINWINDOW_H -#define MARBLE_MAINWINDOW_H +#ifndef MARBLE_QTMAINWINDOW_H +#define MARBLE_QTMAINWINDOW_H = = #include diff --git a/src/lib/astro/astr2lib.cpp b/src/lib/astro/astr2lib.cpp index a30acd5fe..a48ee5e47 100644 --- a/src/lib/astro/astr2lib.cpp +++ b/src/lib/astro/astr2lib.cpp @@ -18,12 +18,12 @@ Copyright :Gerhard HOLTKAMP 26-MAR-2014 = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D */ = +#include "astr2lib.h" #include using namespace std; = #include "attlib.h" #include "astrolib.h" -#include "astr2lib.h" = extern double frac (double f); extern double atan21 (double y, double x); diff --git a/src/lib/astro/astrolib.cpp b/src/lib/astro/astrolib.cpp index 833de0831..d1525b306 100644 --- a/src/lib/astro/astrolib.cpp +++ b/src/lib/astro/astrolib.cpp @@ -1402,7 +1402,7 @@ Vec3 Sun200::position (double t) // position of the= Sun at time t void Sun200::state (double t, Vec3& rs, Vec3& vs) { /* State vector rs (position) and vs (velocity) of the Sun in - ecliptic of date coordinates at time t (in Julian Centruries + ecliptic of date coordinates at time t (in Julian Centuries since J2000). */ const double p2 =3D 2.0 * M_PI; diff --git a/src/lib/astro/attlib.cpp b/src/lib/astro/attlib.cpp index aaa5dd14b..5bc899bb0 100644 --- a/src/lib/astro/attlib.cpp +++ b/src/lib/astro/attlib.cpp @@ -17,15 +17,14 @@ ***********************************************************************/ = //#include +#include "attlib.h" #include using namespace std; = -#include "attlib.h" - /*********************************************************************/ double atan20 (double y, double x) { - /* redefine atan2 so that it does'nt crash when both x and y are 0 */ + /* redefine atan2 so that it doesn't crash when both x and y are 0 */ double result; = if ((x =3D=3D 0) && (y =3D=3D 0)) result =3D 0; diff --git a/src/lib/astro/eclsolar.cpp b/src/lib/astro/eclsolar.cpp index c63628a50..63a55824a 100644 --- a/src/lib/astro/eclsolar.cpp +++ b/src/lib/astro/eclsolar.cpp @@ -58,7 +58,7 @@ EclSolar::~EclSolar() = double EclSolar::atan23 (double y, double x) { - /* redefine atan2 so that it does'nt crash when both x and y are 0 */ + /* redefine atan2 so that it doesn't crash when both x and y are 0 */ double result; = if ((x =3D=3D 0) && (y =3D=3D 0)) result =3D 0; @@ -725,7 +725,7 @@ void EclSolar::nextEcl() = void EclSolar::previousEcl() { - // select the prevoius eclipse for detailed calculations + // select the previous eclipse for detailed calculations int k, j, es; = if (!eb_moonph_called) moonph(); // calculate the eclipses of the year @@ -861,7 +861,7 @@ void EclSolar::setPenumbraAngle(double pa, int mode) = } = -// -------- auxilliary functions -------------------------------- +// -------- auxilary functions -------------------------------- void EclSolar::GetMonth (int mm, char* mchr) { // get three letter designation of month @@ -1227,7 +1227,7 @@ void EclSolar::moonph() ckphase(minmjd,maxmjd,yr,deltdut, mp25, p25, 0.25); ckphase(minmjd,maxmjd,yr,deltdut, mp5, p5, 0.5); ckphase(minmjd,maxmjd,yr,deltdut, mp75, p75, 0.75); - yr+=3D0.02; // incease by 1/50th of a year (about two weeks) = + yr+=3D0.02; // increase by 1/50th of a year (about two weeks) = }; = for (j=3D0; j #include #include @@ -37,7 +38,6 @@ #include using namespace std; = -#include "solarsystem.h" #include "astrolib.h" #include "astr2lib.h" #include "attlib.h" @@ -58,7 +58,7 @@ SolarSystem::~SolarSystem() = double SolarSystem::atan23 (double y, double x) { - /* redefine atan2 so that it does'nt crash when both x and y are 0 */ + /* redefine atan2 so that it doesn't crash when both x and y are 0 */ double result; = if ((x =3D=3D 0) && (y =3D=3D 0)) result =3D 0; diff --git a/src/lib/astro/solarsystem.h b/src/lib/astro/solarsystem.h index 68efe1412..c7d1ba874 100644 --- a/src/lib/astro/solarsystem.h +++ b/src/lib/astro/solarsystem.h @@ -115,20 +115,20 @@ class ASTROLIB_EXPORT SolarSystem // Calculate Po= sitions of Solar System Bod void getConstVenus(); // Venus planetary constants void getConstEarth(); // Earth planetary constants void getConstMars(); // Mars planetary constants - void getConstJupiter(); // Jupiter planerary constants - void getConstSaturn(); // Saturn planerary constants - void getConstUranus(); // Uranus planerary constants - void getConstNeptune(); // Neptune planerary constants - void getConstIo(); // Io planerary constants - void getConstEuropa(); // Europa planerary constants - void getConstGanymede(); // Ganymede planerary constants - void getConstCallisto(); // Callisto planerary constants - void getConstRhea(); // Rhea planerary constants - void getConstTitan(); // Titan planerary constants - void getConstMimas(); // Mimas planerary constants - void getConstEnceladus(); // Enceladus planerary constants - void getConstDione(); // Dione planerary constants - void getConstUser(); // User planerary constants + void getConstJupiter(); // Jupiter planetary constants + void getConstSaturn(); // Saturn planetary constants + void getConstUranus(); // Uranus planetary constants + void getConstNeptune(); // Neptune planetary constants + void getConstIo(); // Io planetary constants + void getConstEuropa(); // Europa planetary constants + void getConstGanymede(); // Ganymede planetary constants + void getConstCallisto(); // Callisto planetary constants + void getConstRhea(); // Rhea planetary constants + void getConstTitan(); // Titan planetary constants + void getConstMimas(); // Mimas planetary constants + void getConstEnceladus(); // Enceladus planetary constants + void getConstDione(); // Dione planetary constants + void getConstUser(); // User planetary constants = void getPlanMat(); // get Matrix to convert from J2000.0 into planeta= ry coordinates = @@ -136,7 +136,7 @@ class ASTROLIB_EXPORT SolarSystem // Calculate Posi= tions of Solar System Bod = bool ss_update_called; // true if updateSolar() has already been ca= lled bool ss_moon_called; // true if special Moon calculation called - bool ss_planmat_called; // true if matrix for planetary coordintes c= alled + bool ss_planmat_called; // true if matrix for planetary coordinates = called bool ss_kepler_stored; // true if Kepler elements for comet or aste= roid stored bool ss_kepler_called; // true if comet or asteroid position calcul= ated bool ss_user_stored; // true if orbit elements for user defined o= bject stored @@ -170,7 +170,7 @@ class ASTROLIB_EXPORT SolarSystem // Calculate Posi= tions of Solar System Bod double ss_moon_ildisk; // fraction of Moon's illuminated disk double ss_moon_phase; // phase of Moon = - double ss_GM; // graviatational constant (m^3/s^2) + double ss_GM; // gravitational constant (m^3/s^2) double ss_J2; // J2 gravitational term double ss_R0; // equatorial radius (km) double ss_flat; // flattening factor @@ -182,7 +182,7 @@ class ASTROLIB_EXPORT SolarSystem // Calculate Posi= tions of Solar System Bod double ss_Wd; // daily variation of W. = // data for user defined object: - double ss_user_GM; // graviatational constant (m^3/s^2) + double ss_user_GM; // gravitational constant (m^3/s^2) double ss_user_J2; // J2 gravitational term double ss_user_R0; // equatorial radius (km) double ss_user_flat; // flattening factor diff --git a/src/lib/marble/CelestialSortFilterProxyModel.cpp b/src/lib/mar= ble/CelestialSortFilterProxyModel.cpp index 4ac7109dd..b61b77bac 100644 --- a/src/lib/marble/CelestialSortFilterProxyModel.cpp +++ b/src/lib/marble/CelestialSortFilterProxyModel.cpp @@ -9,7 +9,7 @@ // Copyright 2007 Inge Wallin // Copyright 2007 Thomas Zander // Copyright 2010 Bastian Holst -// Coprright 2011-2013 Bernhard Beschow +// Copyright 2011-2013 Bernhard Beschow // Copyright 2012 Illya Kovalevskyy // = diff --git a/src/lib/marble/CelestialSortFilterProxyModel.h b/src/lib/marbl= e/CelestialSortFilterProxyModel.h index db3bf4c4c..bffa8500d 100644 --- a/src/lib/marble/CelestialSortFilterProxyModel.h +++ b/src/lib/marble/CelestialSortFilterProxyModel.h @@ -9,7 +9,7 @@ // Copyright 2007 Inge Wallin // Copyright 2007 Thomas Zander // Copyright 2010 Bastian Holst -// Coprright 2011-2013 Bernhard Beschow +// Copyright 2011-2013 Bernhard Beschow // Copyright 2012 Illya Kovalevskyy // = diff --git a/src/lib/marble/DataMigration.cpp b/src/lib/marble/DataMigratio= n.cpp index 5ca79d875..46184c4a2 100644 --- a/src/lib/marble/DataMigration.cpp +++ b/src/lib/marble/DataMigration.cpp @@ -83,7 +83,7 @@ void DataMigration::moveFiles( const QString& source, con= st QString& target ) // Trying to simply rename the directory. This is the fastest method, = but it is not always // possible. For example when the directories are on different file sy= stems. // If the renaming of the directory is not successful, we have to copy= and delete each - // file separatetly. + // file separately. mDebug() << "Rename" << source << "to" << target; if( !QDir().rename( source, target ) ) { mDebug() << "Simple renaming of the data directory failed. Moving = single files"; diff --git a/src/lib/marble/EditPlacemarkDialog.cpp b/src/lib/marble/EditPl= acemarkDialog.cpp index f6a4cb403..7dd54c6bd 100644 --- a/src/lib/marble/EditPlacemarkDialog.cpp +++ b/src/lib/marble/EditPlacemarkDialog.cpp @@ -153,14 +153,14 @@ EditPlacemarkDialog::EditPlacemarkDialog( GeoDataPlac= emark *placemark, // Adding the osm tag editor widget tab d->m_osmTagEditorWidget =3D new OsmTagEditorWidget( placemark, thi= s ); d->tabWidget->addTab( d->m_osmTagEditorWidget, tr( "Tags" ) ); - QObject::connect( d->m_osmTagEditorWidget, SIGNAL( placemarkChange= d( GeoDataFeature* ) ), - this, SLOT( updateTextAnnotation() ) ); + QObject::connect( d->m_osmTagEditorWidget, SIGNAL(placemarkChanged= (GeoDataFeature*)), + this, SLOT(updateTextAnnotation()) ); = // Adding the osm relation editor widget tab d->m_osmRelationManagerWidget =3D new OsmRelationManagerWidget( pl= acemark, relations, this ); d->tabWidget->addTab( d->m_osmRelationManagerWidget, tr( "Relation= s" ) ); - QObject::connect( d->m_osmRelationManagerWidget, SIGNAL( relationC= reated( const OsmPlacemarkData& ) ), - this, SIGNAL( relationCreated( const OsmPlacemar= kData& ) ) ); + QObject::connect( d->m_osmRelationManagerWidget, SIGNAL(relationCr= eated(OsmPlacemarkData)), + this, SIGNAL(relationCreated(OsmPlacemarkData)) = ); } = // Adding the elevation widget tab diff --git a/src/lib/marble/EquirectScanlineTextureMapper.cpp b/src/lib/mar= ble/EquirectScanlineTextureMapper.cpp index 95e90044b..7c8d41b90 100644 --- a/src/lib/marble/EquirectScanlineTextureMapper.cpp +++ b/src/lib/marble/EquirectScanlineTextureMapper.cpp @@ -164,7 +164,7 @@ void EquirectScanlineTextureMapper::RenderJob::run() const qint64 radius =3D m_viewport->radius(); // Calculate how many degrees are being represented per pixel. const qreal rad2Pixel =3D (qreal)( 2 * radius ) / M_PI; - const float pixel2Rad =3D 1.0/rad2Pixel; // FIXME chainging to qreal = may crash Marble when the equator is visible + const float pixel2Rad =3D 1.0/rad2Pixel; // FIXME changing to qreal m= ay crash Marble when the equator is visible = const bool interlaced =3D ( m_mapQuality =3D=3D LowQuality ); const bool highQuality =3D ( m_mapQuality =3D=3D HighQuality diff --git a/src/lib/marble/FlyToEditWidget.cpp b/src/lib/marble/FlyToEditW= idget.cpp index 1e1f3fd55..52f61ec88 100644 --- a/src/lib/marble/FlyToEditWidget.cpp +++ b/src/lib/marble/FlyToEditWidget.cpp @@ -10,13 +10,14 @@ // Copyright 2014 Illya Kovalevskyy // = +#include "FlyToEditWidget.h" + #include #include #include #include #include = -#include "FlyToEditWidget.h" #include "MarbleWidget.h" #include "geodata/data/GeoDataFlyTo.h" #include "GeoDataLookAt.h" diff --git a/src/lib/marble/GeoUriParser.cpp b/src/lib/marble/GeoUriParser.= cpp index 4a84684e0..c01a04e1a 100644 --- a/src/lib/marble/GeoUriParser.cpp +++ b/src/lib/marble/GeoUriParser.cpp @@ -8,13 +8,14 @@ // Copyright 2014 Levente Kurusa // = +#include "GeoUriParser.h" + #include #include #include = #include "Planet.h" #include "PlanetFactory.h" -#include "GeoUriParser.h" #include "MarbleDebug.h" = namespace Marble { @@ -93,7 +94,7 @@ bool GeoUriParser::parse() } ++i; } else if (geoUriRegexp.capturedTexts()[i] =3D=3D QLatin1S= tring("u")) { - mDebug() << "Captured uncertainity parameter, but this= is not supported by Marble (yet)."; + mDebug() << "Captured uncertainty parameter, but this = is not supported by Marble (yet)."; ++i; } } diff --git a/src/lib/marble/MapViewItemDelegate.cpp b/src/lib/marble/MapVie= wItemDelegate.cpp index 31d7a619c..01e4746ba 100644 --- a/src/lib/marble/MapViewItemDelegate.cpp +++ b/src/lib/marble/MapViewItemDelegate.cpp @@ -9,7 +9,7 @@ // Copyright 2007 Inge Wallin // Copyright 2007 Thomas Zander // Copyright 2010 Bastian Holst -// Coprright 2011-2013 Bernhard Beschow +// Copyright 2011-2013 Bernhard Beschow // Copyright 2012 Illya Kovalevskyy // = diff --git a/src/lib/marble/MapViewItemDelegate.h b/src/lib/marble/MapViewI= temDelegate.h index 008183ebf..79002958d 100644 --- a/src/lib/marble/MapViewItemDelegate.h +++ b/src/lib/marble/MapViewItemDelegate.h @@ -9,7 +9,7 @@ // Copyright 2007 Inge Wallin // Copyright 2007 Thomas Zander // Copyright 2010 Bastian Holst -// Coprright 2011-2013 Bernhard Beschow +// Copyright 2011-2013 Bernhard Beschow // Copyright 2012 Illya Kovalevskyy // = diff --git a/src/lib/marble/MapViewWidget.cpp b/src/lib/marble/MapViewWidge= t.cpp index 3ab399a5f..c572c7891 100644 --- a/src/lib/marble/MapViewWidget.cpp +++ b/src/lib/marble/MapViewWidget.cpp @@ -9,7 +9,7 @@ // Copyright 2007 Inge Wallin // Copyright 2007 Thomas Zander // Copyright 2010 Bastian Holst -// Coprright 2011-2013 Bernhard Beschow +// Copyright 2011-2013 Bernhard Beschow // Copyright 2012 Illya Kovalevskyy // = diff --git a/src/lib/marble/MarbleLocale.cpp b/src/lib/marble/MarbleLocale.= cpp index daa0fd8ec..9f8d83d45 100644 --- a/src/lib/marble/MarbleLocale.cpp +++ b/src/lib/marble/MarbleLocale.cpp @@ -9,9 +9,9 @@ // Copyright 2015 Ilya Kowalewski // = -#include "MarbleGlobal.h" #include "MarbleLocale.h" #include "MarbleLocale_p.h" +#include "MarbleGlobal.h" #include "MarbleDebug.h" = // Qt diff --git a/src/lib/marble/MarbleMap.h b/src/lib/marble/MarbleMap.h index a10b9f29a..8717390c2 100644 --- a/src/lib/marble/MarbleMap.h +++ b/src/lib/marble/MarbleMap.h @@ -547,7 +547,7 @@ class MARBLE_EXPORT MarbleMap : public QObject = /** * @brief Set the globe locked to the sub solar point - * @param vsible if globe is locked to the sub solar point + * @param visible if globe is locked to the sub solar point */ void setLockToSubSolarPoint( bool visible ); = diff --git a/src/lib/marble/MarbleWidget.h b/src/lib/marble/MarbleWidget.h index 26420aa94..c0d995f2e 100644 --- a/src/lib/marble/MarbleWidget.h +++ b/src/lib/marble/MarbleWidget.h @@ -836,7 +836,7 @@ class MARBLE_EXPORT MarbleWidget : public QWidget = /** * @brief Set the globe locked to the sub solar point - * @param vsible if globe is locked to the sub solar point + * @param visible if globe is locked to the sub solar point */ void setLockToSubSolarPoint( bool visible ); = diff --git a/src/lib/marble/MarbleZipReader.h b/src/lib/marble/MarbleZipRea= der.h index 16e77b596..9dd360932 100644 --- a/src/lib/marble/MarbleZipReader.h +++ b/src/lib/marble/MarbleZipReader.h @@ -51,8 +51,8 @@ ** **************************************************************************= **/ = -#ifndef QZIPREADER_H -#define QZIPREADER_H +#ifndef MARBLEZIPREADER_H +#define MARBLEZIPREADER_H = #ifndef QT_NO_TEXTODFWRITER = @@ -67,9 +67,9 @@ // We mean it. // = -#include -#include -#include +#include +#include +#include = #include = @@ -135,4 +135,4 @@ private: } = #endif // QT_NO_TEXTODFWRITER -#endif // QZIPREADER_H +#endif // MARBLEZIPREADER_H diff --git a/src/lib/marble/MarbleZipWriter.h b/src/lib/marble/MarbleZipWri= ter.h index a3cb4340b..b2613b577 100644 --- a/src/lib/marble/MarbleZipWriter.h +++ b/src/lib/marble/MarbleZipWriter.h @@ -49,8 +49,8 @@ ** $QT_END_LICENSE$ ** **************************************************************************= **/ -#ifndef QZIPWRITER_H -#define QZIPWRITER_H +#ifndef MARBLEZIPWRITER_H +#define MARBLEZIPWRITER_H #ifndef QT_NO_TEXTODFWRITER = // @@ -64,8 +64,8 @@ // We mean it. // = -#include -#include +#include +#include = #include = @@ -126,4 +126,4 @@ private: } = #endif // QT_NO_TEXTODFWRITER -#endif // QZIPWRITER_H +#endif // MARBLEZIPWRITER_H diff --git a/src/lib/marble/OsmcSymbol.cpp b/src/lib/marble/OsmcSymbol.cpp index 2830064f8..e529675f0 100644 --- a/src/lib/marble/OsmcSymbol.cpp +++ b/src/lib/marble/OsmcSymbol.cpp @@ -8,13 +8,13 @@ // Copyright 2017 Sergey Popov // = +#include "OsmcSymbol.h" + #include #include #include #include = -#include "OsmcSymbol.h" - OsmcSymbol::OsmcSymbol(const QString &tag, int size) : m_wayColor(Qt::white) , m_backgroundColor(Qt::black) @@ -155,7 +155,7 @@ QSvgRenderer* OsmcSymbol::parseForeground(const QString= &fg) QDomDocument doc; doc.setContent(baData); = - // Recurively change color + // Recursively change color QDomElement rootElement =3D doc.documentElement(); setXMLAttribute(rootElement, "path", "fill", color); = diff --git a/src/lib/marble/PlaybackSoundCueItem.h b/src/lib/marble/Playbac= kSoundCueItem.h index fb1e10a31..43d65d64b 100644 --- a/src/lib/marble/PlaybackSoundCueItem.h +++ b/src/lib/marble/PlaybackSoundCueItem.h @@ -13,7 +13,7 @@ = #include "PlaybackItem.h" = -#include "config-phonon.h" +#include = #ifdef HAVE_PHONON #include diff --git a/src/lib/marble/PluginManager.cpp b/src/lib/marble/PluginManage= r.cpp index 3ba331b9a..18c732dd6 100644 --- a/src/lib/marble/PluginManager.cpp +++ b/src/lib/marble/PluginManager.cpp @@ -28,7 +28,7 @@ #include "ReverseGeocodingRunnerPlugin.h" #include "RoutingRunnerPlugin.h" #include "SearchRunnerPlugin.h" -#include "config-marble.h" +#include = namespace Marble { diff --git a/src/lib/marble/RemoteIconLoader.cpp b/src/lib/marble/RemoteIco= nLoader.cpp index 741db546c..1b3deb45b 100644 --- a/src/lib/marble/RemoteIconLoader.cpp +++ b/src/lib/marble/RemoteIconLoader.cpp @@ -8,6 +8,8 @@ // Copyright 2014 Abhinav Gangwar // = +#include "RemoteIconLoader.h" + // Qt #include #include @@ -19,8 +21,6 @@ #include = // Marble -#include "RemoteIconLoader.h" - #include "HttpDownloadManager.h" #include "FileStoragePolicy.h" #include "MarbleDirs.h" diff --git a/src/lib/marble/RemoveItemEditWidget.cpp b/src/lib/marble/Remov= eItemEditWidget.cpp index f5944a142..b67ad8c4a 100644 --- a/src/lib/marble/RemoveItemEditWidget.cpp +++ b/src/lib/marble/RemoveItemEditWidget.cpp @@ -8,12 +8,11 @@ // Copyright 2015 Mihail Ivchenko // = -#include +#include "RemoveItemEditWidget.h" + #include #include -#include = -#include "RemoveItemEditWidget.h" #include "MarbleWidget.h" #include "geodata/data/GeoDataAnimatedUpdate.h" #include "GeoDataUpdate.h" diff --git a/src/lib/marble/RemoveItemEditWidget.h b/src/lib/marble/RemoveI= temEditWidget.h index e96897971..02b6d35df 100644 --- a/src/lib/marble/RemoveItemEditWidget.h +++ b/src/lib/marble/RemoveItemEditWidget.h @@ -12,6 +12,9 @@ #define REMOVEITEMEDITWIDGET_H = #include +#include +#include +#include = class QToolButton; class QComboBox; diff --git a/src/lib/marble/RenderPlugin.h b/src/lib/marble/RenderPlugin.h index 8ccbad4dc..3ee001741 100644 --- a/src/lib/marble/RenderPlugin.h +++ b/src/lib/marble/RenderPlugin.h @@ -204,7 +204,7 @@ class MARBLE_EXPORT RenderPlugin : public QObject, publ= ic RenderPluginInterface = public Q_SLOTS: /** - * @brief settting enabled + * @brief setting enabled * * If @p enabled =3D true, plugin will be enabled * @@ -217,7 +217,7 @@ class MARBLE_EXPORT RenderPlugin : public QObject, publ= ic RenderPluginInterface void setEnabled( bool enabled ); = /** - * @brief settting visible + * @brief setting visible * * If @p visible =3D true, plugin will be visible * @@ -227,7 +227,7 @@ class MARBLE_EXPORT RenderPlugin : public QObject, publ= ic RenderPluginInterface void setVisible( bool visible ); = /** - * @brief settting user checkable + * @brief setting user checkable * * If @p isUserCheckable =3D true, user will get an * option to control visibility in application menu diff --git a/src/lib/marble/SoundCueEditWidget.cpp b/src/lib/marble/SoundCu= eEditWidget.cpp index 0dd5433c4..8f7bc0874 100644 --- a/src/lib/marble/SoundCueEditWidget.cpp +++ b/src/lib/marble/SoundCueEditWidget.cpp @@ -10,13 +10,14 @@ // Copyright 2014 Illya Kovalevskyy // = +#include "SoundCueEditWidget.h" + #include #include #include #include #include = -#include "SoundCueEditWidget.h" #include "MarbleWidget.h" #include "geodata/data/GeoDataSoundCue.h" #include "MarblePlacemarkModel.h" diff --git a/src/lib/marble/TourControlEditWidget.cpp b/src/lib/marble/Tour= ControlEditWidget.cpp index d9983d462..c3cc9a990 100644 --- a/src/lib/marble/TourControlEditWidget.cpp +++ b/src/lib/marble/TourControlEditWidget.cpp @@ -10,12 +10,13 @@ // Copyright 2014 Illya Kovalevskyy // = +#include "TourControlEditWidget.h" + #include #include #include #include = -#include "TourControlEditWidget.h" #include "MarblePlacemarkModel.h" #include "GeoDataTourControl.h" = diff --git a/src/lib/marble/TourItemDelegate.cpp b/src/lib/marble/TourItemD= elegate.cpp index 421b2a5a9..fb1475536 100644 --- a/src/lib/marble/TourItemDelegate.cpp +++ b/src/lib/marble/TourItemDelegate.cpp @@ -10,6 +10,8 @@ // Copyright 2014 Illya Kovalevskyy // = +#include "TourItemDelegate.h" + #include #include #include @@ -17,7 +19,6 @@ #include #include = -#include "TourItemDelegate.h" #include "MarblePlacemarkModel.h" #include "geodata/data/GeoDataContainer.h" #include "geodata/data/GeoDataFlyTo.h" diff --git a/src/lib/marble/TourWidget.h b/src/lib/marble/TourWidget.h index e645b3985..1866f69b4 100644 --- a/src/lib/marble/TourWidget.h +++ b/src/lib/marble/TourWidget.h @@ -48,7 +48,7 @@ public Q_SLOTS: void stopPlaying(); void handleSliderMove( int ); /** - * Highlights the item curently being played. + * Highlights the item currently being played. */ void setHighlightedItemIndex( int index ); = diff --git a/src/lib/marble/VectorTileModel.cpp b/src/lib/marble/VectorTile= Model.cpp index ddc707341..7f7f28b00 100644 --- a/src/lib/marble/VectorTileModel.cpp +++ b/src/lib/marble/VectorTileModel.cpp @@ -207,7 +207,7 @@ void VectorTileModel::queryTiles(int tileZoomLevel, con= st QRect &rect) if (!m_documents.contains(tileId) && !m_pendingDocuments.conta= ins(tileId)) { m_pendingDocuments << tileId; TileRunner *job =3D new TileRunner(m_loader, m_layer, tile= Id); - connect(job, SIGNAL(documentLoaded(TileId, GeoDataDocument= *)), this, SLOT(updateTile(TileId, GeoDataDocument*))); + connect(job, SIGNAL(documentLoaded(TileId,GeoDataDocument*= )), this, SLOT(updateTile(TileId,GeoDataDocument*))); m_threadPool->start(job); } } diff --git a/src/lib/marble/WaitEditWidget.cpp b/src/lib/marble/WaitEditWid= get.cpp index d43e66e5d..4fc1588eb 100644 --- a/src/lib/marble/WaitEditWidget.cpp +++ b/src/lib/marble/WaitEditWidget.cpp @@ -10,12 +10,13 @@ // Copyright 2014 Illya Kovalevskyy // = +#include "WaitEditWidget.h" + #include #include #include #include = -#include "WaitEditWidget.h" #include "MarblePlacemarkModel.h" #include "GeoDataTourControl.h" #include "geodata/data/GeoDataWait.h" diff --git a/src/lib/marble/cloudsync/BookmarkSyncManager.cpp b/src/lib/mar= ble/cloudsync/BookmarkSyncManager.cpp index a36c1a9a7..52c4c4d28 100644 --- a/src/lib/marble/cloudsync/BookmarkSyncManager.cpp +++ b/src/lib/marble/cloudsync/BookmarkSyncManager.cpp @@ -117,7 +117,7 @@ public: = /** * Removes all KMLs in the cache except the - * one with yougnest timestamp. + * one with youngest timestamp. */ void clearCache(); = diff --git a/src/lib/marble/cloudsync/CloudSyncManager.h b/src/lib/marble/c= loudsync/CloudSyncManager.h index f40bcf872..937c6e227 100644 --- a/src/lib/marble/cloudsync/CloudSyncManager.h +++ b/src/lib/marble/cloudsync/CloudSyncManager.h @@ -46,13 +46,13 @@ public: enum Status { Unknown, Success, Error }; = /** - * Getter for offine mode. + * Getter for offline mode. * @return true if offline mode enabled */ bool workOffline() const; = /** - * Setter for offine mode. + * Setter for offline mode. * @param offline Status of offline mode */ void setWorkOffline( bool offline ); diff --git a/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp b/src/lib/mar= ble/cloudsync/OwncloudSyncBackend.cpp index 8675f75d9..83fa1c26b 100644 --- a/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp +++ b/src/lib/marble/cloudsync/OwncloudSyncBackend.cpp @@ -325,7 +325,7 @@ void OwncloudSyncBackend::checkAuthReply() d->m_cloudSyncManager->setStatus( tr( "The server is not an ow= nCloud server" ), CloudSyncManager::Error); } } else if (result =3D=3D QLatin1String("{\"message\":\"Current user is= not logged in\"}") && statusCode =3D=3D 401) { - // credientials were incorrect + // credentials were incorrect d->m_cloudSyncManager->setStatus( tr( "Username or password are in= correct" ), CloudSyncManager::Error); } else if ( result.contains("\"status\":\"success\"") && statusCode = =3D=3D 200 ) { // credentials were correct diff --git a/src/lib/marble/cloudsync/OwncloudSyncBackend.h b/src/lib/marbl= e/cloudsync/OwncloudSyncBackend.h index 18bc7f0cf..6759d2445 100644 --- a/src/lib/marble/cloudsync/OwncloudSyncBackend.h +++ b/src/lib/marble/cloudsync/OwncloudSyncBackend.h @@ -34,7 +34,7 @@ public: /** * Generates an endpoint URL by appending endpoint name to API URL * @param endpoint Endpoint name which will be appended to API URL - * @return QUrl which can be used for ineractions with API + * @return QUrl which can be used for interactions with API */ QUrl endpointUrl( const QString &endpoint ) const; = @@ -42,7 +42,7 @@ public: * Generates an endpoint URL by appending endpoint name and parameter = to API URL * @param endpoint Endpoint name which will be appended to API URL * @param parameter Parameter which will be appended to API URL right = after endpoint - * @return QUrl which can be used for ineractions with API + * @return QUrl which can be used for interactions with API */ QUrl endpointUrl( const QString &endpoint, const QString ¶meter ) = const; = diff --git a/src/lib/marble/declarative/RouteRelationModel.h b/src/lib/marb= le/declarative/RouteRelationModel.h index 7fb06578a..0f868704d 100644 --- a/src/lib/marble/declarative/RouteRelationModel.h +++ b/src/lib/marble/declarative/RouteRelationModel.h @@ -37,7 +37,7 @@ public: RouteVisible }; = - RouteRelationModel(QObject* parent =3D nullptr); + explicit RouteRelationModel(QObject* parent =3D nullptr); = void setRelations(const QSet &relations); = diff --git a/src/lib/marble/geodata/data/GeoDataCoordinates.cpp b/src/lib/m= arble/geodata/data/GeoDataCoordinates.cpp index 3954d560e..99b4ffd7f 100644 --- a/src/lib/marble/geodata/data/GeoDataCoordinates.cpp +++ b/src/lib/marble/geodata/data/GeoDataCoordinates.cpp @@ -1005,7 +1005,7 @@ QPointF GeoDataCoordinatesPrivate::mapLonLatToXY( qre= al lambda, qreal phi, qreal const qreal ep2 =3D (qPow(GeoDataCoordinatesPrivate::sm_semiMajorAxis,= 2.0) - qPow(GeoDataCoordinatesPrivate::sm_semiMinorAxis, 2.0)) / qPow(GeoDataCoordinatesPrivate::sm_semiMinorAxis, 2.= 0); = - // Precalculate the square of nu, just an auxiliar quantity + // Precalculate the square of nu, just an auxilar quantity const qreal nu2 =3D ep2 * qPow(qCos(phi), 2.0); = // Precalculate the radius of curvature in prime vertical diff --git a/src/lib/marble/geodata/data/GeoDataExtendedData.h b/src/lib/ma= rble/geodata/data/GeoDataExtendedData.h index 7d6d9ae91..e03590a19 100644 --- a/src/lib/marble/geodata/data/GeoDataExtendedData.h +++ b/src/lib/marble/geodata/data/GeoDataExtendedData.h @@ -82,7 +82,7 @@ class GEODATA_EXPORT GeoDataExtendedData : public GeoData= Object int size( ) const; = /** - * @brief return wthethe QHash is empty or not + * @brief return whether QHash is empty or not */ bool isEmpty( ) const; = diff --git a/src/lib/marble/geodata/data/GeoDataIconStyle.cpp b/src/lib/mar= ble/geodata/data/GeoDataIconStyle.cpp index 0bd460999..703bb2691 100644 --- a/src/lib/marble/geodata/data/GeoDataIconStyle.cpp +++ b/src/lib/marble/geodata/data/GeoDataIconStyle.cpp @@ -9,9 +9,10 @@ // = = +#include "GeoDataIconStyle.h" + #include = -#include "GeoDataIconStyle.h" #include "MarbleDirs.h" #include "MarbleDebug.h" #include "RemoteIconLoader.h" @@ -178,7 +179,7 @@ void GeoDataIconStyle::setIconPath( const QString& file= name ) /** * Set the m_icon to be a default-constructed icon * so that m_icon is null and icon() doesn't return - * prevously loaded icon. + * previously loaded icon. */ d->m_icon =3D QImage(); d->m_scaledIcon =3D QImage(); diff --git a/src/lib/marble/geodata/data/GeoDataObject.h b/src/lib/marble/g= eodata/data/GeoDataObject.h index 1e4dce926..77b8eb35e 100644 --- a/src/lib/marble/geodata/data/GeoDataObject.h +++ b/src/lib/marble/geodata/data/GeoDataObject.h @@ -106,7 +106,7 @@ public: * If node is 0 then it will also return 0. * * @param node pointer to GeoNode object to be casted - * @return the given node as type T if cast is successfull, otherwise 0 + * @return the given node as type T if cast is successful, otherwise 0 */ template T *geodata_cast(GeoNode *node) @@ -127,7 +127,7 @@ T *geodata_cast(GeoNode *node) * If node is 0 then it will also return 0. * * @param node pointer to GeoNode object to be casted - * @return the given node as type const T if cast is successfull, otherwis= e 0 + * @return the given node as type const T if cast is successful, otherwise= 0 */ template const T *geodata_cast(const GeoNode *node) diff --git a/src/lib/marble/geodata/data/GeoDataPlacemark.h b/src/lib/marbl= e/geodata/data/GeoDataPlacemark.h index c223732d8..fc9abb560 100644 --- a/src/lib/marble/geodata/data/GeoDataPlacemark.h +++ b/src/lib/marble/geodata/data/GeoDataPlacemark.h @@ -212,7 +212,7 @@ class GEODATA_EXPORT GeoDataPlacemark: public GeoDataFe= ature //OSM building Building, = - // OpenStreetMap category Accomodation + // OpenStreetMap category Accommodation AccomodationCamping, AccomodationHostel, AccomodationHotel, diff --git a/src/lib/marble/geodata/data/GeoDataPolygon.cpp b/src/lib/marbl= e/geodata/data/GeoDataPolygon.cpp index 96b669e32..fddb97c6e 100644 --- a/src/lib/marble/geodata/data/GeoDataPolygon.cpp +++ b/src/lib/marble/geodata/data/GeoDataPolygon.cpp @@ -10,9 +10,9 @@ // = = -#include "GeoDataCoordinates.h" #include "GeoDataPolygon.h" #include "GeoDataPolygon_p.h" +#include "GeoDataCoordinates.h" #include "GeoDataTypes.h" #include "MarbleDebug.h" = diff --git a/src/lib/marble/geodata/data/GeoDataSimpleData.cpp b/src/lib/ma= rble/geodata/data/GeoDataSimpleData.cpp index 92d0cf0f7..a526caaee 100644 --- a/src/lib/marble/geodata/data/GeoDataSimpleData.cpp +++ b/src/lib/marble/geodata/data/GeoDataSimpleData.cpp @@ -8,12 +8,9 @@ // Copyright 2014 Abhinav Gangwar // = -// Qt -#include -#include +#include "GeoDataSimpleData.h" = // Marble -#include "GeoDataSimpleData.h" #include "GeoDataTypes.h" = namespace Marble diff --git a/src/lib/marble/geodata/data/GeoDataSimpleData.h b/src/lib/marb= le/geodata/data/GeoDataSimpleData.h index 4cecd79b3..fc54e8956 100644 --- a/src/lib/marble/geodata/data/GeoDataSimpleData.h +++ b/src/lib/marble/geodata/data/GeoDataSimpleData.h @@ -14,6 +14,10 @@ #include "GeoDocument.h" #include "geodata_export.h" = +// Qt +#include +#include + class QString; = namespace Marble diff --git a/src/lib/marble/geodata/data/GeoDataSimpleField.cpp b/src/lib/m= arble/geodata/data/GeoDataSimpleField.cpp index 4b886a66c..6a766b2b5 100644 --- a/src/lib/marble/geodata/data/GeoDataSimpleField.cpp +++ b/src/lib/marble/geodata/data/GeoDataSimpleField.cpp @@ -8,12 +8,13 @@ // Copyright 2014 Abhinav Gangwar // = +#include "GeoDataSimpleField.h" + // Qt #include #include = // Marble -#include "GeoDataSimpleField.h" #include "GeoDataTypes.h" = = diff --git a/src/lib/marble/geodata/graphicsitem/BuildingGraphicsItem.h b/s= rc/lib/marble/geodata/graphicsitem/BuildingGraphicsItem.h index bc6801dba..869d8ad09 100644 --- a/src/lib/marble/geodata/graphicsitem/BuildingGraphicsItem.h +++ b/src/lib/marble/geodata/graphicsitem/BuildingGraphicsItem.h @@ -8,8 +8,8 @@ // Copyright 2011 Konstantin Oblaukhov // = -#ifndef MARBLE_BUILDINGGEOPOLYGONGRAPHICSITEM_H -#define MARBLE_BUILDINGGEOPOLYGONGRAPHICSITEM_H +#ifndef MARBLE_BUILDINGGRAPHICSITEM_H +#define MARBLE_BUILDINGGRAPHICSITEM_H = #include "AbstractGeoPolygonGraphicsItem.h" #include "GeoDataCoordinates.h" diff --git a/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.= cpp b/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.cpp index 033b101c7..048cf3aa0 100644 --- a/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.cpp +++ b/src/lib/marble/geodata/handlers/kml/KmlListItemTypeTagHandler.cpp @@ -43,7 +43,7 @@ GeoNode* KmllistItemTypeTagHandler::parse( GeoParser& par= ser ) const } else { - mDebug() << "listItemType value is inavlid" + mDebug() << "listItemType value is invalid" << "falling back to default - check"; } parentItem.nodeAs()->setListItemType( type ); diff --git a/src/lib/marble/geodata/scene/GeoSceneEquirectTileProjection.h = b/src/lib/marble/geodata/scene/GeoSceneEquirectTileProjection.h index 187da69bf..ee165c51f 100644 --- a/src/lib/marble/geodata/scene/GeoSceneEquirectTileProjection.h +++ b/src/lib/marble/geodata/scene/GeoSceneEquirectTileProjection.h @@ -28,7 +28,7 @@ namespace Marble { = /** - * Convertes the x and y indizes of tiles to and from geo coordinates. + * Converts the x and y indices of tiles to and from geo coordinates. * For tiles of maps in Equirectangular projection. * * Tiles do have the same width and the same height per zoomlevel. diff --git a/src/lib/marble/geodata/scene/GeoSceneMercatorTileProjection.h = b/src/lib/marble/geodata/scene/GeoSceneMercatorTileProjection.h index 232759f91..cdd3d5fac 100644 --- a/src/lib/marble/geodata/scene/GeoSceneMercatorTileProjection.h +++ b/src/lib/marble/geodata/scene/GeoSceneMercatorTileProjection.h @@ -28,7 +28,7 @@ namespace Marble { = /** - * Convertes the x and y indizes of tiles to and from geo coordinates. + * Converts the x and y indices of tiles to and from geo coordinates. * For tiles of maps in Mercator projection. * * Tiles do have the same width and the same height per zoomlevel. diff --git a/src/lib/marble/geodata/writers/kml/KmlSchemaDataTagWriter.cpp = b/src/lib/marble/geodata/writers/kml/KmlSchemaDataTagWriter.cpp index ae77edaf0..ad13f92c2 100644 --- a/src/lib/marble/geodata/writers/kml/KmlSchemaDataTagWriter.cpp +++ b/src/lib/marble/geodata/writers/kml/KmlSchemaDataTagWriter.cpp @@ -8,9 +8,10 @@ // Copyright 2014 Abhinav Gangwar // = +#include "KmlSchemaDataTagWriter.h" + #include = -#include "KmlSchemaDataTagWriter.h" #include "KmlElementDictionary.h" = #include "GeoWriter.h" diff --git a/src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.cpp= b/src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.cpp index 2c5b9c839..f5883548f 100644 --- a/src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.cpp +++ b/src/lib/marble/geodata/writers/kml/KmlSimpleFieldTagWriter.cpp @@ -8,10 +8,10 @@ // Copyright 2014 Abhinav Gangwar // = -#include - #include "KmlSimpleFieldTagWriter.h" = +#include + #include "GeoDataTypes.h" #include "GeoWriter.h" #include "KmlElementDictionary.h" diff --git a/src/lib/marble/layers/GeometryLayer.cpp b/src/lib/marble/layer= s/GeometryLayer.cpp index 0c83996b3..d4e94a29b 100644 --- a/src/lib/marble/layers/GeometryLayer.cpp +++ b/src/lib/marble/layers/GeometryLayer.cpp @@ -51,7 +51,6 @@ #include #include "StyleBuilder.h" #include "AbstractGeoPolygonGraphicsItem.h" -#include "GeoLineStringGraphicsItem.h" #include "GeoDataRelation.h" = // Qt @@ -141,12 +140,12 @@ GeometryLayer::GeometryLayer(const QAbstractItemModel= *model, const StyleBuilder d->createGraphicsItems(object->parent()); } = - connect(model, SIGNAL(dataChanged(QModelIndex, QModelIndex)), + connect(model, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(resetCacheData())); - connect(model, SIGNAL(rowsInserted(QModelIndex, int, int)), - this, SLOT(addPlacemarks(QModelIndex, int, int))); - connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), - this, SLOT(removePlacemarks(QModelIndex, int, int))); + connect(model, SIGNAL(rowsInserted(QModelIndex,int,int)), + this, SLOT(addPlacemarks(QModelIndex,int,int))); + connect(model, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), + this, SLOT(removePlacemarks(QModelIndex,int,int))); connect(model, SIGNAL(modelReset()), this, SLOT(resetCacheData())); connect(this, SIGNAL(highlightedPlacemarksChanged(QVector)), diff --git a/src/lib/marble/layers/PopupLayer.h b/src/lib/marble/layers/Pop= upLayer.h index df26fec9c..12193cb3e 100644 --- a/src/lib/marble/layers/PopupLayer.h +++ b/src/lib/marble/layers/PopupLayer.h @@ -99,7 +99,7 @@ public: * * @see PopupItem::setUrl(); * - * @param url url for web brower + * @param url url for web browser */ void setUrl( const QUrl &url ); = diff --git a/src/lib/marble/layers/VectorTileLayer.cpp b/src/lib/marble/lay= ers/VectorTileLayer.cpp index 8f2b8cc7c..12d34803e 100644 --- a/src/lib/marble/layers/VectorTileLayer.cpp +++ b/src/lib/marble/layers/VectorTileLayer.cpp @@ -113,7 +113,7 @@ VectorTileLayer::VectorTileLayer(HttpDownloadManager *d= ownloadManager, qRegisterMetaType("TileId"); qRegisterMetaType("GeoDataDocument*"); = - connect(&d->m_loader, SIGNAL(tileCompleted(TileId, GeoDataDocument*)),= this, SLOT(updateTile(TileId, GeoDataDocument*))); + connect(&d->m_loader, SIGNAL(tileCompleted(TileId,GeoDataDocument*)), = this, SLOT(updateTile(TileId,GeoDataDocument*))); } = VectorTileLayer::~VectorTileLayer() @@ -197,7 +197,7 @@ void VectorTileLayer::setMapTheme(const QVectorm_layerSettings =3D textureLayerSettings; = if (d->m_layerSettings) { - connect(d->m_layerSettings, SIGNAL(valueChanged(QString, bool)), + connect(d->m_layerSettings, SIGNAL(valueChanged(QString,bool)), this, SLOT(updateLayerSettings())); } = diff --git a/src/lib/marble/osm/OsmRelationEditorDialog.cpp b/src/lib/marbl= e/osm/OsmRelationEditorDialog.cpp index 76eacd373..c7457e934 100644 --- a/src/lib/marble/osm/OsmRelationEditorDialog.cpp +++ b/src/lib/marble/osm/OsmRelationEditorDialog.cpp @@ -62,8 +62,8 @@ OsmRelationEditorDialog::OsmRelationEditorDialog( OsmPlac= emarkData *relationData m_buttonBox =3D new QDialogButtonBox( QDialogButtonBox::Ok | QDialogBu= ttonBox::Cancel, this ); layout->addWidget( m_buttonBox ); = - QObject::connect( m_buttonBox, SIGNAL( accepted() ), - this, SLOT( checkFields() ) ); + QObject::connect( m_buttonBox, SIGNAL(accepted()), + this, SLOT(checkFields()) ); connect(m_buttonBox, SIGNAL(rejected()), SLOT(reject())); } = diff --git a/src/lib/marble/osm/OsmRelationManagerWidget.cpp b/src/lib/marb= le/osm/OsmRelationManagerWidget.cpp index b92220d59..3711ea0c8 100644 --- a/src/lib/marble/osm/OsmRelationManagerWidget.cpp +++ b/src/lib/marble/osm/OsmRelationManagerWidget.cpp @@ -49,14 +49,14 @@ OsmRelationManagerWidget::OsmRelationManagerWidget( Geo= DataPlacemark *placemark, d->m_addRelation->setMenu( d->m_relationDropMenu ); d->populateDropMenu(); = - QObject::connect( d->m_currentRelations, SIGNAL( itemDoubleClicked( QT= reeWidgetItem*, int ) ), - this, SLOT( handleDoubleClick(QTreeWidgetItem*,int) = ) ); - QObject::connect( d->m_currentRelations, SIGNAL( customContextMenuRequ= ested( QPoint ) ), - this, SLOT( handleRelationContextMenuRequest( QPoint= ) ) ); - QObject::connect( d->m_relationDropMenu, SIGNAL( triggered( QAction* )= ), - this, SLOT( addRelation( QAction* ) ) ); - QObject::connect( d->m_currentRelations, SIGNAL( itemChanged(QTreeWidg= etItem*,int) ), - this, SLOT( handleItemChange( QTreeWidgetItem*,int )= ) ); + QObject::connect( d->m_currentRelations, SIGNAL(itemDoubleClicked(QTre= eWidgetItem*,int)), + this, SLOT(handleDoubleClick(QTreeWidgetItem*,int)) = ); + QObject::connect( d->m_currentRelations, SIGNAL(customContextMenuReque= sted(QPoint)), + this, SLOT(handleRelationContextMenuRequest(QPoint))= ); + QObject::connect( d->m_relationDropMenu, SIGNAL(triggered(QAction*)), + this, SLOT(addRelation(QAction*)) ); + QObject::connect( d->m_currentRelations, SIGNAL(itemChanged(QTreeWidge= tItem*,int)), + this, SLOT(handleItemChange(QTreeWidgetItem*,int)) ); } = OsmRelationManagerWidget::~OsmRelationManagerWidget() diff --git a/src/lib/marble/osm/OsmTagEditorWidget.cpp b/src/lib/marble/osm= /OsmTagEditorWidget.cpp index bf2d4b45e..5b54fb4a3 100644 --- a/src/lib/marble/osm/OsmTagEditorWidget.cpp +++ b/src/lib/marble/osm/OsmTagEditorWidget.cpp @@ -42,16 +42,16 @@ OsmTagEditorWidget::OsmTagEditorWidget( GeoDataPlacemar= k *placemark, QWidget *pa d->m_currentTagsList->setSelectionMode( QAbstractItemView::SingleSelec= tion ); d->m_currentTagsList->setRootIsDecorated( false ); = - QObject::connect( d->m_addTagButton, SIGNAL( pressed() ), - this, SLOT( addSelectedTag() ) ); - QObject::connect( d->m_recommendedTagsList, SIGNAL( itemDoubleClicked(= QTreeWidgetItem*, int ) ), - this, SLOT( addSelectedTag() ) ); - QObject::connect( d->m_removeTagButton, SIGNAL( pressed() ), - this, SLOT( removeSelectedTag() ) ); - QObject::connect( d->m_currentTagsList, SIGNAL( itemChanged( QTreeWidg= etItem*, int ) ), - this, SLOT( handleItemChanged( QTreeWidgetItem*, int= ) ) ); - QObject::connect( d->m_currentTagsList, SIGNAL( itemDoubleClicked(QTre= eWidgetItem*,int) ), - this, SLOT( handleDoubleClick( QTreeWidgetItem*, int= ) ) ); + QObject::connect( d->m_addTagButton, SIGNAL(pressed()), + this, SLOT(addSelectedTag()) ); + QObject::connect( d->m_recommendedTagsList, SIGNAL(itemDoubleClicked(Q= TreeWidgetItem*,int)), + this, SLOT(addSelectedTag()) ); + QObject::connect( d->m_removeTagButton, SIGNAL(pressed()), + this, SLOT(removeSelectedTag()) ); + QObject::connect( d->m_currentTagsList, SIGNAL(itemChanged(QTreeWidget= Item*,int)), + this, SLOT(handleItemChanged(QTreeWidgetItem*,int)) = ); + QObject::connect( d->m_currentTagsList, SIGNAL(itemDoubleClicked(QTree= WidgetItem*,int)), + this, SLOT(handleDoubleClick(QTreeWidgetItem*,int)) = ); } = OsmTagEditorWidget::~OsmTagEditorWidget() diff --git a/src/lib/marble/projections/VerticalPerspectiveProjection.cpp b= /src/lib/marble/projections/VerticalPerspectiveProjection.cpp index 77429b0ed..a358da696 100644 --- a/src/lib/marble/projections/VerticalPerspectiveProjection.cpp +++ b/src/lib/marble/projections/VerticalPerspectiveProjection.cpp @@ -143,7 +143,7 @@ bool VerticalPerspectiveProjection::screenCoordinates( = const GeoDataCoordinates globeHidesPoint =3D true; return false; } - // The remaining placemarks are definetely not on the Earth's backside + // The remaining placemarks are definitely not on the Earth's backside globeHidesPoint =3D false; = x +=3D viewport->width() / 2; diff --git a/src/lib/marble/routing/RoutingInputWidget.h b/src/lib/marble/r= outing/RoutingInputWidget.h index 4d606e16e..6341978b3 100644 --- a/src/lib/marble/routing/RoutingInputWidget.h +++ b/src/lib/marble/routing/RoutingInputWidget.h @@ -128,7 +128,7 @@ private Q_SLOTS: /** All runners have completed */ void finishSearch(); = - /** Mark ourself dirty (no target) */ + /** Mark ourselves dirty (no target) */ void setInvalid(); = /** Set the target position (dragging) */ diff --git a/src/plugins/render/annotate/AnnotatePlugin.cpp b/src/plugins/r= ender/annotate/AnnotatePlugin.cpp index 1ad9e9593..99d5f8f04 100644 --- a/src/plugins/render/annotate/AnnotatePlugin.cpp +++ b/src/plugins/render/annotate/AnnotatePlugin.cpp @@ -1098,8 +1098,8 @@ void AnnotatePlugin::editTextAnnotation() dialog, SLOT(updateDialogFields()) ); connect( dialog, SIGNAL(finished(int)), this, SLOT(stopEditingTextAnnotation(int)) ); - connect( dialog, SIGNAL( relationCreated( const OsmPlacemarkData& ) ), - this, SLOT( addRelation( const OsmPlacemarkData& ) ) ); + connect( dialog, SIGNAL(relationCreated(OsmPlacemarkData)), + this, SLOT(addRelation(OsmPlacemarkData)) ); = dialog->setLabelColor(dynamic_cast(m_focusIt= em)->labelColor()); = @@ -1137,8 +1137,8 @@ void AnnotatePlugin::addTextAnnotation() dialog, SLOT(updateDialogFields()) ); connect( dialog, SIGNAL(finished(int)), this, SLOT(stopEditingTextAnnotation(int)) ); - connect( dialog, SIGNAL( relationCreated( const OsmPlacemarkData& ) ), - this, SLOT( addRelation( const OsmPlacemarkData& ) ) ); + connect( dialog, SIGNAL(relationCreated(OsmPlacemarkData)), + this, SLOT(addRelation(OsmPlacemarkData)) ); = if ( m_focusItem ) { m_focusItem->setFocus( false ); @@ -1387,8 +1387,8 @@ void AnnotatePlugin::addPolygon() connect( dialog, SIGNAL(finished(int)), this, SLOT(stopEditingPolygon(int)) ); connect( this, SIGNAL(nodeAdded(GeoDataCoordinates)), dialog, SLOT(han= dleAddingNode(GeoDataCoordinates)) ); - connect( dialog, SIGNAL( relationCreated( const OsmPlacemarkData& ) ), - this, SLOT( addRelation( const OsmPlacemarkData& ) ) ); + connect( dialog, SIGNAL(relationCreated(OsmPlacemarkData)), + this, SLOT(addRelation(OsmPlacemarkData)) ); = // If there is another graphic item marked as 'selected' when pressing= 'Add Polygon', change the focus of // that item. @@ -1478,8 +1478,8 @@ void AnnotatePlugin::editPolygon() connect( dialog, SIGNAL(finished(int)), this, SLOT(stopEditingPolygon(int)) ); connect( this, SIGNAL(itemMoved(GeoDataPlacemark*)), dialog, SLOT(hand= leItemMoving(GeoDataPlacemark*)) ); - connect( dialog, SIGNAL( relationCreated( const OsmPlacemarkData& ) ), - this, SLOT( addRelation( const OsmPlacemarkData& ) ) ); + connect( dialog, SIGNAL(relationCreated(OsmPlacemarkData)), + this, SLOT(addRelation(OsmPlacemarkData)) ); = disableActions( m_actions.first() ); = @@ -1619,8 +1619,8 @@ void AnnotatePlugin::editPolyline() connect( dialog, SIGNAL(finished(int)), this, SLOT(stopEditingPolyline(int)) ); connect( this, SIGNAL(itemMoved(GeoDataPlacemark*)), dialog, SLOT(hand= leItemMoving(GeoDataPlacemark*)) ); - connect( dialog, SIGNAL( relationCreated( const OsmPlacemarkData& ) ), - this, SLOT( addRelation( const OsmPlacemarkData& ) ) ); + connect( dialog, SIGNAL(relationCreated(OsmPlacemarkData)), + this, SLOT(addRelation(OsmPlacemarkData)) ); = disableActions( m_actions.first() ); dialog->show(); @@ -1652,8 +1652,8 @@ void AnnotatePlugin::addPolyline() connect( dialog, SIGNAL(finished(int)), this, SLOT(stopEditingPolyline(int)) ); connect( this, SIGNAL(nodeAdded(GeoDataCoordinates)), dialog, SLOT(han= dleAddingNode(GeoDataCoordinates)) ); - connect( dialog, SIGNAL( relationCreated( const OsmPlacemarkData& ) ), - this, SLOT( addRelation( const OsmPlacemarkData& ) ) ); + connect( dialog, SIGNAL(relationCreated(OsmPlacemarkData)), + this, SLOT(addRelation(OsmPlacemarkData)) ); = if ( m_focusItem ) { m_focusItem->setFocus( false ); diff --git a/src/plugins/render/annotate/AreaAnnotation.cpp b/src/plugins/r= ender/annotate/AreaAnnotation.cpp index 97a433eca..be86e82c9 100644 --- a/src/plugins/render/annotate/AreaAnnotation.cpp +++ b/src/plugins/render/annotate/AreaAnnotation.cpp @@ -366,7 +366,7 @@ void AreaAnnotation::deleteClickedNode() return; } = - // Keep the OsmPlacemarkData synchronized with the geometrys + // Keep the OsmPlacemarkData synchronized with the geometry if ( osmData ) { osmData->removeNodeReference( outerRing.at( i ) ); } diff --git a/src/plugins/render/annotate/DownloadOsmDialog.cpp b/src/plugin= s/render/annotate/DownloadOsmDialog.cpp index 7338270f2..59cda7a7a 100644 --- a/src/plugins/render/annotate/DownloadOsmDialog.cpp +++ b/src/plugins/render/annotate/DownloadOsmDialog.cpp @@ -16,7 +16,6 @@ #include #include #include -#include #include = //Marble @@ -39,11 +38,11 @@ DownloadOsmDialog::DownloadOsmDialog(MarbleWidget *pare= nt,AnnotatePlugin *annota { setupUi(this); horizontalLayout->addWidget(m_latLonBoxWidget); - this->setWindowTitle("Download"); + this->setWindowTitle(tr("Download")); connect(m_marbleWidget, SIGNAL(visibleLatLonAltBoxChanged(GeoDataLatLonAltBox)), this, - SLOT(updateCoordinates(GeoDataLatLonAltBox) ) + SLOT(updateCoordinates(GeoDataLatLonAltBox)) ); = m_downloadButton =3D new QPushButton(tr("Download")); @@ -87,7 +86,7 @@ void DownloadOsmDialog::downloadFile() if(!m_file->open()) { QMessageBox::information(this, tr("ERROR"), - "Unable to create temporary file to downl= oad OSM data to."); + tr("Unable to create temporary file to do= wnload OSM data to.")); this->close(); } m_downloadButton->setEnabled(false); @@ -135,19 +134,19 @@ void DownloadOsmDialog::httpFinished() { case 400: QMessageBox::information(this, tr("ERROR"), - "The selected region contains too muc= h data.Please select a smaller region and try again."); + tr("The selected region contains too = much data. Please select a smaller region and try again.")); m_downloadButton->setEnabled(true); m_isDownloadSuccess=3Dfalse; break; case 509: QMessageBox::information(this, tr("ERROR"), - "The bandwidth limit exceeded.Please = try again later."); + tr("The bandwidth limit exceeded. Ple= ase try again later.")); m_downloadButton->setEnabled(true); m_isDownloadSuccess=3Dfalse; break; default: - QMessageBox::information(this, tr("ERROR"),"Sorry, a network e= rror occured.Please check your internet connection" - " or try again late= r."); + QMessageBox::information(this, tr("ERROR"),tr("Sorry, a networ= k error occurred. Please check your internet connection" + " or try again late= r.")); m_downloadButton->setEnabled(true); m_isDownloadSuccess=3Dfalse; break; diff --git a/src/plugins/render/annotate/DownloadOsmDialog.h b/src/plugins/= render/annotate/DownloadOsmDialog.h index d8d41e723..29669d232 100644 --- a/src/plugins/render/annotate/DownloadOsmDialog.h +++ b/src/plugins/render/annotate/DownloadOsmDialog.h @@ -14,7 +14,8 @@ #include #include #include -#include +#include +#include #include #include = diff --git a/src/plugins/render/annotate/EditPolygonDialog.cpp b/src/plugin= s/render/annotate/EditPolygonDialog.cpp index b7054534b..a513ffcdb 100644 --- a/src/plugins/render/annotate/EditPolygonDialog.cpp +++ b/src/plugins/render/annotate/EditPolygonDialog.cpp @@ -92,14 +92,14 @@ EditPolygonDialog::EditPolygonDialog( GeoDataPlacemark = *placemark, // Adding the osm tag editor widget tab d->m_osmTagEditorWidget =3D new OsmTagEditorWidget( placemark, thi= s ); d->tabWidget->addTab( d->m_osmTagEditorWidget, tr( "Tags" ) ); - QObject::connect( d->m_osmTagEditorWidget, SIGNAL( placemarkChange= d( GeoDataFeature* ) ), - this, SLOT( updatePolygon() ) ); + QObject::connect( d->m_osmTagEditorWidget, SIGNAL(placemarkChanged= (GeoDataFeature*)), + this, SLOT(updatePolygon()) ); = // Adding the osm relation editor widget tab d->m_osmRelationManagerWidget =3D new OsmRelationManagerWidget( pl= acemark, relations, this ); d->tabWidget->addTab( d->m_osmRelationManagerWidget, tr( "Relation= s" ) ); - QObject::connect( d->m_osmRelationManagerWidget, SIGNAL( relationC= reated( const OsmPlacemarkData& ) ), - this, SIGNAL( relationCreated( const OsmPlacemar= kData& ) ) ); + QObject::connect( d->m_osmRelationManagerWidget, SIGNAL(relationCr= eated(OsmPlacemarkData)), + this, SIGNAL(relationCreated(OsmPlacemarkData)) = ); = adjustSize(); } @@ -130,7 +130,7 @@ EditPolygonDialog::EditPolygonDialog( GeoDataPlacemark = *placemark, = d->m_linesWidth->setRange( 0.1, 5.0 ); d->m_linesWidth->setValue( lineStyle.width() ); - connect( d->m_linesWidth, SIGNAL(valueChanged(double)), this, SLOT( ha= ndleChangingStyle() ) ); + connect( d->m_linesWidth, SIGNAL(valueChanged(double)), this, SLOT(han= dleChangingStyle()) ); = // Adjust the "Filled"/"Not Filled" option according to its current fi= ll. if ( polyStyle.fill() ) { @@ -138,7 +138,7 @@ EditPolygonDialog::EditPolygonDialog( GeoDataPlacemark = *placemark, } else { d->m_filledColor->setCurrentIndex( 1 ); } - connect( d->m_filledColor, SIGNAL(currentIndexChanged(int)), this, SLO= T( handleChangingStyle() ) ); + connect( d->m_filledColor, SIGNAL(currentIndexChanged(int)), this, SLO= T(handleChangingStyle()) ); = // Adjust the color buttons' icons to the current lines and polygon co= lors. QPixmap linesPixmap( d->m_linesColorButton->iconSize().width(), @@ -157,14 +157,14 @@ EditPolygonDialog::EditPolygonDialog( GeoDataPlacemar= k *placemark, d->m_linesDialog->setCurrentColor( lineStyle.color() ); connect( d->m_linesColorButton, SIGNAL(clicked()), d->m_linesDialog, S= LOT(exec()) ); connect( d->m_linesDialog, SIGNAL(colorSelected(QColor)), this, SLOT(u= pdateLinesDialog(QColor)) ); - connect( d->m_linesDialog, SIGNAL(colorSelected(QColor)), this, SLOT( = handleChangingStyle() ) ); + connect( d->m_linesDialog, SIGNAL(colorSelected(QColor)), this, SLOT(h= andleChangingStyle()) ); = d->m_polyDialog =3D new QColorDialog( this ); d->m_polyDialog->setOption( QColorDialog::ShowAlphaChannel ); d->m_polyDialog->setCurrentColor( polyStyle.color() ); connect( d->m_polyColorButton, SIGNAL(clicked()), d->m_polyDialog, SLO= T(exec()) ); connect( d->m_polyDialog, SIGNAL(colorSelected(QColor)), this, SLOT(up= datePolyDialog(QColor)) ); - connect( d->m_polyDialog, SIGNAL(colorSelected(QColor)), this, SLOT( h= andleChangingStyle() ) ); + connect( d->m_polyDialog, SIGNAL(colorSelected(QColor)), this, SLOT(ha= ndleChangingStyle()) ); = // Setting the NodeView's delegate: mainly used for the editing the po= lygon's nodes d->m_delegate =3D new NodeItemDelegate( d->m_placemark, d->m_nodeView = ); diff --git a/src/plugins/render/annotate/EditPolylineDialog.cpp b/src/plugi= ns/render/annotate/EditPolylineDialog.cpp index 35db0e093..cd09e671b 100644 --- a/src/plugins/render/annotate/EditPolylineDialog.cpp +++ b/src/plugins/render/annotate/EditPolylineDialog.cpp @@ -88,14 +88,14 @@ EditPolylineDialog::EditPolylineDialog( GeoDataPlacemar= k *placemark, // Adding the osm tag editor widget tab d->m_osmTagEditorWidget =3D new OsmTagEditorWidget( placemark, thi= s ); d->tabWidget->addTab( d->m_osmTagEditorWidget, tr( "Tags" ) ); - QObject::connect( d->m_osmTagEditorWidget, SIGNAL( placemarkChange= d( GeoDataFeature* ) ), - this, SLOT( updatePolyline() ) ); + QObject::connect( d->m_osmTagEditorWidget, SIGNAL(placemarkChanged= (GeoDataFeature*)), + this, SLOT(updatePolyline()) ); = // Adding the osm relation editor widget tab d->m_osmRelationManagerWidget =3D new OsmRelationManagerWidget( pl= acemark, relations, this ); d->tabWidget->addTab( d->m_osmRelationManagerWidget, tr( "Relation= s" ) ); - QObject::connect( d->m_osmRelationManagerWidget, SIGNAL( relationC= reated( const OsmPlacemarkData& ) ), - this, SIGNAL( relationCreated( const OsmPlacemar= kData& ) ) ); + QObject::connect( d->m_osmRelationManagerWidget, SIGNAL(relationCr= eated(OsmPlacemarkData)), + this, SIGNAL(relationCreated(OsmPlacemarkData)) = ); = adjustSize(); } diff --git a/src/plugins/render/annotate/NodeItemDelegate.cpp b/src/plugins= /render/annotate/NodeItemDelegate.cpp index c9f00bffc..5991bb348 100644 --- a/src/plugins/render/annotate/NodeItemDelegate.cpp +++ b/src/plugins/render/annotate/NodeItemDelegate.cpp @@ -127,7 +127,7 @@ void NodeItemDelegate::previewNodeMove( qreal value ) = } = - // Updating chagnes ( repainting graphics ) + // Updating changes ( repainting graphics ) emit geometryChanged(); } = diff --git a/src/plugins/render/annotate/PolylineAnnotation.cpp b/src/plugi= ns/render/annotate/PolylineAnnotation.cpp index f9001b13e..56c80f857 100644 --- a/src/plugins/render/annotate/PolylineAnnotation.cpp +++ b/src/plugins/render/annotate/PolylineAnnotation.cpp @@ -82,7 +82,7 @@ void PolylineAnnotation::setupRegionsLists( GeoPainter *p= ainter ) Q_ASSERT( state() =3D=3D SceneGraphicsItem::DrawingPolyline || !m_regi= onsInitialized ); const GeoDataLineString line =3D static_cast(= *placemark()->geometry() ); = - // Add poyline nodes. + // Add polyline nodes. QVector::ConstIterator itBegin =3D line.constBegin= (); QVector::ConstIterator itEnd =3D line.constEnd(); = diff --git a/src/plugins/render/aprs/AprsGatherer.cpp b/src/plugins/render/= aprs/AprsGatherer.cpp index 771aed18f..d65be698d 100644 --- a/src/plugins/render/aprs/AprsGatherer.cpp +++ b/src/plugins/render/aprs/AprsGatherer.cpp @@ -72,7 +72,7 @@ AprsGatherer::run() = // If a source can directly receive a signal (as opposed to // through a relay like the internet) will return true. This - // prevents accidentially coloring signals heard over some sources + // prevents accidentally coloring signals heard over some sources // as heard directly where it's never possible (such as over the // internet). Q_ASSERT(m_source); diff --git a/src/plugins/render/atmosphere/AtmospherePlugin.cpp b/src/plugi= ns/render/atmosphere/AtmospherePlugin.cpp index 297d7edd1..f02437192 100644 --- a/src/plugins/render/atmosphere/AtmospherePlugin.cpp +++ b/src/plugins/render/atmosphere/AtmospherePlugin.cpp @@ -185,7 +185,7 @@ void AtmospherePlugin::repaintPixmap(const ViewportPara= ms *viewParams) renderPainter.setPen(Qt::NoPen); renderPainter.setRenderHint(QPainter::Antialiasing, false); = - // Let's paint elipse we want in this::render(..) on pixmap from point= (0;0) + // Let's paint ellipse we want in this::render(..) on pixmap from poin= t (0;0) renderPainter.drawEllipse(0, 0, diameter, diameter); } = diff --git a/src/plugins/render/eclipses/EclipsesModel.cpp b/src/plugins/re= nder/eclipses/EclipsesModel.cpp index 093d7cb89..e01e8ad49 100644 --- a/src/plugins/render/eclipses/EclipsesModel.cpp +++ b/src/plugins/render/eclipses/EclipsesModel.cpp @@ -31,7 +31,7 @@ EclipsesModel::EclipsesModel( const MarbleModel *model, Q= Object *parent ) m_ecl->setTimezone( model->clock()->timezone() / 3600. ); m_ecl->setLunarEcl( m_withLunarEclipses ); = - // oberservation point defaults to home location + // observation point defaults to home location qreal lon, lat; int zoom; m_marbleModel->home( lon, lat, zoom ); diff --git a/src/plugins/render/eclipses/EclipsesModel.h b/src/plugins/rend= er/eclipses/EclipsesModel.h index f45e1f945..359273d81 100644 --- a/src/plugins/render/eclipses/EclipsesModel.h +++ b/src/plugins/render/eclipses/EclipsesModel.h @@ -87,7 +87,7 @@ public: int year() const; = /** - * @brief Set if lunar eclipses are enbled + * @brief Set if lunar eclipses are enabled * @param enable Indicates whether or not to allow lunar eclipses * * Allows to enable or disable inclusion of lunar eclipses. diff --git a/src/plugins/render/eclipses/EclipsesPlugin.cpp b/src/plugins/r= ender/eclipses/EclipsesPlugin.cpp index 0b9e0bd15..4bfbb8f77 100644 --- a/src/plugins/render/eclipses/EclipsesPlugin.cpp +++ b/src/plugins/render/eclipses/EclipsesPlugin.cpp @@ -471,7 +471,7 @@ void EclipsesPlugin::updateMenuItemState() return; } = - // eclipses are only supported for earth based obervers at the moment + // eclipses are only supported for earth based observers at the moment // so we disable the menu items for other celestial bodies = const bool active =3D (marbleModel()->planetId() =3D=3D QLatin1String(= "earth")); diff --git a/src/plugins/render/elevationprofilefloatitem/ElevationProfileF= loatItem.h b/src/plugins/render/elevationprofilefloatitem/ElevationProfileF= loatItem.h index 6b570cd44..8cdd8f7f6 100644 --- a/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatIte= m.h +++ b/src/plugins/render/elevationprofilefloatitem/ElevationProfileFloatIte= m.h @@ -38,7 +38,7 @@ class GeoDataPlacemark; class MarbleWidget; = /** - * @short The class that creates an interactive elvation profile. + * @short The class that creates an interactive elevation profile. * */ = diff --git a/src/plugins/render/measure/MeasureConfigDialog.cpp b/src/plugi= ns/render/measure/MeasureConfigDialog.cpp index 471426e93..80006266f 100644 --- a/src/plugins/render/measure/MeasureConfigDialog.cpp +++ b/src/plugins/render/measure/MeasureConfigDialog.cpp @@ -7,8 +7,8 @@ // // Copyright 2014 Illya Kovalevskyy = -#include #include "MeasureConfigDialog.h" +#include = namespace Marble { = diff --git a/src/plugins/render/panoramio/PanoramioParser.h b/src/plugins/r= ender/panoramio/PanoramioParser.h index da932fe33..46a848d52 100644 --- a/src/plugins/render/panoramio/PanoramioParser.h +++ b/src/plugins/render/panoramio/PanoramioParser.h @@ -11,7 +11,7 @@ #ifndef PANORAMIOPARSER_H #define PANORAMIOPARSER_H = -#include +#include #include = /** diff --git a/src/plugins/render/satellites/SatellitesModel.cpp b/src/plugin= s/render/satellites/SatellitesModel.cpp index 68f4b1e59..51e2d80e5 100644 --- a/src/plugins/render/satellites/SatellitesModel.cpp +++ b/src/plugins/render/satellites/SatellitesModel.cpp @@ -123,7 +123,7 @@ void SatellitesModel::updateVisibility() void SatellitesModel::parseFile( const QString &id, const QByteArray &data ) { - // catalog files are comma serparated while tle files + // catalog files are comma separated while tle files // are not allowed to contain commas, so we use this // to distinguish between those two if( data.contains( ',' ) ) { diff --git a/src/plugins/render/stars/StarsPlugin.cpp b/src/plugins/render/= stars/StarsPlugin.cpp index c842f0991..61b0f3a66 100644 --- a/src/plugins/render/stars/StarsPlugin.cpp +++ b/src/plugins/render/stars/StarsPlugin.cpp @@ -1352,7 +1352,7 @@ void StarsPlugin::toggleSunMoon(bool on) void StarsPlugin::toggleDsos(bool on) { m_renderDsos =3D on; - // only enable lables if set to true + // only enable labels if set to true if (on) { m_renderDsoLabels =3D true; } diff --git a/src/plugins/runner/log/LogPlugin.h b/src/plugins/runner/log/Lo= gPlugin.h index dbece5a04..92946c9be 100644 --- a/src/plugins/runner/log/LogPlugin.h +++ b/src/plugins/runner/log/LogPlugin.h @@ -7,8 +7,8 @@ // // Copyright 2012 Bernhard Beschow = -#ifndef MARBLE_LOGFILE_PLUGIN_H -#define MARBLE_LOGFILE_PLUGIN_H +#ifndef MARBLE_LOG_PLUGIN_H +#define MARBLE_LOG_PLUGIN_H = #include "ParseRunnerPlugin.h" = diff --git a/src/plugins/runner/log/LogRunner.h b/src/plugins/runner/log/Lo= gRunner.h index 594b09e83..3e722289e 100644 --- a/src/plugins/runner/log/LogRunner.h +++ b/src/plugins/runner/log/LogRunner.h @@ -7,8 +7,8 @@ // // Copyright 2012 Bernhard Beschow = -#ifndef MARBLE_LOGFILE_RUNNER_H -#define MARBLE_LOGFILE_RUNNER_H +#ifndef MARBLE_LOG_RUNNER_H +#define MARBLE_LOG_RUNNER_H = #include "ParsingRunner.h" = diff --git a/src/plugins/runner/monav/MonavMap.cpp b/src/plugins/runner/mon= av/MonavMap.cpp index 2fac352ff..7f2ca1dad 100644 --- a/src/plugins/runner/monav/MonavMap.cpp +++ b/src/plugins/runner/monav/MonavMap.cpp @@ -85,7 +85,7 @@ void MonavMap::parseBoundingBox( const QFileInfo &file ) // The bounding box polygon is rather complicated, therefore not a= llowing a quick check // and also occupying memory. Discard the polygon and only store t= he rectangular bounding // box. Only happens for non-simplified bounding box polygons. - mDebug() << "Discarding too large bounding box poylgon for " << fi= le.absoluteFilePath() << ". Please check for a map update."; + mDebug() << "Discarding too large bounding box polygon for " << fi= le.absoluteFilePath() << ". Please check for a map update."; m_tiles.clear(); } } diff --git a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReve= rseGeocodingRunner.cpp b/src/plugins/runner/nominatim-reversegeocoding/OsmN= ominatimReverseGeocodingRunner.cpp index bc3bcabf0..e04bcbf17 100644 --- a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeoc= odingRunner.cpp +++ b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeoc= odingRunner.cpp @@ -50,7 +50,7 @@ void OsmNominatimRunner::reverseGeocoding( const GeoDataC= oordinates &coordinates { m_coordinates =3D coordinates; QString base =3D "https://nominatim.openstreetmap.org/reverse?format= =3Dxml&addressdetails=3D1"; - // @todo: Alternative URI with addressdetails=3D1 could be used for sh= orther placemark name + // @todo: Alternative URI with addressdetails=3D1 could be used for sh= orter placemark name QString query =3D "&lon=3D%1&lat=3D%2&accept-language=3D%3"; double lon =3D coordinates.longitude( GeoDataCoordinates::Degree ); double lat =3D coordinates.latitude( GeoDataCoordinates::Degree ); diff --git a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReve= rseGeocodingRunner.h b/src/plugins/runner/nominatim-reversegeocoding/OsmNom= inatimReverseGeocodingRunner.h index 7835cfb85..8901ed34f 100644 --- a/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeoc= odingRunner.h +++ b/src/plugins/runner/nominatim-reversegeocoding/OsmNominatimReverseGeoc= odingRunner.h @@ -9,8 +9,8 @@ // = = -#ifndef MARBLE_OSMNOMINATIMRUNNER_H -#define MARBLE_OSMNOMINATIMRUNNER_H +#ifndef MARBLE_OSMNOMINATIMREVERSEGEOCODINGRUNNER_H +#define MARBLE_OSMNOMINATIMREVERSEGEOCODINGRUNNER_H = #include "ReverseGeocodingRunner.h" #include "GeoDataCoordinates.h" diff --git a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h= b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h index 933a04c2d..18d9b70a3 100644 --- a/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h +++ b/src/plugins/runner/nominatim-search/OsmNominatimSearchRunner.h @@ -9,8 +9,8 @@ // = = -#ifndef MARBLE_OSMNOMINATIMRUNNER_H -#define MARBLE_OSMNOMINATIMRUNNER_H +#ifndef MARBLE_OSMNOMINATIMSEARCHRUNNER_H +#define MARBLE_OSMNOMINATIMSEARCHRUNNER_H = #include "SearchRunner.h" = diff --git a/tests/TestEquality.cpp b/tests/TestEquality.cpp index 517b8a951..01d114ac8 100644 --- a/tests/TestEquality.cpp +++ b/tests/TestEquality.cpp @@ -898,11 +898,11 @@ void TestEquality::polygonTest() = QCOMPARE( polygon1 =3D=3D polygon2, false ); = - /* Prepare for unequality test */ + /* Prepare for inequality test */ polygon2.appendInnerBoundary(innerBoundary11); QVERIFY( polygon1 =3D=3D polygon2 ); = - /* Test for unequality: make sure polygon's coordinates are not equal = */ + /* Test for inequality: make sure polygon's coordinates are not equal = */ polygon2.appendInnerBoundary(innerBoundary11); coord111.set(100,1); innerBoundary11.clear(); diff --git a/tests/TestUtils.h b/tests/TestUtils.h index 2c836ff40..d7b17b0c8 100644 --- a/tests/TestUtils.h +++ b/tests/TestUtils.h @@ -8,8 +8,8 @@ // Copyright 2013 Dennis Nienh=C3=BCser // = -#ifndef MARBLE_MARBLETEST_H -#define MARBLE_MARBLETEST_H +#ifndef MARBLE_TESTUTILS_H +#define MARBLE_TESTUTILS_H = #include "GeoDataDocument.h" #include "GeoDataParser.h" diff --git a/tools/shp2osm/polyshp2osm.py b/tools/shp2osm/polyshp2osm.py index f14513753..28968944c 100644 --- a/tools/shp2osm/polyshp2osm.py +++ b/tools/shp2osm/polyshp2osm.py @@ -14,7 +14,7 @@ or at least skim, the code up until it says: = DO NOT CHANGE AFTER THIS LINE. = -to accomodate your own data. = +to accommodate your own data. = """ = __author__ =3D "Christopher Schmidt " @@ -418,7 +418,7 @@ def close_file(): open_file.close() = def start_new_file(): - """ Internal. Open a new file, closing existing file if neccesary.""" + """ Internal. Open a new file, closing existing file if necessary.""" global open_file, file_counter, node_dict, file_name file_counter +=3D 1 if open_file: diff --git a/tools/tilecreator-srtm2/tccore.cpp b/tools/tilecreator-srtm2/t= ccore.cpp index 8fcc80448..c3649aecc 100644 --- a/tools/tilecreator-srtm2/tccore.cpp +++ b/tools/tilecreator-srtm2/tccore.cpp @@ -159,7 +159,7 @@ private: } QString fileName =3D hgtFileName( lng, lat ); if ( fileName.isNull() ) { - //qDebug() << lng << lat << "hgt file does not exist, returing= null image"; + //qDebug() << lng << lat << "hgt file does not exist, returnin= g null image"; return QImage(); } else { //qDebug() << lng << lat << "reading hgt file" << fileName; diff --git a/tools/vectorosm-tilecreator/NodeReducer.cpp b/tools/vectorosm-= tilecreator/NodeReducer.cpp index 42c0a8132..4ea160b0c 100644 --- a/tools/vectorosm-tilecreator/NodeReducer.cpp +++ b/tools/vectorosm-tilecreator/NodeReducer.cpp @@ -8,6 +8,7 @@ // Copyright 2016 Akshat Tandon // = +#include "NodeReducer.h" #include "GeoDataPlacemark.h" #include "GeoDataLineString.h" #include "GeoDataPolygon.h" @@ -15,7 +16,6 @@ #include "GeoDataMultiGeometry.h" #include "GeoDataCoordinates.h" #include "MarbleMath.h" -#include "NodeReducer.h" #include "OsmPlacemarkData.h" = #include diff --git a/tools/vectorosm-tilecreator/PeakAnalyzer.h b/tools/vectorosm-t= ilecreator/PeakAnalyzer.h index 2c17295b7..099e9279d 100644 --- a/tools/vectorosm-tilecreator/PeakAnalyzer.h +++ b/tools/vectorosm-tilecreator/PeakAnalyzer.h @@ -8,6 +8,9 @@ // Copyright 2016 Dennis Nienh=C3=BCser // = +#ifndef PEAKANALYZER_H +#define PEAKANALYZER_H + #include = namespace Marble { @@ -29,3 +32,4 @@ private: }; = } +#endif diff --git a/tools/vectorosm-tilecreator/SpellChecker.h b/tools/vectorosm-t= ilecreator/SpellChecker.h index 2be1e5c9f..1d28480fa 100644 --- a/tools/vectorosm-tilecreator/SpellChecker.h +++ b/tools/vectorosm-tilecreator/SpellChecker.h @@ -8,6 +8,9 @@ // Copyright 2016 Dennis Nienh=C3=BCser // = +#ifndef TOOLS_SPELLCHECKER_H +#define TOOLS_SPELLCHECKER_H + #include #include "GeoDataPlacemark.h" = @@ -20,7 +23,7 @@ class GeoDataPlacemark; class SpellChecker { public: - SpellChecker(const QString &citiesFile); + explicit SpellChecker(const QString &citiesFile); void setVerbose(bool verbose); = void correctPlaceLabels(const QVector &placemarks); @@ -40,3 +43,4 @@ private: }; = } +#endif diff --git a/tools/vectorosm-tilecreator/TagsFilter.cpp b/tools/vectorosm-t= ilecreator/TagsFilter.cpp index d625e0107..c5c6673c6 100644 --- a/tools/vectorosm-tilecreator/TagsFilter.cpp +++ b/tools/vectorosm-tilecreator/TagsFilter.cpp @@ -8,10 +8,11 @@ // Copyright 2016 Akshat Tandon // = +#include "TagsFilter.h" + #include #include = -#include "TagsFilter.h" #include "GeoDataObject.h" #include "GeoDataDocument.h" #include "OsmPlacemarkData.h" diff --git a/tools/vectorosm-tilecreator/VectorClipper.h b/tools/vectorosm-= tilecreator/VectorClipper.h index 42457e6cd..ed75e3843 100644 --- a/tools/vectorosm-tilecreator/VectorClipper.h +++ b/tools/vectorosm-tilecreator/VectorClipper.h @@ -9,8 +9,8 @@ // Copyright 2016 David Kolozsvari // = -#ifndef TINYPLANETPROCESSOR_H -#define TINYPLANETPROCESSOR_H +#ifndef VECTORCLIPPER_H +#define VECTORCLIPPER_H = #include "OsmPlacemarkData.h" = @@ -136,4 +136,4 @@ private: = } = -#endif // TINYPLANETPROCESSOR_H +#endif // VECTORCLIPPER_H diff --git a/tools/vectorosm-tilecreator/WayChunk.cpp b/tools/vectorosm-til= ecreator/WayChunk.cpp index 3e95f3574..cccda104d 100644 --- a/tools/vectorosm-tilecreator/WayChunk.cpp +++ b/tools/vectorosm-tilecreator/WayChunk.cpp @@ -8,11 +8,12 @@ // Copyright 2016 Akshat Tandon // = +#include "WayChunk.h" + #include #include #include = -#include "WayChunk.h" #include "GeoDataCoordinates.h" #include "GeoDataPlacemark.h" #include "GeoDataLineString.h" diff --git a/tools/vectorosm-tilecreator/WayConcatenator.cpp b/tools/vector= osm-tilecreator/WayConcatenator.cpp index d2ceb7b0c..2a2342d0c 100644 --- a/tools/vectorosm-tilecreator/WayConcatenator.cpp +++ b/tools/vectorosm-tilecreator/WayConcatenator.cpp @@ -8,6 +8,8 @@ // Copyright 2016 Akshat Tandon // = +#include "WayConcatenator.h" + #include #include #include @@ -20,7 +22,6 @@ #include "StyleBuilder.h" #include "OsmObjectManager.h" = -#include "WayConcatenator.h" #include "WayChunk.h" #include "TagsFilter.h" = diff --git a/tools/vectorosm-tilecreator/WayConcatenator.h b/tools/vectoros= m-tilecreator/WayConcatenator.h index b28abefe0..8fd31c075 100644 --- a/tools/vectorosm-tilecreator/WayConcatenator.h +++ b/tools/vectorosm-tilecreator/WayConcatenator.h @@ -22,7 +22,7 @@ private: using PlacemarkPtr =3D QSharedPointer; = public: - WayConcatenator(GeoDataDocument *document); + explicit WayConcatenator(GeoDataDocument *document); = int originalWays() const; int mergedWays() const; diff --git a/tools/vectorosm-tilecreator/clipper/clipper.cpp b/tools/vector= osm-tilecreator/clipper/clipper.cpp index bf04c22ab..24a197994 100644 --- a/tools/vectorosm-tilecreator/clipper/clipper.cpp +++ b/tools/vectorosm-tilecreator/clipper/clipper.cpp @@ -1626,7 +1626,7 @@ bool Clipper::ExecuteInternal() void Clipper::SetWindingCount(TEdge &edge) { TEdge *e =3D edge.PrevInAEL; - //find the edge of the same polytype that immediately preceeds 'edge' in= AEL + //find the edge of the same polytype that immediately precedes 'edge' in= AEL while (e && ((e->PolyTyp !=3D edge.PolyTyp) || (e->WindDelta =3D=3D 0))= ) e =3D e->PrevInAEL; if (!e) {