DELTA SVNACAA--- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig 2020-05-21 11:11:11 UTC +++ src/qmapshack/gis/wpt/CGisItemWpt.cpp @@ -38,6 +38,7 @@ #include #include +#include IGisItem::key_t CGisItemWpt::keyUserFocus; QMap CGisItemWpt::keywordLambdaMap; ENDREP DELTA SVN3533--- src/qmapshack/helpers/CDraw.cpp.orig 2020-05-21 11:11:11 UTC +++ src/qmapshack/helpers/CDraw.cpp @@ -24,6 +24,7 @@ #include #include #include +#include QPen CDraw::penBorderBlue(QColor(10, 10, 150, 220), 2); QPen CDraw::penBorderGray(Qt::lightGray, 2); ENDREP DELTA SVNy{yy--- src/qmapshack/map/CMapIMG.cpp.orig 2020-05-21 11:11:11 UTC +++ src/qmapshack/map/CMapIMG.cpp @@ -33,6 +33,7 @@ #include "units/IUnit.h" #include +#include #undef DEBUG_SHOW_SECT_DESC #undef DEBUG_SHOW_TRE_DATA ENDREP DELTA SVNDFDD--- src/qmapshack/mouse/IMouseSelect.cpp.orig 2020-05-21 11:11:11 UTC +++ src/qmapshack/mouse/IMouseSelect.cpp @@ -23,6 +23,7 @@ #include "mouse/IScrOpt.h" #include +#include IMouseSelect::IMouseSelect(CGisDraw *gis, CCanvas *canvas, CMouseAdapter *mouse) : IMouse(gis, canvas, mouse) ENDREP DELTA SVN,.,,--- src/qmaptool/helpers/CDraw.cpp.orig 2020-05-21 11:11:11 UTC +++ src/qmaptool/helpers/CDraw.cpp @@ -24,6 +24,7 @@ #include #include #include +#include QPen CDraw::penBorderBlue(QColor(10,10,150,220),2); QPen CDraw::penBorderGray(Qt::lightGray,2); ENDREP DELTA SVN --- src/qmaptool/overlay/COverlayCutMap.cpp.orig 2020-05-21 11:11:11 UTC +++ src/qmaptool/overlay/COverlayCutMap.cpp @@ -24,6 +24,8 @@ #include #include +#include + using std::bind; static inline qreal sqr(qreal a) ENDREP id: 4-536113.0.r536113/1944 type: file count: 0 text: 536113 0 338 321 f808b3c7cbe681a577e6f1623a6da0ee 089128473d5162cfc5fbda405488e8e79313a50f 536112-bho1/_6 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp copyroot: 0 / id: 7-536113.0.r536113/2255 type: file count: 0 text: 536113 351 324 307 867c1730d305a41d3c18d29aec164d02 fa64352043fcafab2b286043a407c8eca0fa5e28 536112-bho1/_8 props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp copyroot: 0 / id: 9-536113.0.r536113/2562 type: file count: 0 text: 536113 688 266 249 08f0c7d53542ee1bb3705545309b0cbb b446c0c5a1bb393ed5a445dfb769e734730f3938 536112-bho1/_a props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp copyroot: 0 / id: b-536113.0.r536113/2867 type: file count: 0 text: 536113 967 341 324 173e396ab56c50ae1dbe299443022ab3 41a6c5a9deead2ba9cda31f7cef686ea44bf2321 536112-bho1/_c props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp copyroot: 0 / id: d-536113.0.r536113/3179 type: file count: 0 text: 536113 1321 317 300 d996e8d940789603e344e8c4d563bb33 73a9b498b0cf4eb6a510b988e7c99a0d5d1b3cb8 536112-bho1/_e props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/astro/qmapshack/files/patch-src_qmaptool_helpers_CDraw.cpp copyroot: 0 / id: f-536113.0.r536113/3486 type: file count: 0 text: 536113 1651 280 263 d209e05494b59b9361ac8725939abf3f 0635cf1aad51e7941aafd9f983c8f78d4bc4e2fc 536112-bho1/_g props: 300936 2259 98 0 8dda59e103a981389badbb35c2ee62ce cpath: /head/astro/qmapshack/files/patch-src_qmaptool_overlay_COverlayCutMap.cpp copyroot: 0 / PLAIN K 20 patch-CMakeLists.txt V 28 file 6-499552.0.r530277/2611 K 49 patch-cmake_Modules_DefineInstallationPaths.cmake V 36 file b-400234.1u-419133.r530277/2931 K 34 patch-src_qmapshack_CMakeLists.txt V 28 file a-499552.0.r530277/3377 K 50 patch-src_qmapshack_device_CDeviceWatcherLinux.cpp V 28 file c-499552.0.r518253/1783 K 43 patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp V 28 file 4-536113.0.r536113/1944 K 37 patch-src_qmapshack_helpers_CDraw.cpp V 28 file 7-536113.0.r536113/2255 K 35 patch-src_qmapshack_map_CMapIMG.cpp V 28 file 9-536113.0.r536113/2562 K 42 patch-src_qmapshack_mouse_IMouseSelect.cpp V 28 file b-536113.0.r536113/2867 K 33 patch-src_qmaptool_CMakeLists.txt V 28 file e-499552.0.r530277/3711 K 36 patch-src_qmaptool_helpers_CDraw.cpp V 28 file d-536113.0.r536113/3179 K 45 patch-src_qmaptool_overlay_COverlayCutMap.cpp V 28 file f-536113.0.r536113/3486 K 37 patch-src_qmt__map2jnx_CMakeLists.txt V 28 file g-499552.0.r530277/4045 K 37 patch-src_qmt__rgb2pct_CMakeLists.txt V 28 file i-499552.0.r530277/4383 END ENDREP id: a-400234.0.r536113/4845 type: dir pred: a-400234.0.r530277/5286 count: 14 text: 536113 3802 1030 0 fc9ad1c39b06344b1993ef83b7582f03 cpath: /head/astro/qmapshack/files copyroot: 0 / PLAIN K 8 Makefile V 28 file 5-400234.0.r530277/2008 K 8 distinfo V 28 file 8-400234.0.r530277/2308 K 5 files V 27 dir a-400234.0.r536113/4845 K 9 pkg-descr V 28 file e-400234.0.r518253/2883 K 9 pkg-plist V 28 file g-400234.0.r530277/5471 END ENDREP id: 4-400234.0.r536113/5281 type: dir pred: 4-400234.0.r530277/6025 count: 39 text: 536113 5031 237 0 346bc7478501581288556bdcf7a309ba cpath: /head/astro/qmapshack copyroot: 0 / PLAIN K 8 Makefile V 26 file 2-4126.0.r522617/2340 K 15 R-cran-maptools V 27 dir 4-281901.0.r535357/1165 K 7 accrete V 26 dir 4-85812.0.r463107/1442 K 10 astrometry V 27 dir 4-237991.0.r533236/1569 K 16 boinc-astropulse V 28 dir 4-268142.0.r516738/10388 K 16 boinc-setiathome V 35 dir 4-158271.0-459014.r516738/11222 K 8 celestia V 27 dir 4-59394.0.r531700/49825 K 12 celestia-gtk V 28 dir 8-161335.0.r352516/10165 K 7 cfitsio V 26 dir 4-108032.0.r510465/569 K 5 fowsr V 28 dir 4-260351.0.r424658/16302 K 10 foxtrotgps V 27 dir 4-268361.0.r528219/4917 K 13 geographiclib V 27 dir 4-366683.0.r526339/4306 K 11 gkrellmoon2 V 28 dir 4-117591.0.r517040/31829 K 8 gnuastro V 27 dir 4-497484.0.r518465/1422 K 12 google-earth V 28 dir 4-165314.0.r508834/44607 K 8 gpsbabel V 29 dir 4-160794.0.r507372/329898 K 10 gpsbabel14 V 33 dir 4-160794.0-357391.r457178/623 K 12 gpscorrelate V 28 dir 4-208617.0.r517040/32529 K 4 gpsd V 26 dir 4-153259.0.r528275/634 K 6 gpsman V 27 dir 4-52039.0.r523220/34520 K 8 gpsprune V 34 dir 4-236619.0-308179.r530919/2032 K 5 gpstk V 26 dir 4-176181.0.r535255/608 K 10 gpxloggerd V 27 dir 4-262634.0.r528219/8113 K 4 jday V 25 dir 4-38299.0.r355901/658 K 4 josm V 27 dir 4-229016.0.r531144/1036 K 6 kstars V 35 dir 19-283641.0-468592.r533142/1576 K 6 libgal V 29 dir 4-209589.0.r415498/124026 K 10 libkgeomap V 35 dir 4-298855.0-466809.r535307/81955 K 7 libnova V 25 dir 4-68642.0.r474623/639 K 9 libosmium V 34 dir 4-319273.0-426943.r533721/1199 K 9 libosmpbf V 27 dir 4-318981.0.r523788/4731 K 4 luna V 27 dir 2-4129.0.r419133/403623 K 6 marble V 35 dir o-255469.1-466809.r535307/82749 K 5 match V 26 dir 4-51645.0.r447883/1229 K 10 merkaartor V 27 dir 4-226138.0.r536105/1469 K 6 mkgmap V 27 dir 4-254519.0.r534803/1029 K 15 mkgmap-splitter V 27 dir 4-273512.0.r531230/1281 K 6 mymoon V 28 dir 4-82022.0.r419133/406521 K 9 nightfall V 27 dir 4-59969.0.r517040/34733 K 7 opencpn V 27 dir 4-423561.0.r535516/8910 K 12 openuniverse V 27 dir 2-12308.0.r516738/12752 K 5 oskar V 27 dir 4-475148.0.r523759/1606 K 7 osmosis V 27 dir 4-242070.0.r534804/1000 K 8 p5-Astro V 29 dir 4-234415.0.r470993/447268 K 12 p5-Astro-ADS V 28 dir 4-68368.0.r481365/338372 K 21 p5-Astro-App-Satpass2 V 27 dir 4-437603.0.r526443/1086 K 16 p5-Astro-Catalog V 26 dir 4-68399.0.r533871/1064 K 18 p5-Astro-Constants V 27 dir 4-252171.0.r532173/1433 K 15 p5-Astro-Coords V 27 dir 4-300711.0.r511925/1061 K 12 p5-Astro-DSS V 28 dir 4-68373.0.r481365/341208 K 21 p5-Astro-FITS-CFITSIO V 27 dir 4-267438.0.r507401/7942 K 20 p5-Astro-FITS-Header V 26 dir 4-103734.0.r498853/582 K 13 p5-Astro-Flux V 26 dir 4-300708.0.r502050/610 K 18 p5-Astro-Hipparcos V 29 dir 4-247060.0.r470993/453036 K 18 p5-Astro-MoonPhase V 28 dir 4-36692.0.r470993/453749 K 12 p5-Astro-PAL V 27 dir 4-300709.0.r507790/1058 K 15 p5-Astro-SIMBAD V 28 dir 4-68371.0.r481365/342625 K 22 p5-Astro-SIMBAD-Client V 27 dir 4-232140.0.r520441/1091 K 19 p5-Astro-SpaceTrack V 27 dir 4-168388.0.r530982/1080 K 16 p5-Astro-SunTime V 26 dir 4-36693.0.r446602/1094 K 16 p5-Astro-Sunrise V 26 dir 4-42004.0.r490758/1061 K 18 p5-Astro-Telescope V 26 dir 4-300710.0.r502052/613 K 17 p5-Astro-WaveBand V 26 dir 4-300707.0.r502053/609 K 16 p5-Astro-satpass V 27 dir 4-232139.0.r530983/1066 K 6 p5-GPS V 28 dir 4-35705.0.r481365/344773 K 12 p5-GPS-Babel V 29 dir 4-234848.0.r481365/345474 K 10 p5-GPS-OID V 29 dir 4-255599.0.r470993/460865 K 12 p5-GPS-Point V 27 dir 4-495356.0.r495356/2165 K 12 p5-Geo-METAR V 25 dir 4-36553.0.r451691/584 K 15 p5-Misc-Quality V 26 dir 4-300705.0.r502054/652 K 12 p5-Net-GPSD3 V 27 dir 4-495590.0.r495590/3319 K 15 p5-Starlink-AST V 29 dir 4-302004.0.r481365/346185 K 22 p5-Weather-Underground V 29 dir 4-162628.0.r481365/346912 K 5 phoon V 26 dir 4-81092.0.r471445/2940 K 3 pp3 V 25 dir 4-96516.0.r428805/940 K 6 ptiger V 29 dir 4-171431.0.r412344/273568 K 5 py-RO V 27 dir 4-266946.0.r520140/1198 K 9 py-astLib V 27 dir 4-231069.0.r529063/7966 K 10 py-astropy V 26 dir 4-417939.0.r520327/567 K 8 py-ephem V 34 dir 4-186585.0-520162.r520162/3752 K 21 py-horoscopegenerator V 26 dir 4-419671.0.r526278/520 K 8 py-metar V 26 dir 5-468646.0.r527357/498 K 8 py-metpy V 26 dir 4-468596.0.r527358/498 K 10 py-pymeeus V 27 dir 4-520157.0.r520157/2176 K 10 py-pymetar V 32 dir 4-63558.0-403519.r527359/609 K 9 py-pysofa V 29 dir 4-475344.0.r507372/341517 K 9 py-pywapi V 28 dir 4-419623.0.r458818/19069 K 13 py-spacetrack V 27 dir 4-473219.0.r495479/1007 K 7 pyephem V 26 dir 4-186585.0.r520166/732 K 9 pyweather V 27 dir 2-24453.0.r371096/21114 K 9 qmapshack V 27 dir 4-400234.0.r536113/5281 K 7 readosm V 28 dir 4-379799.0.r523070/19090 K 4 rmap V 26 dir 4-30058.0.r533989/8442 K 7 roadmap V 27 dir 4-74310.0.r517040/35418 K 7 routino V 27 dir 4-400197.0.r512621/1073 K 8 saoimage V 27 dir 2-10544.0.r523220/35204 K 10 sextractor V 28 dir 4-212291.0.r371223/39279 K 5 siril V 34 dir 4-460947.0-465565.r528082/5015 K 4 sofa V 27 dir 4-475343.0.r524721/1046 K 6 sscalc V 25 dir 4-36122.0.r526837/555 K 9 stardates V 28 dir 4-142867.0.r523220/36830 K 8 starplot V 28 dir 4-47135.0.r507372/343824 K 5 stars V 26 dir 2-3514.0.r516738/14116 K 10 stellarium V 26 dir 4-99180.0.r532454/1685 K 8 sunclock V 26 dir 2-3782.0.r516738/14836 K 7 sunwait V 27 dir 4-453057.0.r453057/2178 K 3 swe V 27 dir 4-222285.0.r505185/1079 K 9 tclgeomap V 27 dir 4-171387.0.r413730/1988 K 8 tkgeomap V 28 dir e-171387.0.r455167/35629 K 6 wcslib V 27 dir 4-237990.0.r512097/3096 K 7 weather V 26 dir 4-255511.0.r523530/873 K 7 wmglobe V 34 dir 2-19791.0-491271.r516738/16308 K 9 wmjupiter V 27 dir 4-53136.0.r516738/17025 K 11 wmmoonclock V 26 dir 2-17174.0.r534979/1131 K 7 wmsolar V 27 dir 4-53138.0.r516738/18386 K 14 wmspaceweather V 27 dir 2-18198.0.r516738/19075 K 5 wmsun V 27 dir 2-18199.0.r523220/37509 K 6 xearth V 23 dir 3-301.0.r531756/918 K 6 xeartk V 29 dir 4-171433.0.r415498/126705 K 6 xephem V 24 dir 2-3623.0.r513113/582 K 9 xmoontool V 28 dir 4-152569.0.r516738/21093 K 6 xphoon V 25 dir 2-983.0.r516738/21762 K 7 xplanet V 26 dir 2-26182.0.r517230/4685 K 5 xtide V 26 dir 2-8881.0.r516738/23155 K 6 xworld V 27 dir 4-46872.0.r516738/23835 END ENDREP id: 1-301.0.r536113/11580 type: dir pred: 1-301.0.r536105/7769 count: 4190 text: 536113 5460 6107 0 06df41881c331cf55924d7e8429a2ac4 cpath: /head/astro copyroot: 0 / PLAIN K 10 .arcconfig V 26 file 1-354154.0.r422906/41 K 14 .gitattributes V 26 file 1-411777.0.r467740/54 K 11 .gitauthors V 26 file 1-467739.0.r531045/84 K 10 .gitignore V 26 file 1-348322.0.r458023/77 K 11 .gitmessage V 27 file 3-457790.0.r457790/987 K 7 CHANGES V 27 file 1-99373.0.r535241/1507 K 15 CONTRIBUTING.md V 27 file 1-348323.0.r348323/344 K 9 COPYRIGHT V 26 file 1-146787.0.r521639/51 K 4 GIDs V 27 file 1-168311.0.r534288/411 K 8 Keywords V 27 dir 1-314142.0.r535225/1330 K 5 LEGAL V 25 file 1-748.0.r534928/1140 K 5 MOVED V 27 file 1-69878.0.r535965/3392 K 8 Makefile V 23 file 1-6.0.r516635/2409 K 2 Mk V 22 dir 1-5.0.r536006/2068 K 6 README V 25 file 1-2408.0.r494236/641 K 9 Templates V 24 dir 1-2932.0.r535001/802 K 5 Tools V 26 dir 3-15302.0.r534316/3096 K 4 UIDs V 28 file 4-168311.0.r535524/3963 K 8 UPDATING V 28 file 1-102685.0.r535769/3942 K 13 accessibility V 27 dir 1-42583.0.r535307/66985 K 6 arabic V 27 dir 1-38973.0.r535467/51041 K 9 archivers V 25 dir 1-242.0.r536007/17191 K 5 astro V 25 dir 1-301.0.r536113/11580 K 5 audio V 25 dir 1-148.0.r536109/45504 K 4 base V 26 dir 1-420954.0.r521962/779 K 10 benchmarks V 23 dir 1-62.0.r535974/6153 K 7 biology V 26 dir 1-9066.0.r535875/12681 K 3 cad V 24 dir 1-276.0.r536103/7958 K 7 chinese V 26 dir 1-3770.0.r535467/57945 K 5 comms V 24 dir 1-76.0.r536099/11557 K 10 converters V 26 dir 1-1561.0.r535900/10581 K 9 databases V 25 dir 1-771.0.r536088/58593 K 9 deskutils V 26 dir 1-2098.0.r536078/15190 K 5 devel V 25 dir 1-73.0.r536096/378078 K 3 dns V 26 dir 1-6145.0.r536001/17069 K 7 editors V 23 dir 4-6.0.r536100/14045 K 9 emulators V 25 dir 1-181.0.r536043/10073 K 7 finance V 27 dir 1-4110.0.r535516/569205 K 6 french V 28 dir 1-25673.0.r535467/139694 K 3 ftp V 26 dir 1-199.0.r535516/574738 K 5 games V 25 dir 1-104.0.r536098/57275 K 6 german V 25 dir 1-7451.0.r535831/2334 K 8 graphics V 24 dir 1-94.0.r536111/57206 K 6 hebrew V 28 dir 3-31142.0.r535467/142859 K 9 hungarian V 29 dir 1p-38973.0.r535467/144130 K 3 irc V 23 dir 1-42.0.r535744/7324 K 8 japanese V 26 dir 1-410.0.r535467/159253 K 4 java V 25 dir 1-2798.0.r534795/7914 K 6 korean V 27 dir 1-5873.0.r535467/162228 K 4 lang V 24 dir 1-15.0.r536085/18892 K 4 mail V 24 dir 1-57.0.r536022/40561 K 4 math V 25 dir 1-162.0.r536084/50345 K 4 misc V 24 dir 7-35.0.r536074/28428 K 10 multimedia V 25 dir d-333.0.r536101/25566 K 3 net V 24 dir 1-22.0.r536067/81724 K 6 net-im V 28 dir 15-11144.0.r536104/13767 K 8 net-mgmt V 26 dir r-1011.0.r536089/22994 K 7 net-p2p V 26 dir g-29106.0.r536110/6644 K 4 news V 26 dir 1-145.0.r534093/992321 K 6 polish V 27 dir tv-38973.0.r536091/2976 K 10 ports-mgmt V 25 dir 1-5132.0.r535478/4739 K 10 portuguese V 28 dir 1-17842.0.r535467/165809 K 5 print V 24 dir 1-79.0.r536108/15148 K 7 russian V 27 dir 1-1559.0.r535467/168369 K 7 science V 26 dir n-5356.0.r536079/18707 K 8 security V 25 dir 1-269.0.r536112/69662 K 6 shells V 22 dir w-6.0.r535983/3915 K 8 sysutils V 25 dir b-339.0.r536072/79805 K 8 textproc V 26 dir 1-322.0.r536092/101398 K 9 ukrainian V 28 dir g-39704.0.r535467/169722 K 10 vietnamese V 27 dir 1-4812.0.r535467/171421 K 3 www V 26 dir 1-114.0.r536082/138527 K 3 x11 V 24 dir 1-16.0.r536107/27404 K 10 x11-clocks V 27 dir 1-931.0.r535307/1393178 K 11 x11-drivers V 27 dir 1-157567.0.r535890/4073 K 6 x11-fm V 24 dir 1-691.0.r535518/2728 K 9 x11-fonts V 25 dir 1-543.0.r535854/14445 K 11 x11-servers V 25 dir 1n-710.0.r536015/1887 K 10 x11-themes V 27 dir 1-14410.0.r535559/10212 K 12 x11-toolkits V 25 dir 1-120.0.r536075/13866 K 6 x11-wm V 23 dir 1-40.0.r536021/8537 END ENDREP id: 2-1.0.r536113/15325 type: dir pred: 2-1.0.r536112/73412 count: 526927 text: 536113 11747 3565 0 a36d4e54208266dd81f6832eaf3b8f18 props: 458023 3927 157 0 4d85142843815bcc29c89469bccb873c cpath: /head copyroot: 0 / PLAIN K 8 branches V 23 dir 0-1.0.r536086/17477 K 4 head V 23 dir 2-1.0.r536113/15325 K 8 projects V 24 dir 0-377393.0.r441387/0 K 8 svnadmin V 22 dir 3-1.0.r533934/1655 K 4 tags V 22 dir 8-1.0.r514565/5542 END ENDREP id: 0.0.r536113/15762 type: dir pred: 0.0.r536112/73849 count: 536113 text: 536113 15544 205 0 d33f5726e2a714fade8d7eb6e1039f51 props: 341041 7130 346 0 8b695b9f61597e4917effffba3bbfaa3 cpath: / copyroot: 0 / minfo-cnt: 57 _4.0.t536112-bho1 add-file true true /head/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp _7.0.t536112-bho1 add-file true true /head/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp _9.0.t536112-bho1 add-file true true /head/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp _b.0.t536112-bho1 add-file true true /head/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp _d.0.t536112-bho1 add-file true true /head/astro/qmapshack/files/patch-src_qmaptool_helpers_CDraw.cpp _f.0.t536112-bho1 add-file true true /head/astro/qmapshack/files/patch-src_qmaptool_overlay_COverlayCutMap.cpp 15762 15986