[qmapshack] branch master updated (0020a4e -> 2fd0001)

Bas Couwenberg sebastic at xs4all.nl
Mon Jan 19 21:04:53 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a change to branch master
in repository qmapshack.

      from  0020a4e   Mark artificial-typo.patch as Applied-Upstream.
       new  2709fd1   Imported Upstream version 0.11.0
       new  b8025a0   Merge tag 'upstream/0.11.0'
       new  8317f15   New upstream release.
       new  ea80a40   Drop artificial-typo.patch, applied upstream.
       new  2fd0001   Set distribution to experimental.

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CMakeLists.txt                                     |    5 +-
 CMakeLists.txt.user                                |   10 +-
 call_Uncrustify.cfg                                |  142 ++
 call_Uncrustify.sh                                 |   43 +
 changelog.txt                                      |    8 +
 debian/changelog                                   |    7 +
 debian/patches/artificial-typo.patch               |   49 -
 debian/patches/series                              |    1 -
 src/CAbout.cpp                                     |    3 +-
 src/CAbout.h                                       |    8 +-
 src/CMainWindow.cpp                                |   53 +-
 src/CMainWindow.h                                  |  142 +-
 src/CMakeLists.txt                                 |   12 +
 src/GeoMath.cpp                                    |   32 +-
 src/GeoMath.h                                      |   15 +-
 src/IMainWindow.ui                                 |   18 +-
 src/canvas/CCanvas.cpp                             |   55 +-
 src/canvas/CCanvas.h                               |  296 ++--
 src/canvas/CCanvasSetup.cpp                        |    3 +-
 src/canvas/CCanvasSetup.h                          |   20 +-
 src/canvas/ICanvasSetup.ui                         |    2 +-
 src/canvas/IDrawContext.cpp                        |   41 +-
 src/canvas/IDrawContext.h                          |  346 ++---
 src/canvas/IDrawObject.cpp                         |    4 -
 src/canvas/IDrawObject.h                           |  297 ++--
 src/dem/CDemDraw.cpp                               |   21 +-
 src/dem/CDemDraw.h                                 |   93 +-
 src/dem/CDemItem.cpp                               |    8 +-
 src/dem/CDemItem.h                                 |  125 +-
 src/dem/CDemList.cpp                               |    8 +-
 src/dem/CDemList.h                                 |   51 +-
 src/dem/CDemPathSetup.cpp                          |    5 +-
 src/dem/CDemPathSetup.h                            |   24 +-
 src/dem/CDemPropSetup.cpp                          |    7 +-
 src/dem/CDemPropSetup.h                            |   31 +-
 src/dem/CDemVRT.cpp                                |   58 +-
 src/dem/CDemVRT.h                                  |   37 +-
 src/dem/IDem.cpp                                   |   20 +-
 src/dem/IDem.h                                     |  165 ++-
 src/dem/IDemProp.cpp                               |    3 +-
 src/dem/IDemProp.h                                 |   17 +-
 src/gis/CGisDraw.cpp                               |    5 +-
 src/gis/CGisDraw.h                                 |   14 +-
 src/gis/CGisListDB.cpp                             |   53 +-
 src/gis/CGisListDB.h                               |   84 +-
 src/gis/CGisListWks.cpp                            |   64 +-
 src/gis/CGisListWks.h                              |  177 ++-
 src/gis/CGisWidget.cpp                             |   22 +-
 src/gis/CGisWidget.h                               |  278 ++--
 src/gis/IGisItem.cpp                               |  176 ++-
 src/gis/IGisItem.h                                 |  664 +++++----
 src/gis/IGisLine.cpp                               |    2 -
 src/gis/IGisLine.h                                 |   10 +-
 src/gis/WptIcons.cpp                               |    2 -
 src/gis/WptIcons.h                                 |   12 +-
 src/gis/db/CDBFolderDatabase.cpp                   |    3 +-
 src/gis/db/CDBFolderDatabase.h                     |   24 +-
 src/gis/db/CDBFolderGroup.cpp                      |    3 +-
 src/gis/db/CDBFolderGroup.h                        |    6 +-
 src/gis/db/CDBFolderLostFound.cpp                  |   10 +-
 src/gis/db/CDBFolderLostFound.h                    |   22 +-
 src/gis/db/CDBFolderOther.cpp                      |    3 +-
 src/gis/db/CDBFolderOther.h                        |    6 +-
 src/gis/db/CDBFolderProject.cpp                    |    3 +-
 src/gis/db/CDBFolderProject.h                      |    6 +-
 src/gis/db/CDBItem.cpp                             |    7 +-
 src/gis/db/CDBItem.h                               |   36 +-
 src/gis/db/CDBProject.cpp                          |   68 +-
 src/gis/db/CDBProject.h                            |   74 +-
 src/gis/db/CLostFoundProject.cpp                   |   43 +-
 src/gis/db/CLostFoundProject.h                     |   14 +-
 src/gis/db/CSetupDatabase.cpp                      |    4 +-
 src/gis/db/CSetupDatabase.h                        |   34 +-
 src/gis/db/CSetupFolder.cpp                        |   24 +-
 src/gis/db/CSetupFolder.h                          |   23 +-
 src/gis/db/CSetupWorkspace.cpp                     |    3 +-
 src/gis/db/CSetupWorkspace.h                       |   13 +-
 src/gis/db/IDB.cpp                                 |    8 +-
 src/gis/db/IDB.h                                   |   16 +-
 src/gis/db/IDBFolder.cpp                           |   68 +-
 src/gis/db/IDBFolder.h                             |   83 +-
 src/gis/db/ISetupWorkspace.ui                      |    2 +-
 src/gis/db/macros.h                                |   20 +-
 src/gis/gpx/CGpxProject.cpp                        |   32 +-
 src/gis/gpx/CGpxProject.h                          |   21 +-
 src/gis/gpx/serialization.cpp                      |   42 +-
 src/gis/ovl/CDetailsOvlArea.cpp                    |   16 +-
 src/gis/ovl/CDetailsOvlArea.h                      |   52 +-
 src/gis/ovl/CGisItemOvlArea.cpp                    |   96 +-
 src/gis/ovl/CGisItemOvlArea.h                      |  255 ++--
 src/gis/ovl/CScrOptOvlArea.cpp                     |   11 +-
 src/gis/ovl/CScrOptOvlArea.h                       |   27 +-
 src/gis/prj/CDetailsPrj.cpp                        |  451 +++++-
 src/gis/prj/CDetailsPrj.h                          |   32 +-
 src/gis/prj/IDetailsPrj.ui                         |   90 +-
 src/gis/prj/IGisProject.cpp                        |   32 +-
 src/gis/prj/IGisProject.h                          |  417 +++---
 src/gis/qms/CQmsProject.cpp                        |   10 +-
 src/gis/qms/CQmsProject.h                          |   13 +-
 src/gis/qms/serialization.cpp                      |   88 +-
 src/gis/rte/CGisItemRte.cpp                        |   88 +-
 src/gis/rte/CGisItemRte.h                          |  147 +-
 src/gis/rte/CScrOptRte.cpp                         |    9 +-
 src/gis/rte/CScrOptRte.h                           |   24 +-
 src/gis/search/CSearchGoogle.cpp                   |   13 +-
 src/gis/search/CSearchGoogle.h                     |   44 +-
 src/gis/trk/CCombineTrk.cpp                        |   17 +-
 src/gis/trk/CCombineTrk.h                          |   49 +-
 src/gis/trk/CDetailsTrk.cpp                        |   32 +-
 src/gis/trk/CDetailsTrk.h                          |   90 +-
 src/gis/trk/CGisItemTrk.cpp                        |  184 ++-
 src/gis/trk/CGisItemTrk.h                          |  887 +++++++-----
 src/gis/trk/CScrOptTrk.cpp                         |   14 +-
 src/gis/trk/CScrOptTrk.h                           |   44 +-
 src/gis/trk/filter/CFilterDelete.cpp               |    3 +-
 src/gis/trk/filter/CFilterDelete.h                 |   17 +-
 src/gis/trk/filter/CFilterDouglasPeuker.cpp        |    5 +-
 src/gis/trk/filter/CFilterDouglasPeuker.h          |   16 +-
 src/gis/trk/filter/CFilterMedian.cpp               |    4 +-
 src/gis/trk/filter/CFilterMedian.h                 |   16 +-
 src/gis/trk/filter/CFilterNewDate.cpp              |    3 +-
 src/gis/trk/filter/CFilterNewDate.h                |   17 +-
 src/gis/trk/filter/CFilterObscureDate.cpp          |    2 +-
 src/gis/trk/filter/CFilterObscureDate.h            |   16 +-
 src/gis/trk/filter/CFilterOffsetElevation.cpp      |    4 +-
 src/gis/trk/filter/CFilterOffsetElevation.h        |   17 +-
 src/gis/trk/filter/CFilterReplaceElevation.cpp     |    3 +-
 src/gis/trk/filter/CFilterReplaceElevation.h       |   17 +-
 .../filter/{CFilterDelete.cpp => CFilterReset.cpp} |   12 +-
 .../IDemProp.h => gis/trk/filter/CFilterReset.h}   |   28 +-
 src/gis/trk/filter/CFilterSpeed.cpp                |    2 +-
 src/gis/trk/filter/CFilterSpeed.h                  |   16 +-
 .../filter/{IFilterDelete.ui => IFilterReset.ui}   |   46 +-
 src/gis/trk/filter/filter.cpp                      |   29 +-
 src/gis/wpt/CDetailsGeoCache.cpp                   |    7 +-
 src/gis/wpt/CDetailsGeoCache.h                     |   18 +-
 src/gis/wpt/CDetailsWpt.cpp                        |   63 +-
 src/gis/wpt/CDetailsWpt.h                          |   37 +-
 src/gis/wpt/CGisItemWpt.cpp                        |   76 +-
 src/gis/wpt/CGisItemWpt.h                          |  372 ++---
 src/gis/wpt/CProjWpt.cpp                           |    9 +-
 src/gis/wpt/CProjWpt.h                             |   24 +-
 src/gis/wpt/CScrOptWpt.cpp                         |   14 +-
 src/gis/wpt/CScrOptWpt.h                           |   38 +-
 src/gis/wpt/IDetailsGeoCache.ui                    |   61 +-
 src/gis/wpt/IDetailsWpt.ui                         |  246 ++--
 src/gis/wpt/IScrOptWpt.ui                          |   18 +
 src/grid/CGrid.cpp                                 |   59 +-
 src/grid/CGrid.h                                   |   38 +-
 src/grid/CGridSetup.cpp                            |    4 +-
 src/grid/CGridSetup.h                              |   34 +-
 src/grid/CProjWizard.cpp                           |   26 +-
 src/grid/CProjWizard.h                             |   22 +-
 src/grid/mitab.cpp                                 |    1 -
 src/grid/mitab.h                                   |   26 +-
 src/helpers/CAppOpts.h                             |   24 +-
 src/helpers/CElevationDialog.cpp                   |    4 +-
 src/helpers/CElevationDialog.h                     |   31 +-
 src/helpers/CFileExt.h                             |   29 +-
 src/helpers/CHistoryListWidget.cpp                 |    4 +-
 src/helpers/CHistoryListWidget.h                   |   30 +-
 src/helpers/CInputDialog.cpp                       |    2 -
 src/helpers/CInputDialog.h                         |   26 +-
 src/helpers/CLinksDialog.cpp                       |    2 -
 src/helpers/CLinksDialog.h                         |   24 +-
 src/helpers/CPhotoAlbum.cpp                        |  197 +++
 .../CImportDatabase.h => helpers/CPhotoAlbum.h}    |   47 +-
 src/helpers/CPhotoViewer.cpp                       |  166 +++
 src/helpers/{CWptIconDialog.h => CPhotoViewer.h}   |   38 +-
 src/helpers/CPositionDialog.cpp                    |   14 +-
 src/helpers/CPositionDialog.h                      |   20 +-
 src/helpers/CSelectCopyAction.cpp                  |    3 +-
 src/helpers/CSelectCopyAction.h                    |   45 +-
 src/helpers/CSelectProjectDialog.cpp               |    8 +-
 src/helpers/CSelectProjectDialog.h                 |   52 +-
 src/helpers/CSettings.h                            |   42 +-
 src/helpers/CTextEditWidget.cpp                    |  172 +--
 src/helpers/CTextEditWidget.h                      |  132 +-
 src/helpers/CWptIconDialog.cpp                     |    5 +-
 src/helpers/CWptIconDialog.h                       |   23 +-
 src/helpers/IPhotoAlbum.ui                         |   91 ++
 src/helpers/ISelectCopyAction.ui                   |    4 +-
 src/helpers/ITextEditWidget.ui                     |   11 +-
 src/helpers/Platform.h                             |   66 +-
 src/icons/32x32/AddImage.png                       |  Bin 0 -> 1121 bytes
 src/icons/32x32/DelImage.png                       |  Bin 0 -> 1077 bytes
 src/icons/32x32/Image.png                          |  Bin 0 -> 1000 bytes
 src/icons/32x32/Print.png                          |  Bin 0 -> 907 bytes
 src/icons/48x48/AddImage.png                       |  Bin 0 -> 1548 bytes
 src/icons/48x48/DelImage.png                       |  Bin 0 -> 1442 bytes
 src/icons/48x48/Image.png                          |  Bin 0 -> 1368 bytes
 src/icons/48x48/Print.png                          |  Bin 0 -> 1162 bytes
 src/icons/AddImage.svg                             |   75 +
 src/icons/DelImage.svg                             |  114 ++
 src/icons/Image.svg                                |   99 ++
 src/icons/Print.svg                                |  102 ++
 src/locale/qmapshack_cs.ts                         | 1530 +++++++++++---------
 src/locale/qmapshack_de.ts                         | 1141 ++++++++-------
 src/locale/qmapshack_es.ts                         | 1137 ++++++++-------
 src/main.cpp                                       |   65 +-
 src/map/CMapDraw.cpp                               |   21 +-
 src/map/CMapDraw.h                                 |  192 +--
 src/map/CMapIMG.cpp                                |  400 +++--
 src/map/CMapIMG.h                                  |  961 ++++++------
 src/map/CMapItem.cpp                               |   14 +-
 src/map/CMapItem.h                                 |  135 +-
 src/map/CMapJNX.cpp                                |   65 +-
 src/map/CMapJNX.h                                  |   14 +-
 src/map/CMapList.cpp                               |    8 +-
 src/map/CMapList.h                                 |   57 +-
 src/map/CMapMAP.cpp                                |   11 +-
 src/map/CMapMAP.h                                  |  144 +-
 src/map/CMapPathSetup.cpp                          |    5 +-
 src/map/CMapPathSetup.h                            |   24 +-
 src/map/CMapPropSetup.cpp                          |    7 +-
 src/map/CMapPropSetup.h                            |   31 +-
 src/map/CMapRMAP.cpp                               |  136 +-
 src/map/CMapRMAP.h                                 |    5 +-
 src/map/CMapTMS.cpp                                |   30 +-
 src/map/CMapTMS.h                                  |  100 +-
 src/map/CMapVRT.cpp                                |   72 +-
 src/map/CMapVRT.h                                  |   60 +-
 src/map/CMapWMTS.cpp                               |   71 +-
 src/map/CMapWMTS.h                                 |  161 +-
 src/map/IMap.cpp                                   |    3 +-
 src/map/IMap.h                                     |  242 ++--
 src/map/IMapProp.cpp                               |    3 +-
 src/map/IMapProp.h                                 |   17 +-
 src/map/IMapPropSetup.cpp                          |    3 +-
 src/map/IMapPropSetup.h                            |   17 +-
 src/map/cache/CDiskCache.cpp                       |   10 +-
 src/map/cache/CDiskCache.h                         |   38 +-
 src/map/cache/IDiskCache.cpp                       |    2 -
 src/map/cache/IDiskCache.h                         |   18 +-
 src/map/garmin/CGarminPoint.cpp                    |   21 +-
 src/map/garmin/CGarminPoint.h                      |   38 +-
 src/map/garmin/CGarminPolygon.cpp                  |  122 +-
 src/map/garmin/CGarminPolygon.h                    |  163 ++-
 src/map/garmin/CGarminStrTbl6.cpp                  |   26 +-
 src/map/garmin/CGarminStrTbl6.h                    |   37 +-
 src/map/garmin/CGarminStrTbl8.cpp                  |   13 +-
 src/map/garmin/CGarminStrTbl8.h                    |    8 +-
 src/map/garmin/CGarminStrTblUtf8.cpp               |    9 +-
 src/map/garmin/CGarminStrTblUtf8.h                 |    8 +-
 src/map/garmin/CGarminTyp.cpp                      |  977 +++++++------
 src/map/garmin/CGarminTyp.h                        |  405 +++---
 src/map/garmin/IGarminStrTbl.cpp                   |   23 +-
 src/map/garmin/IGarminStrTbl.h                     |   61 +-
 src/map/mapsforge/types.h                          |   23 +-
 src/mouse/CMouseEditArea.cpp                       |    6 +-
 src/mouse/CMouseEditArea.h                         |   30 +-
 src/mouse/CMouseEditTrk.cpp                        |   10 +-
 src/mouse/CMouseEditTrk.h                          |   28 +-
 src/mouse/CMouseMoveWpt.cpp                        |   10 +-
 src/mouse/CMouseMoveWpt.h                          |   41 +-
 src/mouse/CMouseNormal.cpp                         |  239 +--
 src/mouse/CMouseNormal.h                           |  103 +-
 src/mouse/CMouseRangeTrk.cpp                       |  198 +--
 src/mouse/CMouseRangeTrk.h                         |   54 +-
 src/mouse/CScrOptEditLine.cpp                      |    1 -
 src/mouse/CScrOptEditLine.h                        |   11 +-
 src/mouse/CScrOptPoint.cpp                         |    4 +-
 src/mouse/CScrOptPoint.h                           |    8 +-
 src/mouse/CScrOptRange.cpp                         |    2 -
 src/mouse/CScrOptRange.h                           |    8 +-
 src/mouse/CScrOptRangeTrk.cpp                      |    7 +-
 src/mouse/CScrOptRangeTrk.h                        |    8 +-
 src/mouse/CScrOptUnclutter.cpp                     |   35 +-
 src/mouse/CScrOptUnclutter.h                       |   65 +-
 src/mouse/IMouse.cpp                               |    6 +-
 src/mouse/IMouse.h                                 |   91 +-
 src/mouse/IMouseEditLine.cpp                       |  731 +++++-----
 src/mouse/IMouseEditLine.h                         |  229 ++-
 src/mouse/IScrOpt.cpp                              |    4 +-
 src/mouse/IScrOpt.h                                |   34 +-
 src/plot/CPlotAxis.cpp                             |  245 ++--
 src/plot/CPlotAxis.h                               |  238 +--
 src/plot/CPlotAxisTime.cpp                         |    6 +-
 src/plot/CPlotAxisTime.h                           |   34 +-
 src/plot/CPlotData.cpp                             |   45 +-
 src/plot/CPlotData.h                               |  126 +-
 src/plot/CPlotDistance.cpp                         |   10 +-
 src/plot/CPlotDistance.h                           |   13 +-
 src/plot/CPlotProfile.cpp                          |   13 +-
 src/plot/CPlotProfile.h                            |   16 +-
 src/plot/CPlotSpeed.cpp                            |    4 +-
 src/plot/CPlotSpeed.h                              |   13 +-
 src/plot/CPlotTrack.cpp                            |  141 +-
 src/plot/CPlotTrack.h                              |   45 +-
 src/plot/IPlot.cpp                                 |   85 +-
 src/plot/IPlot.h                                   |  201 +--
 src/plot/ITrack.cpp                                |  190 +++
 src/{qlgt/IQlgtOverlay.h => plot/ITrack.h}         |   56 +-
 src/qlgt/CImportDatabase.cpp                       |    4 +-
 src/qlgt/CImportDatabase.h                         |   27 +-
 src/qlgt/CQlb.cpp                                  |   54 +-
 src/qlgt/CQlb.h                                    |  131 +-
 src/qlgt/CQlgtDb.cpp                               |   40 +-
 src/qlgt/CQlgtDb.h                                 |   92 +-
 src/qlgt/CQlgtDiary.cpp                            |   49 +-
 src/qlgt/CQlgtDiary.h                              |   12 +-
 src/qlgt/CQlgtFolder.cpp                           |   11 +-
 src/qlgt/CQlgtFolder.h                             |   20 +-
 src/qlgt/CQlgtRoute.cpp                            |   92 +-
 src/qlgt/CQlgtRoute.h                              |   45 +-
 src/qlgt/CQlgtTrack.cpp                            |  365 ++---
 src/qlgt/CQlgtTrack.h                              |  457 +++---
 src/qlgt/CQlgtWpt.cpp                              |  232 +--
 src/qlgt/CQlgtWpt.h                                |  152 +-
 src/qlgt/CQmsDb.cpp                                |   67 +-
 src/qlgt/CQmsDb.h                                  |   43 +-
 src/qlgt/IItem.cpp                                 |    2 -
 src/qlgt/IItem.h                                   |   29 +-
 src/qlgt/IQlgtOverlay.cpp                          |  112 +-
 src/qlgt/IQlgtOverlay.h                            |   31 +-
 src/qlgt/converter.cpp                             |   14 +-
 src/resources.qrc                                  |   10 +-
 src/units/CTimeZoneSetup.cpp                       |    5 +-
 src/units/CTimeZoneSetup.h                         |   14 +-
 src/units/CUnitImperial.cpp                        |   20 +-
 src/units/CUnitImperial.h                          |   14 +-
 src/units/CUnitMetric.cpp                          |    5 +-
 src/units/CUnitMetric.h                            |   16 +-
 src/units/CUnitNautic.cpp                          |    5 +-
 src/units/CUnitNautic.h                            |   18 +-
 src/units/CUnitsSetup.cpp                          |    5 +-
 src/units/CUnitsSetup.h                            |   13 +-
 src/units/IUnit.cpp                                |   53 +-
 src/units/IUnit.h                                  |  135 +-
 src/version.h                                      |    2 +-
 330 files changed, 14488 insertions(+), 11205 deletions(-)
 create mode 100644 call_Uncrustify.cfg
 create mode 100755 call_Uncrustify.sh
 delete mode 100644 debian/patches/artificial-typo.patch
 copy src/gis/trk/filter/{CFilterDelete.cpp => CFilterReset.cpp} (85%)
 copy src/{dem/IDemProp.h => gis/trk/filter/CFilterReset.h} (73%)
 copy src/gis/trk/filter/{IFilterDelete.ui => IFilterReset.ui} (87%)
 create mode 100644 src/helpers/CPhotoAlbum.cpp
 copy src/{qlgt/CImportDatabase.h => helpers/CPhotoAlbum.h} (55%)
 create mode 100644 src/helpers/CPhotoViewer.cpp
 copy src/helpers/{CWptIconDialog.h => CPhotoViewer.h} (62%)
 create mode 100644 src/helpers/IPhotoAlbum.ui
 create mode 100644 src/icons/32x32/AddImage.png
 create mode 100644 src/icons/32x32/DelImage.png
 create mode 100644 src/icons/32x32/Image.png
 create mode 100644 src/icons/32x32/Print.png
 create mode 100644 src/icons/48x48/AddImage.png
 create mode 100644 src/icons/48x48/DelImage.png
 create mode 100644 src/icons/48x48/Image.png
 create mode 100644 src/icons/48x48/Print.png
 create mode 100644 src/icons/AddImage.svg
 create mode 100644 src/icons/DelImage.svg
 create mode 100644 src/icons/Image.svg
 create mode 100644 src/icons/Print.svg
 create mode 100644 src/plot/ITrack.cpp
 copy src/{qlgt/IQlgtOverlay.h => plot/ITrack.h} (58%)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git



More information about the Pkg-grass-devel mailing list