This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository merkaartor.
commit a7c27c2a286aad469cb8912492206eed96613cec Merge: 7a126bf e920a8f Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Sep 18 01:17:45 2015 +0200 Merge tag 'upstream/0.18.2' Upstream version 0.18.2 .travis.yml | 17 + .../examples/loader/main.cpp | 8 +- .../examples/trivial/main.cpp | 2 +- .../qtsingleapplication.pro | 1 + .../src/qtlocalpeer.cpp | 7 +- .../src/qtlockedfile_win.cpp | 3 + .../src/qtsingleapplication.cpp | 4 +- .../src/qtsingleapplication.h | 4 +- .../src/qtsingleapplication.pri | 2 +- .../qttoolbardialog-2.2_1-opensource/INSTALL.TXT | 254 - .../LGPL_EXCEPTION.txt | 23 - .../qttoolbardialog-2.2_1-opensource/LICENSE.GPL3 | 674 -- .../qttoolbardialog-2.2_1-opensource/LICENSE.LGPL | 504 - .../qttoolbardialog-2.2_1-opensource/README.TXT | 7 - .../buildlib/buildlib.pro | 13 - .../qttoolbardialog-2.2_1-opensource/common.pri | 6 - .../qttoolbardialog-2.2_1-opensource/configure | 112 - .../doc/html/classic.css | 139 - .../doc/html/images/qt-logo.png | Bin 4075 -> 0 bytes .../doc/html/images/qttoolbardialog.png | Bin 12323 -> 0 bytes .../doc/html/index.html | 41 - .../doc/html/qttoolbardialog-members.html | 371 - .../doc/html/qttoolbardialog.dcf | 29 - .../doc/html/qttoolbardialog.html | 89 - .../doc/html/qttoolbardialog.index | 54 - .../doc/html/qttoolbardialog.qch | Bin 50176 -> 0 bytes .../doc/html/qttoolbardialog.qhp | 46 - .../doc/html/qttoolbarmanager-members.html | 85 - .../doc/html/qttoolbarmanager.html | 102 - .../doc/images/qt-logo.png | Bin 4075 -> 0 bytes .../doc/images/qttoolbardialog.png | Bin 12323 -> 0 bytes .../doc/index.qdoc | 37 - .../examples/examples.pro | 7 - .../examples/simple/images/copy.png | Bin 1338 -> 0 bytes .../examples/simple/images/cut.png | Bin 1323 -> 0 bytes .../examples/simple/images/new.png | Bin 852 -> 0 bytes .../examples/simple/images/open.png | Bin 2073 -> 0 bytes .../examples/simple/images/paste.png | Bin 1745 -> 0 bytes .../examples/simple/images/save.png | Bin 1187 -> 0 bytes .../examples/simple/main.cpp | 59 - .../examples/simple/mainwindow.cpp | 455 - .../examples/simple/mainwindow.h | 122 - .../examples/simple/simple.pro | 11 - .../examples/simple/simple.qrc | 10 - .../qttoolbardialog.pro | 5 - .../src/QtToolBarDialog | 1 - .../src/QtToolBarManager | 1 - .../src/qttoolbardialog.cpp | 1892 ---- .../src/qttoolbardialog.h | 144 - .../src/qttoolbardialog.pri | 17 - .../src/qttoolbardialog.qrc | 10 - 3rdparty/quazip-0.7/CMakeLists.txt | 54 + 3rdparty/quazip-0.7/COPYING | 458 + 3rdparty/quazip-0.7/Doxyfile | 1722 +++ 3rdparty/quazip-0.7/FindQuaZip.cmake | 40 + 3rdparty/quazip-0.7/NEWS.txt | 149 + 3rdparty/quazip-0.7/README.txt | 66 + .../quazip-0.7/doc/html/JlCompress_8h_source.html | 131 + 3rdparty/quazip-0.7/doc/html/annotated.html | 78 + 3rdparty/quazip-0.7/doc/html/bc_s.png | Bin 0 -> 676 bytes 3rdparty/quazip-0.7/doc/html/bdwn.png | Bin 0 -> 147 bytes .../doc/html/classJlCompress-members.html | 69 + 3rdparty/quazip-0.7/doc/html/classJlCompress.html | 475 + .../doc/html/classQuaAdler32-members.html | 67 + 3rdparty/quazip-0.7/doc/html/classQuaAdler32.html | 194 + .../doc/html/classQuaAdler32__coll__graph.map | 3 + .../doc/html/classQuaAdler32__coll__graph.md5 | 1 + .../doc/html/classQuaAdler32__coll__graph.png | Bin 0 -> 3849 bytes .../doc/html/classQuaAdler32__inherit__graph.map | 3 + .../doc/html/classQuaAdler32__inherit__graph.md5 | 1 + .../doc/html/classQuaAdler32__inherit__graph.png | Bin 0 -> 3849 bytes .../doc/html/classQuaChecksum32-members.html | 66 + .../quazip-0.7/doc/html/classQuaChecksum32.html | 197 + .../html/classQuaChecksum32__inherit__graph.map | 4 + .../html/classQuaChecksum32__inherit__graph.md5 | 1 + .../html/classQuaChecksum32__inherit__graph.png | Bin 0 -> 6444 bytes .../quazip-0.7/doc/html/classQuaCrc32-members.html | 67 + 3rdparty/quazip-0.7/doc/html/classQuaCrc32.html | 194 + .../doc/html/classQuaCrc32__coll__graph.map | 3 + .../doc/html/classQuaCrc32__coll__graph.md5 | 1 + .../doc/html/classQuaCrc32__coll__graph.png | Bin 0 -> 3690 bytes .../doc/html/classQuaCrc32__inherit__graph.map | 3 + .../doc/html/classQuaCrc32__inherit__graph.md5 | 1 + .../doc/html/classQuaCrc32__inherit__graph.png | Bin 0 -> 3690 bytes .../doc/html/classQuaGzipFile-members.html | 75 + 3rdparty/quazip-0.7/doc/html/classQuaGzipFile.html | 349 + .../doc/html/classQuaGzipFile__coll__graph.map | 2 + .../doc/html/classQuaGzipFile__coll__graph.md5 | 1 + .../doc/html/classQuaGzipFile__coll__graph.png | Bin 0 -> 3070 bytes .../doc/html/classQuaGzipFile__inherit__graph.map | 2 + .../doc/html/classQuaGzipFile__inherit__graph.md5 | 1 + .../doc/html/classQuaGzipFile__inherit__graph.png | Bin 0 -> 3070 bytes .../doc/html/classQuaZIODevice-members.html | 71 + .../quazip-0.7/doc/html/classQuaZIODevice.html | 261 + .../doc/html/classQuaZIODevice__coll__graph.map | 2 + .../doc/html/classQuaZIODevice__coll__graph.md5 | 1 + .../doc/html/classQuaZIODevice__coll__graph.png | Bin 0 -> 3294 bytes .../doc/html/classQuaZIODevice__inherit__graph.map | 2 + .../doc/html/classQuaZIODevice__inherit__graph.md5 | 1 + .../doc/html/classQuaZIODevice__inherit__graph.png | Bin 0 -> 3294 bytes .../quazip-0.7/doc/html/classQuaZip-members.html | 118 + 3rdparty/quazip-0.7/doc/html/classQuaZip.html | 1203 +++ .../doc/html/classQuaZipDir-members.html | 94 + 3rdparty/quazip-0.7/doc/html/classQuaZipDir.html | 669 ++ .../doc/html/classQuaZipFile-members.html | 95 + 3rdparty/quazip-0.7/doc/html/classQuaZipFile.html | 1034 ++ .../doc/html/classQuaZipFilePrivate-members.html | 63 + .../doc/html/classQuaZipFilePrivate.html | 77 + .../doc/html/classQuaZipFile__coll__graph.map | 2 + .../doc/html/classQuaZipFile__coll__graph.md5 | 1 + .../doc/html/classQuaZipFile__coll__graph.png | Bin 0 -> 2870 bytes .../doc/html/classQuaZipFile__inherit__graph.map | 2 + .../doc/html/classQuaZipFile__inherit__graph.md5 | 1 + .../doc/html/classQuaZipFile__inherit__graph.png | Bin 0 -> 2870 bytes .../doc/html/classQuaZipPrivate-members.html | 65 + .../quazip-0.7/doc/html/classQuaZipPrivate.html | 77 + 3rdparty/quazip-0.7/doc/html/classes.html | 72 + 3rdparty/quazip-0.7/doc/html/closed.png | Bin 0 -> 132 bytes .../html/dir_94f3fdea1a650ed21d35813cdb37a339.html | 113 + .../dir_94f3fdea1a650ed21d35813cdb37a339_dep.map | 3 + .../dir_94f3fdea1a650ed21d35813cdb37a339_dep.md5 | 1 + .../dir_94f3fdea1a650ed21d35813cdb37a339_dep.png | Bin 0 -> 1147 bytes 3rdparty/quazip-0.7/doc/html/doxygen.css | 1366 +++ 3rdparty/quazip-0.7/doc/html/doxygen.png | Bin 0 -> 3779 bytes 3rdparty/quazip-0.7/doc/html/dynsections.js | 97 + 3rdparty/quazip-0.7/doc/html/faq.html | 58 + 3rdparty/quazip-0.7/doc/html/files.html | 74 + 3rdparty/quazip-0.7/doc/html/ftv2blank.png | Bin 0 -> 86 bytes 3rdparty/quazip-0.7/doc/html/ftv2cl.png | Bin 0 -> 453 bytes 3rdparty/quazip-0.7/doc/html/ftv2doc.png | Bin 0 -> 746 bytes 3rdparty/quazip-0.7/doc/html/ftv2folderclosed.png | Bin 0 -> 616 bytes 3rdparty/quazip-0.7/doc/html/ftv2folderopen.png | Bin 0 -> 597 bytes 3rdparty/quazip-0.7/doc/html/ftv2lastnode.png | Bin 0 -> 86 bytes 3rdparty/quazip-0.7/doc/html/ftv2link.png | Bin 0 -> 746 bytes 3rdparty/quazip-0.7/doc/html/ftv2mlastnode.png | Bin 0 -> 246 bytes 3rdparty/quazip-0.7/doc/html/ftv2mnode.png | Bin 0 -> 246 bytes 3rdparty/quazip-0.7/doc/html/ftv2mo.png | Bin 0 -> 403 bytes 3rdparty/quazip-0.7/doc/html/ftv2node.png | Bin 0 -> 86 bytes 3rdparty/quazip-0.7/doc/html/ftv2ns.png | Bin 0 -> 388 bytes 3rdparty/quazip-0.7/doc/html/ftv2plastnode.png | Bin 0 -> 229 bytes 3rdparty/quazip-0.7/doc/html/ftv2pnode.png | Bin 0 -> 229 bytes 3rdparty/quazip-0.7/doc/html/ftv2splitbar.png | Bin 0 -> 314 bytes 3rdparty/quazip-0.7/doc/html/ftv2vertline.png | Bin 0 -> 86 bytes 3rdparty/quazip-0.7/doc/html/functions.html | 97 + 3rdparty/quazip-0.7/doc/html/functions_b.html | 97 + 3rdparty/quazip-0.7/doc/html/functions_c.html | 160 + 3rdparty/quazip-0.7/doc/html/functions_d.html | 106 + 3rdparty/quazip-0.7/doc/html/functions_e.html | 130 + 3rdparty/quazip-0.7/doc/html/functions_enum.html | 75 + 3rdparty/quazip-0.7/doc/html/functions_eval.html | 93 + 3rdparty/quazip-0.7/doc/html/functions_f.html | 108 + 3rdparty/quazip-0.7/doc/html/functions_func.html | 532 + 3rdparty/quazip-0.7/doc/html/functions_g.html | 180 + 3rdparty/quazip-0.7/doc/html/functions_h.html | 97 + 3rdparty/quazip-0.7/doc/html/functions_i.html | 122 + 3rdparty/quazip-0.7/doc/html/functions_m.html | 119 + 3rdparty/quazip-0.7/doc/html/functions_n.html | 102 + 3rdparty/quazip-0.7/doc/html/functions_o.html | 112 + 3rdparty/quazip-0.7/doc/html/functions_p.html | 100 + 3rdparty/quazip-0.7/doc/html/functions_q.html | 112 + 3rdparty/quazip-0.7/doc/html/functions_r.html | 107 + 3rdparty/quazip-0.7/doc/html/functions_s.html | 174 + 3rdparty/quazip-0.7/doc/html/functions_t.html | 97 + 3rdparty/quazip-0.7/doc/html/functions_u.html | 110 + 3rdparty/quazip-0.7/doc/html/functions_v.html | 107 + 3rdparty/quazip-0.7/doc/html/functions_vars.html | 192 + 3rdparty/quazip-0.7/doc/html/functions_w.html | 99 + 3rdparty/quazip-0.7/doc/html/functions_z.html | 97 + 3rdparty/quazip-0.7/doc/html/functions_~.html | 109 + 3rdparty/quazip-0.7/doc/html/graph_legend.html | 116 + 3rdparty/quazip-0.7/doc/html/graph_legend.md5 | 1 + 3rdparty/quazip-0.7/doc/html/graph_legend.png | Bin 0 -> 19871 bytes 3rdparty/quazip-0.7/doc/html/hierarchy.html | 81 + 3rdparty/quazip-0.7/doc/html/index.html | 130 + 3rdparty/quazip-0.7/doc/html/inherit_graph_0.map | 3 + 3rdparty/quazip-0.7/doc/html/inherit_graph_0.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_0.png | Bin 0 -> 1293 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_1.map | 3 + 3rdparty/quazip-0.7/doc/html/inherit_graph_1.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_1.png | Bin 0 -> 2239 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_10.map | 3 + 3rdparty/quazip-0.7/doc/html/inherit_graph_10.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_10.png | Bin 0 -> 1493 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_2.map | 5 + 3rdparty/quazip-0.7/doc/html/inherit_graph_2.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_2.png | Bin 0 -> 4633 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_3.map | 5 + 3rdparty/quazip-0.7/doc/html/inherit_graph_3.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_3.png | Bin 0 -> 7279 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_4.map | 3 + 3rdparty/quazip-0.7/doc/html/inherit_graph_4.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_4.png | Bin 0 -> 1124 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_5.map | 3 + 3rdparty/quazip-0.7/doc/html/inherit_graph_5.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_5.png | Bin 0 -> 1208 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_6.map | 3 + 3rdparty/quazip-0.7/doc/html/inherit_graph_6.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_6.png | Bin 0 -> 1492 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_7.map | 3 + 3rdparty/quazip-0.7/doc/html/inherit_graph_7.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_7.png | Bin 0 -> 1764 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_8.map | 3 + 3rdparty/quazip-0.7/doc/html/inherit_graph_8.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_8.png | Bin 0 -> 1772 bytes 3rdparty/quazip-0.7/doc/html/inherit_graph_9.map | 3 + 3rdparty/quazip-0.7/doc/html/inherit_graph_9.md5 | 1 + 3rdparty/quazip-0.7/doc/html/inherit_graph_9.png | Bin 0 -> 1717 bytes 3rdparty/quazip-0.7/doc/html/inherits.html | 107 + 3rdparty/quazip-0.7/doc/html/nav_f.png | Bin 0 -> 153 bytes 3rdparty/quazip-0.7/doc/html/nav_g.png | Bin 0 -> 94 bytes 3rdparty/quazip-0.7/doc/html/nav_h.png | Bin 0 -> 98 bytes 3rdparty/quazip-0.7/doc/html/open.png | Bin 0 -> 123 bytes 3rdparty/quazip-0.7/doc/html/pages.html | 58 + .../quazip-0.7/doc/html/quaadler32_8h_source.html | 117 + .../doc/html/quachecksum32_8h_source.html | 110 + .../quazip-0.7/doc/html/quacrc32_8h_source.html | 113 + .../quazip-0.7/doc/html/quagzipfile_8h_source.html | 129 + .../doc/html/quaziodevice_8h_source.html | 118 + 3rdparty/quazip-0.7/doc/html/quazip_8h_source.html | 225 + .../doc/html/quazip__global_8h_source.html | 111 + .../quazip-0.7/doc/html/quazipdir_8h_source.html | 166 + .../quazip-0.7/doc/html/quazipfile_8h_source.html | 183 + .../doc/html/quazipfileinfo_8h_source.html | 174 + .../doc/html/quazipnewinfo_8h_source.html | 147 + .../html/structQIODevice__descriptor-members.html | 64 + .../doc/html/structQIODevice__descriptor.html | 72 + .../doc/html/structQuaZipFileInfo-members.html | 77 + .../quazip-0.7/doc/html/structQuaZipFileInfo.html | 160 + .../doc/html/structQuaZipFileInfo64-members.html | 81 + .../doc/html/structQuaZipFileInfo64.html | 306 + .../doc/html/structQuaZipNewInfo-members.html | 81 + .../quazip-0.7/doc/html/structQuaZipNewInfo.html | 551 + 3rdparty/quazip-0.7/doc/html/sync_off.png | Bin 0 -> 853 bytes 3rdparty/quazip-0.7/doc/html/sync_on.png | Bin 0 -> 845 bytes 3rdparty/quazip-0.7/doc/html/tab_a.png | Bin 0 -> 142 bytes 3rdparty/quazip-0.7/doc/html/tab_b.png | Bin 0 -> 169 bytes 3rdparty/quazip-0.7/doc/html/tab_h.png | Bin 0 -> 177 bytes 3rdparty/quazip-0.7/doc/html/tab_s.png | Bin 0 -> 184 bytes 3rdparty/quazip-0.7/doc/html/tabs.css | 60 + 3rdparty/quazip-0.7/doc/html/usage.html | 70 + 3rdparty/quazip-0.7/doc/latex/annotated.tex | 18 + 3rdparty/quazip-0.7/doc/latex/classJlCompress.tex | 274 + 3rdparty/quazip-0.7/doc/latex/classQuaAdler32.tex | 108 + .../doc/latex/classQuaAdler32__coll__graph.eps | 264 + .../doc/latex/classQuaAdler32__coll__graph.md5 | 1 + .../doc/latex/classQuaAdler32__inherit__graph.eps | 264 + .../doc/latex/classQuaAdler32__inherit__graph.md5 | 1 + .../quazip-0.7/doc/latex/classQuaChecksum32.tex | 113 + .../latex/classQuaChecksum32__inherit__graph.eps | 310 + .../latex/classQuaChecksum32__inherit__graph.md5 | 1 + 3rdparty/quazip-0.7/doc/latex/classQuaCrc32.tex | 108 + .../doc/latex/classQuaCrc32__coll__graph.eps | 264 + .../doc/latex/classQuaCrc32__coll__graph.md5 | 1 + .../doc/latex/classQuaCrc32__inherit__graph.eps | 264 + .../doc/latex/classQuaCrc32__inherit__graph.md5 | 1 + 3rdparty/quazip-0.7/doc/latex/classQuaGzipFile.tex | 189 + .../doc/latex/classQuaGzipFile__coll__graph.eps | 259 + .../doc/latex/classQuaGzipFile__coll__graph.md5 | 1 + .../doc/latex/classQuaGzipFile__inherit__graph.eps | 259 + .../doc/latex/classQuaGzipFile__inherit__graph.md5 | 1 + .../quazip-0.7/doc/latex/classQuaZIODevice.tex | 156 + .../doc/latex/classQuaZIODevice__coll__graph.eps | 259 + .../doc/latex/classQuaZIODevice__coll__graph.md5 | 1 + .../latex/classQuaZIODevice__inherit__graph.eps | 259 + .../latex/classQuaZIODevice__inherit__graph.md5 | 1 + 3rdparty/quazip-0.7/doc/latex/classQuaZip.tex | 951 ++ 3rdparty/quazip-0.7/doc/latex/classQuaZipDir.tex | 419 + 3rdparty/quazip-0.7/doc/latex/classQuaZipFile.tex | 700 ++ .../doc/latex/classQuaZipFilePrivate.tex | 21 + .../doc/latex/classQuaZipFile__coll__graph.eps | 259 + .../doc/latex/classQuaZipFile__coll__graph.md5 | 1 + .../doc/latex/classQuaZipFile__inherit__graph.eps | 259 + .../doc/latex/classQuaZipFile__inherit__graph.md5 | 1 + .../quazip-0.7/doc/latex/classQuaZipPrivate.tex | 21 + .../latex/dir_94f3fdea1a650ed21d35813cdb37a339.tex | 59 + .../dir_94f3fdea1a650ed21d35813cdb37a339_dep.eps | 223 + .../dir_94f3fdea1a650ed21d35813cdb37a339_dep.md5 | 1 + 3rdparty/quazip-0.7/doc/latex/doxygen.sty | 464 + 3rdparty/quazip-0.7/doc/latex/faq.tex | 14 + 3rdparty/quazip-0.7/doc/latex/hierarchy.tex | 22 + 3rdparty/quazip-0.7/doc/latex/index.tex | 85 + 3rdparty/quazip-0.7/doc/latex/refman.tex | 153 + .../doc/latex/structQIODevice__descriptor.tex | 13 + .../quazip-0.7/doc/latex/structQuaZipFileInfo.tex | 86 + .../doc/latex/structQuaZipFileInfo64.tex | 209 + .../quazip-0.7/doc/latex/structQuaZipNewInfo.tex | 360 + 3rdparty/quazip-0.7/doc/latex/usage.tex | 22 + 3rdparty/quazip-0.7/includes.pri | 10 + 3rdparty/quazip-0.7/quazip.pri | 3 + 3rdparty/quazip-0.7/quazip.pro | 3 + 3rdparty/quazip-0.7/quazip.sln | 26 + 3rdparty/quazip-0.7/quazip/CMakeLists.txt | 23 + 3rdparty/quazip-0.7/quazip/JlCompress.cpp | 522 + 3rdparty/quazip-0.7/quazip/JlCompress.h | 139 + 3rdparty/quazip-0.7/quazip/crypt.h | 135 + .../quazip-0.7/quazip/debian/libquazip0.symbols | 163 + 3rdparty/quazip-0.7/quazip/doc/faq.dox | 45 + 3rdparty/quazip-0.7/quazip/doc/index.dox | 177 + 3rdparty/quazip-0.7/quazip/doc/usage.dox | 77 + 3rdparty/quazip-0.7/quazip/ioapi.h | 207 + 3rdparty/quazip-0.7/quazip/qioapi.cpp | 361 + 3rdparty/quazip-0.7/quazip/quaadler32.cpp | 53 + 3rdparty/quazip-0.7/quazip/quaadler32.h | 54 + 3rdparty/quazip-0.7/quazip/quachecksum32.h | 78 + 3rdparty/quazip-0.7/quazip/quacrc32.cpp | 52 + 3rdparty/quazip-0.7/quazip/quacrc32.h | 50 + 3rdparty/quazip-0.7/quazip/quagzipfile.cpp | 172 + 3rdparty/quazip-0.7/quazip/quagzipfile.h | 108 + 3rdparty/quazip-0.7/quazip/quaziodevice.cpp | 320 + 3rdparty/quazip-0.7/quazip/quaziodevice.h | 98 + 3rdparty/quazip-0.7/quazip/quazip.cpp | 788 ++ 3rdparty/quazip-0.7/quazip/quazip.h | 571 + 3rdparty/quazip-0.7/quazip/quazip.pri | 33 + 3rdparty/quazip-0.7/quazip/quazip.pro | 81 + 3rdparty/quazip-0.7/quazip/quazip.sln | 20 + 3rdparty/quazip-0.7/quazip/quazip.vcproj | 314 + 3rdparty/quazip-0.7/quazip/quazip.vcxproj | 121 + 3rdparty/quazip-0.7/quazip/quazip.vcxproj.filters | 117 + 3rdparty/quazip-0.7/quazip/quazip_global.h | 59 + 3rdparty/quazip-0.7/quazip/quazipdir.cpp | 567 + 3rdparty/quazip-0.7/quazip/quazipdir.h | 223 + 3rdparty/quazip-0.7/quazip/quazipfile.cpp | 502 + 3rdparty/quazip-0.7/quazip/quazipfile.h | 456 + 3rdparty/quazip-0.7/quazip/quazipfileinfo.cpp | 176 + 3rdparty/quazip-0.7/quazip/quazipfileinfo.h | 172 + 3rdparty/quazip-0.7/quazip/quazipnewinfo.cpp | 277 + 3rdparty/quazip-0.7/quazip/quazipnewinfo.h | 207 + 3rdparty/quazip-0.7/quazip/run_moc.bat | 3 + 3rdparty/quazip-0.7/quazip/unzip.c | 2155 ++++ 3rdparty/quazip-0.7/quazip/unzip.h | 458 + 3rdparty/quazip-0.7/quazip/zip.c | 2103 ++++ 3rdparty/quazip-0.7/quazip/zip.h | 390 + 3rdparty/quazip-0.7/qztest/coverage.sh | 3 + 3rdparty/quazip-0.7/qztest/qztest.cpp | 231 + 3rdparty/quazip-0.7/qztest/qztest.h | 49 + 3rdparty/quazip-0.7/qztest/qztest.pro | 46 + 3rdparty/quazip-0.7/qztest/qztest.sln | 26 + 3rdparty/quazip-0.7/qztest/qztest.vcproj | 293 + 3rdparty/quazip-0.7/qztest/qztest.vcxproj | 132 + 3rdparty/quazip-0.7/qztest/qztest.vcxproj.filters | 94 + 3rdparty/quazip-0.7/qztest/run_moc.bat | 7 + 3rdparty/quazip-0.7/qztest/testjlcompress.cpp | 316 + 3rdparty/quazip-0.7/qztest/testjlcompress.h | 48 + 3rdparty/quazip-0.7/qztest/testquachecksum32.cpp | 50 + 3rdparty/quazip-0.7/qztest/testquachecksum32.h | 37 + 3rdparty/quazip-0.7/qztest/testquagzipfile.cpp | 79 + 3rdparty/quazip-0.7/qztest/testquagzipfile.h | 38 + 3rdparty/quazip-0.7/qztest/testquaziodevice.cpp | 83 + 3rdparty/quazip-0.7/qztest/testquaziodevice.h | 37 + 3rdparty/quazip-0.7/qztest/testquazip.cpp | 441 + 3rdparty/quazip-0.7/qztest/testquazip.h | 55 + 3rdparty/quazip-0.7/qztest/testquazipdir.cpp | 348 + 3rdparty/quazip-0.7/qztest/testquazipdir.h | 42 + 3rdparty/quazip-0.7/qztest/testquazipfile.cpp | 512 + 3rdparty/quazip-0.7/qztest/testquazipfile.h | 51 + 3rdparty/quazip-0.7/qztest/testquazipfileinfo.cpp | 108 + 3rdparty/quazip-0.7/qztest/testquazipfileinfo.h | 15 + 3rdparty/quazip-0.7/qztest/testquazipnewinfo.cpp | 146 + 3rdparty/quazip-0.7/qztest/testquazipnewinfo.h | 15 + AUTHORS | 5 +- CHANGELOG | 73 + INSTALL | 134 +- Icons/AllIcons.qrc | 1 + Icons/Merkaartor_installer.bmp | Bin 0 -> 154542 bytes .../src/images => Icons/QToolBarDialog}/back.png | Bin .../src/images => Icons/QToolBarDialog}/down.png | Bin .../images => Icons/QToolBarDialog}/forward.png | Bin .../src/images => Icons/QToolBarDialog}/minus.png | Bin .../src/images => Icons/QToolBarDialog}/plus.png | Bin Icons/QToolBarDialog/qttoolbardialog.qrc | 10 + .../src/images => Icons/QToolBarDialog}/up.png | Bin Icons/actions/build_bridge.png | Bin 0 -> 305 bytes Icons/src/actions/build_bridge.xcf | Bin 0 -> 1420 bytes Icons/src/actions/shadow.xcf | Bin 0 -> 1864 bytes Merkaartor.pro | 1 + Styles/Wireframe.mas | 2 +- include/builtin-ggl/ggl/algorithms/append.hpp | 197 - include/builtin-ggl/ggl/algorithms/area.hpp | 252 - include/builtin-ggl/ggl/algorithms/assign.hpp | 410 - include/builtin-ggl/ggl/algorithms/buffer.hpp | 153 - include/builtin-ggl/ggl/algorithms/centroid.hpp | 277 - include/builtin-ggl/ggl/algorithms/clear.hpp | 161 - include/builtin-ggl/ggl/algorithms/combine.hpp | 189 - include/builtin-ggl/ggl/algorithms/convert.hpp | 161 - include/builtin-ggl/ggl/algorithms/convex_hull.hpp | 127 - include/builtin-ggl/ggl/algorithms/correct.hpp | 161 - .../ggl/algorithms/detail/calculate_null.hpp | 33 - include/builtin-ggl/ggl/algorithms/detail/not.hpp | 45 - include/builtin-ggl/ggl/algorithms/disjoint.hpp | 221 - include/builtin-ggl/ggl/algorithms/distance.hpp | 360 - include/builtin-ggl/ggl/algorithms/envelope.hpp | 329 - include/builtin-ggl/ggl/algorithms/equals.hpp | 134 - include/builtin-ggl/ggl/algorithms/for_each.hpp | 268 - include/builtin-ggl/ggl/algorithms/get_section.hpp | 102 - .../builtin-ggl/ggl/algorithms/intermediate.hpp | 126 - .../builtin-ggl/ggl/algorithms/intersection.hpp | 455 - .../ggl/algorithms/intersection_linestring.hpp | 236 - include/builtin-ggl/ggl/algorithms/intersects.hpp | 61 - include/builtin-ggl/ggl/algorithms/labelinfo.hpp | 103 - include/builtin-ggl/ggl/algorithms/length.hpp | 181 - include/builtin-ggl/ggl/algorithms/make.hpp | 123 - include/builtin-ggl/ggl/algorithms/num_points.hpp | 147 - include/builtin-ggl/ggl/algorithms/overlaps.hpp | 49 - .../ggl/algorithms/overlay/adapt_turns.hpp | 556 - .../ggl/algorithms/overlay/copy_segments.hpp | 211 - .../overlay/enrich_intersection_points.hpp | 501 - .../algorithms/overlay/get_intersection_points.hpp | 722 -- .../ggl/algorithms/overlay/intersection_point.hpp | 255 - .../overlay/merge_intersection_points.hpp | 254 - .../ggl/algorithms/overlay/segment_identifier.hpp | 86 - .../overlay/self_intersection_points.hpp | 167 - .../ggl/algorithms/overlay/traverse.hpp | 437 - include/builtin-ggl/ggl/algorithms/parse.hpp | 117 - include/builtin-ggl/ggl/algorithms/perimeter.hpp | 141 - .../builtin-ggl/ggl/algorithms/point_on_line.hpp | 72 - .../builtin-ggl/ggl/algorithms/remove_holes_if.hpp | 132 - .../builtin-ggl/ggl/algorithms/sectionalize.hpp | 579 - include/builtin-ggl/ggl/algorithms/selected.hpp | 278 - include/builtin-ggl/ggl/algorithms/simplify.hpp | 342 - include/builtin-ggl/ggl/algorithms/transform.hpp | 289 - include/builtin-ggl/ggl/algorithms/within.hpp | 414 - include/builtin-ggl/ggl/arithmetic/arithmetic.hpp | 209 - include/builtin-ggl/ggl/arithmetic/dot_product.hpp | 70 - include/builtin-ggl/ggl/core/access.hpp | 292 - .../builtin-ggl/ggl/core/concepts/box_concept.hpp | 109 - .../ggl/core/concepts/linestring_concept.hpp | 84 - .../ggl/core/concepts/nsphere_concept.hpp | 119 - .../ggl/core/concepts/point_concept.hpp | 146 - .../ggl/core/concepts/polygon_concept.hpp | 120 - .../builtin-ggl/ggl/core/concepts/ring_concept.hpp | 83 - .../ggl/core/concepts/segment_concept.hpp | 119 - .../builtin-ggl/ggl/core/coordinate_dimension.hpp | 111 - include/builtin-ggl/ggl/core/coordinate_system.hpp | 79 - include/builtin-ggl/ggl/core/coordinate_type.hpp | 72 - include/builtin-ggl/ggl/core/cs.hpp | 180 - include/builtin-ggl/ggl/core/exception.hpp | 26 - include/builtin-ggl/ggl/core/exterior_ring.hpp | 100 - include/builtin-ggl/ggl/core/geometry_id.hpp | 80 - include/builtin-ggl/ggl/core/interior_rings.hpp | 165 - include/builtin-ggl/ggl/core/is_linear.hpp | 59 - include/builtin-ggl/ggl/core/is_multi.hpp | 49 - include/builtin-ggl/ggl/core/point_type.hpp | 109 - include/builtin-ggl/ggl/core/radian_access.hpp | 118 - include/builtin-ggl/ggl/core/radius.hpp | 152 - .../builtin-ggl/ggl/core/replace_point_type.hpp | 99 - include/builtin-ggl/ggl/core/reverse_dispatch.hpp | 61 - include/builtin-ggl/ggl/core/ring_type.hpp | 97 - include/builtin-ggl/ggl/core/tag.hpp | 65 - include/builtin-ggl/ggl/core/tags.hpp | 64 - .../builtin-ggl/ggl/core/topological_dimension.hpp | 89 - .../ggl/extensions/astronomy/core/cs.hpp | 48 - .../ggl/extensions/gis/geographic/core/cs.hpp | 82 - .../extensions/gis/geographic/detail/ellipsoid.hpp | 58 - .../gis/geographic/strategies/andoyer.hpp | 140 - .../gis/geographic/strategies/dms_parser.hpp | 266 - .../gis/geographic/strategies/vincenty.hpp | 149 - .../extensions/gis/io/veshape/write_veshape.hpp | 281 - .../ggl/extensions/gis/io/wkb/detail/endian.hpp | 256 - .../ggl/extensions/gis/io/wkb/detail/ogc.hpp | 82 - .../ggl/extensions/gis/io/wkb/detail/parser.hpp | 310 - .../ggl/extensions/gis/io/wkb/read_wkb.hpp | 107 - .../ggl/extensions/gis/io/wkb/utility.hpp | 89 - .../ggl/extensions/gis/io/wkt/detail/wkt.hpp | 45 - .../ggl/extensions/gis/io/wkt/detail/wkt_multi.hpp | 51 - .../ggl/extensions/gis/io/wkt/read_wkt.hpp | 624 -- .../ggl/extensions/gis/io/wkt/read_wkt_multi.hpp | 105 - .../ggl/extensions/gis/io/wkt/stream_wkt.hpp | 36 - .../builtin-ggl/ggl/extensions/gis/io/wkt/wkt.hpp | 19 - .../ggl/extensions/gis/io/wkt/write_wkt.hpp | 360 - .../ggl/extensions/gis/io/wkt/write_wkt_multi.hpp | 109 - .../extensions/gis/latlong/detail/graticule.hpp | 231 - .../ggl/extensions/gis/latlong/latlong.hpp | 39 - .../ggl/extensions/gis/latlong/point_ll.hpp | 151 - .../ggl/extensions/gis/projections/epsg.hpp | 3566 ------ .../ggl/extensions/gis/projections/epsg_traits.hpp | 40 - .../ggl/extensions/gis/projections/factory.hpp | 242 - .../extensions/gis/projections/impl/aasincos.hpp | 93 - .../ggl/extensions/gis/projections/impl/adjlon.hpp | 65 - .../gis/projections/impl/base_dynamic.hpp | 105 - .../gis/projections/impl/base_static.hpp | 108 - .../gis/projections/impl/factory_entry.hpp | 38 - .../gis/projections/impl/function_overloads.hpp | 34 - .../ggl/extensions/gis/projections/impl/geocent.c | 454 - .../ggl/extensions/gis/projections/impl/geocent.h | 179 - .../extensions/gis/projections/impl/pj_auth.hpp | 82 - .../gis/projections/impl/pj_datum_set.hpp | 164 - .../extensions/gis/projections/impl/pj_datums.hpp | 103 - .../extensions/gis/projections/impl/pj_ell_set.hpp | 150 - .../extensions/gis/projections/impl/pj_ellps.hpp | 90 - .../ggl/extensions/gis/projections/impl/pj_fwd.hpp | 93 - .../extensions/gis/projections/impl/pj_gauss.hpp | 124 - .../extensions/gis/projections/impl/pj_init.hpp | 291 - .../ggl/extensions/gis/projections/impl/pj_inv.hpp | 72 - .../extensions/gis/projections/impl/pj_mlfn.hpp | 103 - .../extensions/gis/projections/impl/pj_msfn.hpp | 49 - .../extensions/gis/projections/impl/pj_param.hpp | 150 - .../extensions/gis/projections/impl/pj_phi2.hpp | 67 - .../extensions/gis/projections/impl/pj_qsfn.hpp | 80 - .../gis/projections/impl/pj_transform.hpp | 751 -- .../extensions/gis/projections/impl/pj_tsfn.hpp | 51 - .../extensions/gis/projections/impl/pj_units.hpp | 73 - .../extensions/gis/projections/impl/pj_zpoly1.hpp | 99 - .../extensions/gis/projections/impl/proj_mdist.hpp | 131 - .../extensions/gis/projections/impl/projects.hpp | 184 - .../ggl/extensions/gis/projections/parameters.hpp | 65 - .../ggl/extensions/gis/projections/proj/aea.hpp | 525 - .../ggl/extensions/gis/projections/proj/aeqd.hpp | 454 - .../ggl/extensions/gis/projections/proj/airy.hpp | 217 - .../ggl/extensions/gis/projections/proj/aitoff.hpp | 210 - .../ggl/extensions/gis/projections/proj/august.hpp | 141 - .../ggl/extensions/gis/projections/proj/bacon.hpp | 238 - .../ggl/extensions/gis/projections/proj/bipc.hpp | 253 - .../ggl/extensions/gis/projections/proj/boggs.hpp | 154 - .../ggl/extensions/gis/projections/proj/bonne.hpp | 246 - .../ggl/extensions/gis/projections/proj/cass.hpp | 465 - .../ggl/extensions/gis/projections/proj/cc.hpp | 145 - .../ggl/extensions/gis/projections/proj/cea.hpp | 224 - .../ggl/extensions/gis/projections/proj/chamb.hpp | 242 - .../ggl/extensions/gis/projections/proj/collg.hpp | 152 - .../ggl/extensions/gis/projections/proj/crast.hpp | 144 - .../ggl/extensions/gis/projections/proj/denoy.hpp | 140 - .../ggl/extensions/gis/projections/proj/eck1.hpp | 140 - .../ggl/extensions/gis/projections/proj/eck2.hpp | 151 - .../ggl/extensions/gis/projections/proj/eck3.hpp | 286 - .../ggl/extensions/gis/projections/proj/eck4.hpp | 167 - .../ggl/extensions/gis/projections/proj/eck5.hpp | 141 - .../ggl/extensions/gis/projections/proj/eqc.hpp | 146 - .../ggl/extensions/gis/projections/proj/eqdc.hpp | 212 - .../ggl/extensions/gis/projections/proj/fahey.hpp | 140 - .../ggl/extensions/gis/projections/proj/fouc_s.hpp | 167 - .../ggl/extensions/gis/projections/proj/gall.hpp | 142 - .../extensions/gis/projections/proj/geocent.hpp | 143 - .../ggl/extensions/gis/projections/proj/geos.hpp | 280 - .../ggl/extensions/gis/projections/proj/gins8.hpp | 140 - .../extensions/gis/projections/proj/gn_sinu.hpp | 380 - .../ggl/extensions/gis/projections/proj/gnom.hpp | 227 - .../ggl/extensions/gis/projections/proj/goode.hpp | 160 - .../extensions/gis/projections/proj/gstmerc.hpp | 176 - .../ggl/extensions/gis/projections/proj/hammer.hpp | 152 - .../ggl/extensions/gis/projections/proj/hatano.hpp | 173 - .../ggl/extensions/gis/projections/proj/imw_p.hpp | 281 - .../ggl/extensions/gis/projections/proj/krovak.hpp | 338 - .../ggl/extensions/gis/projections/proj/labrd.hpp | 231 - .../ggl/extensions/gis/projections/proj/laea.hpp | 391 - .../ggl/extensions/gis/projections/proj/lagrng.hpp | 158 - .../ggl/extensions/gis/projections/proj/larr.hpp | 134 - .../ggl/extensions/gis/projections/proj/lask.hpp | 148 - .../extensions/gis/projections/proj/latlong.hpp | 282 - .../ggl/extensions/gis/projections/proj/lcc.hpp | 249 - .../ggl/extensions/gis/projections/proj/lcca.hpp | 191 - .../ggl/extensions/gis/projections/proj/loxim.hpp | 164 - .../ggl/extensions/gis/projections/proj/lsat.hpp | 299 - .../extensions/gis/projections/proj/mbt_fps.hpp | 161 - .../ggl/extensions/gis/projections/proj/mbtfpp.hpp | 155 - .../ggl/extensions/gis/projections/proj/mbtfpq.hpp | 170 - .../ggl/extensions/gis/projections/proj/merc.hpp | 213 - .../ggl/extensions/gis/projections/proj/mill.hpp | 138 - .../extensions/gis/projections/proj/mod_ster.hpp | 474 - .../ggl/extensions/gis/projections/proj/moll.hpp | 262 - .../ggl/extensions/gis/projections/proj/nell.hpp | 154 - .../ggl/extensions/gis/projections/proj/nell_h.hpp | 153 - .../ggl/extensions/gis/projections/proj/nocol.hpp | 160 - .../ggl/extensions/gis/projections/proj/nsper.hpp | 317 - .../ggl/extensions/gis/projections/proj/nzmg.hpp | 196 - .../extensions/gis/projections/proj/ob_tran.hpp | 318 - .../ggl/extensions/gis/projections/proj/ocea.hpp | 189 - .../ggl/extensions/gis/projections/proj/oea.hpp | 181 - .../ggl/extensions/gis/projections/proj/omerc.hpp | 294 - .../ggl/extensions/gis/projections/proj/ortho.hpp | 219 - .../ggl/extensions/gis/projections/proj/poly.hpp | 266 - .../ggl/extensions/gis/projections/proj/putp2.hpp | 163 - .../ggl/extensions/gis/projections/proj/putp3.hpp | 197 - .../ggl/extensions/gis/projections/proj/putp4p.hpp | 201 - .../ggl/extensions/gis/projections/proj/putp5.hpp | 198 - .../ggl/extensions/gis/projections/proj/putp6.hpp | 223 - .../ggl/extensions/gis/projections/proj/robin.hpp | 232 - .../ggl/extensions/gis/projections/proj/rouss.hpp | 211 - .../ggl/extensions/gis/projections/proj/rpoly.hpp | 158 - .../extensions/gis/projections/proj/sconics.hpp | 512 - .../ggl/extensions/gis/projections/proj/somerc.hpp | 188 - .../ggl/extensions/gis/projections/proj/stere.hpp | 451 - .../ggl/extensions/gis/projections/proj/sterea.hpp | 381 - .../ggl/extensions/gis/projections/proj/sts.hpp | 294 - .../ggl/extensions/gis/projections/proj/tcc.hpp | 142 - .../ggl/extensions/gis/projections/proj/tcea.hpp | 149 - .../ggl/extensions/gis/projections/proj/tmerc.hpp | 458 - .../ggl/extensions/gis/projections/proj/tpeqd.hpp | 198 - .../ggl/extensions/gis/projections/proj/urm5.hpp | 149 - .../ggl/extensions/gis/projections/proj/urmfps.hpp | 205 - .../ggl/extensions/gis/projections/proj/vandg.hpp | 201 - .../ggl/extensions/gis/projections/proj/vandg2.hpp | 205 - .../ggl/extensions/gis/projections/proj/vandg4.hpp | 163 - .../ggl/extensions/gis/projections/proj/wag2.hpp | 144 - .../ggl/extensions/gis/projections/proj/wag3.hpp | 148 - .../ggl/extensions/gis/projections/proj/wag7.hpp | 137 - .../ggl/extensions/gis/projections/proj/wink1.hpp | 145 - .../ggl/extensions/gis/projections/proj/wink2.hpp | 159 - .../projections/project_inverse_transformer.hpp | 73 - .../gis/projections/project_transformer.hpp | 63 - .../ggl/extensions/gis/projections/projection.hpp | 65 - .../ggl/extensions/index/rtree/helpers.hpp | 68 - .../ggl/extensions/index/rtree/rtree.hpp | 769 -- .../ggl/extensions/index/rtree/rtree_leaf.hpp | 252 - .../ggl/extensions/index/rtree/rtree_node.hpp | 488 - .../ggl/extensions/io/svg/write_svg.hpp | 263 - .../ggl/extensions/io/svg/write_svg_multi.hpp | 73 - .../adapted/boost_array_as_linestring.hpp | 40 - .../ggl/geometries/adapted/boost_array_as_ring.hpp | 40 - .../builtin-ggl/ggl/geometries/adapted/c_array.hpp | 88 - .../ggl/geometries/adapted/c_array_cartesian.hpp | 37 - .../ggl/geometries/adapted/c_array_geographic.hpp | 35 - .../ggl/geometries/adapted/std_as_linestring.hpp | 61 - .../ggl/geometries/adapted/std_as_ring.hpp | 43 - .../builtin-ggl/ggl/geometries/adapted/tuple.hpp | 100 - .../ggl/geometries/adapted/tuple_cartesian.hpp | 41 - .../ggl/geometries/adapted/tuple_geographic.hpp | 41 - include/builtin-ggl/ggl/geometries/box.hpp | 110 - include/builtin-ggl/ggl/geometries/cartesian2d.hpp | 29 - include/builtin-ggl/ggl/geometries/cartesian3d.hpp | 28 - include/builtin-ggl/ggl/geometries/geometries.hpp | 25 - include/builtin-ggl/ggl/geometries/linear_ring.hpp | 64 - include/builtin-ggl/ggl/geometries/linestring.hpp | 69 - include/builtin-ggl/ggl/geometries/nsphere.hpp | 130 - include/builtin-ggl/ggl/geometries/point.hpp | 125 - include/builtin-ggl/ggl/geometries/point_xy.hpp | 109 - include/builtin-ggl/ggl/geometries/polygon.hpp | 179 - .../builtin-ggl/ggl/geometries/register/box.hpp | 106 - .../ggl/geometries/register/linestring.hpp | 25 - .../builtin-ggl/ggl/geometries/register/point.hpp | 154 - .../ggl/geometries/register/register_box.hpp | 22 - .../ggl/geometries/register/register_point.hpp | 22 - .../builtin-ggl/ggl/geometries/register/ring.hpp | 28 - include/builtin-ggl/ggl/geometries/segment.hpp | 105 - include/builtin-ggl/ggl/ggl.hpp | 72 - include/builtin-ggl/ggl/iterators/base.hpp | 58 - .../ggl/iterators/circular_iterator.hpp | 92 - .../ggl/iterators/ever_circling_iterator.hpp | 86 - .../ggl/iterators/point_const_iterator.hpp | 76 - .../ggl/iterators/section_iterators.hpp | 217 - .../builtin-ggl/ggl/iterators/segment_iterator.hpp | 139 - include/builtin-ggl/ggl/multi/algorithms/area.hpp | 37 - .../builtin-ggl/ggl/multi/algorithms/centroid.hpp | 81 - .../ggl/multi/algorithms/convex_hull.hpp | 95 - .../builtin-ggl/ggl/multi/algorithms/correct.hpp | 53 - .../algorithms/detail/modify_with_predicate.hpp | 46 - .../ggl/multi/algorithms/detail/multi_sum.hpp | 54 - .../builtin-ggl/ggl/multi/algorithms/distance.hpp | 121 - .../builtin-ggl/ggl/multi/algorithms/envelope.hpp | 98 - .../builtin-ggl/ggl/multi/algorithms/foreach.hpp | 222 - .../ggl/multi/algorithms/get_section.hpp | 57 - .../ggl/multi/algorithms/intersection.hpp | 43 - .../builtin-ggl/ggl/multi/algorithms/length.hpp | 32 - .../ggl/multi/algorithms/num_points.hpp | 78 - .../ggl/multi/algorithms/overlay/copy_segments.hpp | 92 - .../algorithms/overlay/get_intersection_points.hpp | 64 - .../builtin-ggl/ggl/multi/algorithms/perimeter.hpp | 33 - .../ggl/multi/algorithms/remove_holes_if.hpp | 43 - .../ggl/multi/algorithms/sectionalize.hpp | 86 - .../builtin-ggl/ggl/multi/algorithms/simplify.hpp | 69 - .../builtin-ggl/ggl/multi/algorithms/transform.hpp | 87 - .../builtin-ggl/ggl/multi/algorithms/within.hpp | 104 - include/builtin-ggl/ggl/multi/core/geometry_id.hpp | 51 - include/builtin-ggl/ggl/multi/core/is_multi.hpp | 49 - include/builtin-ggl/ggl/multi/core/point_type.hpp | 59 - include/builtin-ggl/ggl/multi/core/ring_type.hpp | 48 - include/builtin-ggl/ggl/multi/core/tags.hpp | 30 - .../ggl/multi/core/topological_dimension.hpp | 45 - .../ggl/multi/geometries/multi_linestring.hpp | 55 - .../ggl/multi/geometries/multi_point.hpp | 54 - .../ggl/multi/geometries/multi_polygon.hpp | 55 - .../ggl/multi/iterators/point_const_iterator.hpp | 50 - include/builtin-ggl/ggl/multi/util/write_dsv.hpp | 66 - include/builtin-ggl/ggl/policies/relate/de9im.hpp | 184 - .../builtin-ggl/ggl/policies/relate/direction.hpp | 299 - .../ggl/policies/relate/intersection_points.hpp | 143 - include/builtin-ggl/ggl/policies/relate/tupled.hpp | 154 - .../ggl/strategies/agnostic/agn_convex_hull.hpp | 278 - .../ggl/strategies/agnostic/agn_simplify.hpp | 196 - .../ggl/strategies/agnostic/agn_within.hpp | 162 - .../ggl/strategies/cartesian/cart_area.hpp | 102 - .../ggl/strategies/cartesian/cart_centroid.hpp | 292 - .../ggl/strategies/cartesian/cart_compare.hpp | 66 - .../ggl/strategies/cartesian/cart_distance.hpp | 246 - .../ggl/strategies/cartesian/cart_envelope.hpp | 66 - .../ggl/strategies/cartesian/cart_intersect.hpp | 352 - .../ggl/strategies/cartesian/cart_side.hpp | 71 - .../ggl/strategies/cartesian/cart_within.hpp | 100 - .../builtin-ggl/ggl/strategies/distance_result.hpp | 265 - .../ggl/strategies/intersection_result.hpp | 167 - .../ggl/strategies/spherical/haversine.hpp | 257 - .../ggl/strategies/spherical/sph_area.hpp | 167 - .../ggl/strategies/spherical/sph_envelope.hpp | 176 - include/builtin-ggl/ggl/strategies/strategies.hpp | 38 - .../builtin-ggl/ggl/strategies/strategy_traits.hpp | 231 - .../ggl/strategies/strategy_transform.hpp | 358 - .../strategies/transform/inverse_transformer.hpp | 65 - .../ggl/strategies/transform/map_transformer.hpp | 145 - .../strategies/transform/matrix_transformers.hpp | 357 - include/builtin-ggl/ggl/util/as_range.hpp | 95 - include/builtin-ggl/ggl/util/assign_box_corner.hpp | 59 - include/builtin-ggl/ggl/util/builder.hpp | 334 - include/builtin-ggl/ggl/util/copy.hpp | 76 - .../builtin-ggl/ggl/util/for_each_coordinate.hpp | 64 - include/builtin-ggl/ggl/util/get_cs_as_radian.hpp | 43 - include/builtin-ggl/ggl/util/less.hpp | 64 - include/builtin-ggl/ggl/util/loop.hpp | 85 - include/builtin-ggl/ggl/util/math.hpp | 91 - .../ggl/util/select_coordinate_type.hpp | 40 - .../builtin-ggl/ggl/util/select_most_precise.hpp | 160 - include/builtin-ggl/ggl/util/write_dsv.hpp | 375 - mobilemerk/src/main.cpp | 2 +- .../qadastre/cadastrewrapper.cpp | 15 +- .../MCadastreFranceBackground/qadastre/main.cpp | 2 +- plugins/background/MGdalBackground/GdalAdapter.cpp | 4 +- plugins/background/MGdalBackground/GdalAdapter.h | 3 + .../background/MGdalBackground/GdalAdapter.json | 1 + .../MGeoTiffBackground/GeoTiffAdapter.cpp | 4 +- .../background/MGeoTiffBackground/GeoTiffAdapter.h | 3 + .../MGeoTiffBackground/GeoTiffAdapter.json | 1 + .../MGosmoreBackground/GosmoreAdapter.cpp | 2 + .../background/MGosmoreBackground/GosmoreAdapter.h | 3 + .../MGosmoreBackground/GosmoreAdapter.json | 1 + .../MMsBingMapBackground/MMsBingMapBackground.pro | 2 + .../MMsBingMapBackground/msbingmapadapter.cpp | 12 +- .../MMsBingMapBackground/msbingmapadapter.h | 3 + .../MMsBingMapBackground/msbingmapadapter.json | 1 + .../background/MNavitBackground/NavitAdapter.cpp | 2 + plugins/background/MNavitBackground/NavitAdapter.h | 3 + .../background/MNavitBackground/NavitAdapter.json | 1 + .../MSpatialiteBackground/PrimitiveFeature.h | 2 +- .../MSpatialiteBackground/SpatialiteAdapter.cpp | 25 +- .../MSpatialiteBackground/SpatialiteAdapter.h | 6 +- .../MSpatialiteBackground/SpatialiteAdapter.json | 1 + .../WalkingPapersAdapter.cpp | 15 +- .../WalkingPapersAdapter.h | 3 + .../WalkingPapersAdapter.json | 0 .../MYahooBackground/yahoolegalmapadapter.cpp | 2 + .../MYahooBackground/yahoolegalmapadapter.h | 3 + .../MYahooBackground/yahoolegalmapadapter.json | 1 + .../MYahooTiledBackground/yahootiledmapadapter.cpp | 2 + .../MYahooTiledBackground/yahootiledmapadapter.h | 3 + .../yahootiledmapadapter.json | 1 + plugins/background/background.pro | 19 +- plugins/background/common.pri | 4 +- plugins/common.pri | 35 +- plugins/plugins.pro | 5 +- plugins/qtstyle/common.pri | 7 - plugins/qtstyle/qtstyle.pro | 3 - plugins/qtstyle/skulpture/skulpture.cpp | 8059 -------------- plugins/qtstyle/skulpture/skulpture.h | 82 - plugins/qtstyle/skulpture/skulpture_p.h | 251 - plugins/qtstyle/skulpture22/sk_effects.h | 59 - plugins/qtstyle/skulpture22/sk_factory.h | 165 - plugins/qtstyle/skulpture22/skulpture.cpp | 10757 ------------------- plugins/qtstyle/skulpture22/skulpture.h | 116 - plugins/qtstyle/skulpture22/skulpture22.pro | 15 - plugins/qtstyle/skulpture22/skulpture_p.h | 374 - semperMerk/MouseMachine/LICENSE.LGPL | 504 - semperMerk/MouseMachine/MouseMachine.cpp | 491 - semperMerk/MouseMachine/MouseMachine.h | 129 - semperMerk/MouseMachine/README | 9 - semperMerk/MyMessageHandler.h | 89 - semperMerk/MyPreferences.cpp | 199 - semperMerk/MyPreferences.h | 114 - semperMerk/MyPreferences.ui | 90 - semperMerk/README.TXT | 0 semperMerk/semperMerk.pro | 127 - semperMerk/src/AddressBar.cpp | 106 - semperMerk/src/AddressBar.h | 71 - semperMerk/src/BookmarkBar.cpp | 38 - semperMerk/src/BookmarkBar.h | 37 - semperMerk/src/BookmarkBar.ui | 68 - semperMerk/src/BookmarkItem.cpp | 66 - semperMerk/src/BookmarkItem.h | 40 - semperMerk/src/BookmarksDelegate.cpp | 171 - semperMerk/src/BookmarksDelegate.h | 34 - semperMerk/src/BookmarksModel.cpp | 14 - semperMerk/src/BookmarksModel.h | 19 - semperMerk/src/BookmarksView.cpp | 302 - semperMerk/src/BookmarksView.h | 90 - semperMerk/src/BrowserCache.cpp | 84 - semperMerk/src/BrowserCache.h | 39 - semperMerk/src/BrowserView.cpp | 551 - semperMerk/src/BrowserView.h | 103 - semperMerk/src/ControlButton.h | 31 - semperMerk/src/ControlStrip.cpp | 327 - semperMerk/src/ControlStrip.h | 107 - semperMerk/src/Downloader.cpp | 160 - semperMerk/src/Downloader.h | 49 - semperMerk/src/HomeView.cpp | 82 - semperMerk/src/HomeView.h | 86 - semperMerk/src/MWebView.cpp | 249 - semperMerk/src/MWebView.h | 80 - semperMerk/src/Main.cpp | 169 - semperMerk/src/MainWindow.cpp | 395 - semperMerk/src/MainWindow.h | 82 - semperMerk/src/TitleBar.cpp | 186 - semperMerk/src/TitleBar.h | 86 - semperMerk/src/ViewMenu.cpp | 38 - semperMerk/src/ViewMenu.h | 33 - semperMerk/src/ViewMenu.ui | 35 - semperMerk/src/ZoomStrip.cpp | 83 - semperMerk/src/ZoomStrip.h | 70 - semperMerk/src/images/arrow_down_48.png | Bin 511 -> 0 bytes semperMerk/src/images/arrow_left_48.png | Bin 465 -> 0 bytes semperMerk/src/images/arrow_right_48.png | Bin 529 -> 0 bytes semperMerk/src/images/arrow_up_48.png | Bin 420 -> 0 bytes semperMerk/src/images/book_bookmark_48.png | Bin 309 -> 0 bytes semperMerk/src/images/edit-find-replace.png | Bin 2104 -> 0 bytes semperMerk/src/images/edit-find.png | Bin 1636 -> 0 bytes semperMerk/src/images/gear_48.png | Bin 1005 -> 0 bytes semperMerk/src/images/go-down.png | Bin 1187 -> 0 bytes semperMerk/src/images/go-next.png | Bin 1219 -> 0 bytes semperMerk/src/images/go-previous.png | Bin 1200 -> 0 bytes semperMerk/src/images/go-up.png | Bin 1193 -> 0 bytes semperMerk/src/images/heart_48.png | Bin 675 -> 0 bytes semperMerk/src/images/list-add.png | Bin 601 -> 0 bytes semperMerk/src/images/list-remove.png | Bin 317 -> 0 bytes semperMerk/src/images/magnifier_48.png | Bin 844 -> 0 bytes semperMerk/src/images/minus_48.png | Bin 184 -> 0 bytes semperMerk/src/images/on_off_48.png | Bin 251 -> 0 bytes semperMerk/src/images/pencil_48.png | Bin 634 -> 0 bytes semperMerk/src/images/play_48.png | Bin 488 -> 0 bytes semperMerk/src/images/plus_48.png | Bin 264 -> 0 bytes semperMerk/src/images/process-stop.png | Bin 1927 -> 0 bytes semperMerk/src/images/reload_48.png | Bin 799 -> 0 bytes semperMerk/src/images/star_48.png | Bin 623 -> 0 bytes semperMerk/src/images/stop_48.png | Bin 634 -> 0 bytes semperMerk/src/images/system-lock-screen.png | Bin 1751 -> 0 bytes semperMerk/src/images/system-log-out.png | Bin 1725 -> 0 bytes semperMerk/src/images/system-search.png | Bin 2215 -> 0 bytes semperMerk/src/images/system-shutdown.png | Bin 1055 -> 0 bytes semperMerk/src/images/tray_full_48.png | Bin 260 -> 0 bytes semperMerk/src/images/video_pause_48.png | Bin 189 -> 0 bytes semperMerk/src/images/video_stop_48.png | Bin 182 -> 0 bytes semperMerk/src/images/view-refresh.png | Bin 2024 -> 0 bytes semperMerk/src/images/wifi_48.png | Bin 841 -> 0 bytes semperMerk/src/images/zoom-best-fit.png | Bin 2194 -> 0 bytes semperMerk/src/images/zoom-original.png | Bin 2129 -> 0 bytes semperMerk/src/images/zoom_in_48.png | Bin 829 -> 0 bytes semperMerk/src/images/zoom_out_48.png | Bin 779 -> 0 bytes semperMerk/src/resources/Merkaartor.svg | 11 - semperMerk/src/resources/btn_donate_LG.gif | Bin 1714 -> 0 bytes semperMerk/src/resources/home.html | 24 - semperMerk/src/resources/pixel.gif | Bin 43 -> 0 bytes semperMerk/src/resources/resources.qrc | 21 - semperMerk/src/resources/semperWeb - Copy.svg | 72 - semperMerk/src/resources/semperWeb-big.svg | 262 - semperMerk/src/resources/semperWeb.svg | 148 - semperMerk/src/resources/t_logo-a.png | Bin 2229 -> 0 bytes semperMerk/src/retinaIcons.qrc | 21 - semperMerk/src/semperWeb.qrc | 17 - semperMerk/src/sym_iap_util.h | 510 - src/Backend/SpatialiteBackend.cpp | 25 +- src/Backend/SpatialiteBackend.h | 1 + src/Backend/SpatialiteBase.cpp | 3 + src/Backend/SpatialiteBase.h | 2 +- src/Config.pri | 40 +- src/Docks/GeoImageDock.cpp | 41 +- src/Docks/GeoImageDock.h | 32 +- src/Docks/LayerDock.cpp | 2 +- src/Docks/LayerDock.h | 2 +- src/Docks/PropertiesDock.cpp | 10 +- src/Features/Feature.cpp | 23 +- src/Features/Feature.h | 11 +- src/Features/Node.cpp | 15 +- src/Features/Node.h | 53 - src/Features/Relation.cpp | 3 +- src/Features/Way.cpp | 19 +- src/Features/Way.h | 6 - src/GPS/SatelliteStrengthView.h | 2 +- src/GPS/qgpsdevice.cpp | 35 +- src/ImportExport/ExportGPX.cpp | 1 + src/ImportExport/ImportCSVDialog.cpp | 2 +- src/ImportExport/ImportExportGdal.cpp | 103 +- src/ImportExport/ImportExportGdal.h | 16 +- src/ImportExport/ImportExportKML.cpp | 8 +- src/ImportExport/ImportGPX.cpp | 10 +- src/ImportExport/ImportNMEA.cpp | 1 + src/ImportExport/ImportOSM.cpp | 28 +- src/Interactions/BuildBridgeInteraction.cpp | 170 + src/Interactions/BuildBridgeInteraction.h | 26 + src/Interactions/CreateAreaInteraction.cpp | 6 +- src/Interactions/CreateDoubleWayInteraction.cpp | 4 +- src/Interactions/CreateRoundaboutInteraction.cpp | 4 +- src/Interactions/CreateSingleWayInteraction.cpp | 4 +- src/Interactions/ExtrudeInteraction.cpp | 11 +- src/Interactions/Interaction.cpp | 3 +- src/Interactions/Interaction.h | 2 +- src/Interactions/Interactions.pri | 6 +- src/Interactions/MoveNodeInteraction.cpp | 2 + src/Layers/ImageMapLayer.cpp | 32 +- src/Layers/Layer.cpp | 10 +- src/Layers/Layer.h | 1 + src/Layers/LayerWidget.cpp | 1 + src/Layers/OsmRenderLayer.cpp | 11 +- src/Layers/OsmRenderLayer.h | 6 +- src/Main.cpp | 99 +- src/MainWindow.cpp | 1094 +- src/MainWindow.h | 26 +- src/MainWindow.ui | 24 +- src/NameFinder/httpquery.cpp | 79 +- src/NameFinder/httpquery.h | 21 +- src/NameFinder/namefindertablemodel.cpp | 3 +- src/NameFinder/namefinderwidget.cpp | 33 +- src/NameFinder/namefinderwidget.h | 7 +- src/PaintStyle/MasPaintStyle.cpp | 10 +- src/PaintStyle/PaintStyleEditor.cpp | 16 +- src/PaintStyle/PaintStyleEditor.h | 2 +- src/Preferences/MerkaartorPreferences.cpp | 493 +- src/Preferences/MerkaartorPreferences.h | 104 +- src/Preferences/PreferencesDialog.cpp | 46 +- src/Preferences/PreferencesDialog.h | 2 +- src/Preferences/TMSPreferencesDialog.cpp | 56 +- src/Preferences/TMSPreferencesDialog.h | 10 +- src/Preferences/WMSPreferencesDialog.cpp | 88 +- src/Preferences/WMSPreferencesDialog.h | 43 +- src/QMapControl/WmscMapAdapter.cpp | 51 +- src/QMapControl/browserimagemanager.cpp | 6 +- src/QMapControl/browserimagemanager.h | 2 +- src/QMapControl/imagemanager.cpp | 6 +- src/QMapControl/mapcontrol.h | 2 +- src/QMapControl/wmsmapadapter.cpp | 47 +- src/QToolBarDialog/QToolBarDialog.pri | 7 + src/QToolBarDialog/qttoolbardialog.cpp | 1892 ++++ src/QToolBarDialog/qttoolbardialog.h | 144 + .../src => src/QToolBarDialog}/qttoolbardialog.ui | 0 src/Render/MapRenderer.cpp | 2 +- src/Sync/DirtyList.cpp | 12 +- src/Sync/DirtyList.h | 2 +- src/Sync/DownloadOSM.cpp | 333 +- src/Sync/DownloadOSM.h | 15 +- src/Tools/ActionsDialog.cpp | 7 +- src/Tools/QFatFs/QFat.cpp | 585 + src/Tools/QFatFs/QFat.h | 114 + src/Tools/QFatFs/QFatFile.cpp | 78 + src/Tools/QFatFs/QFatFile.h | 29 + src/Tools/QFatFs/QFatFs.cpp | 278 + src/Tools/QFatFs/QFatFs.h | 91 + src/Tools/QFatFs/QFatFs.pri | 12 + src/Tools/Tools.pri | 5 + src/Tools/ZipEngine.cpp | 101 + src/Tools/ZipEngine.h | 58 + src/Utils/CheckBoxList.cpp | 5 + src/Utils/CheckBoxList.h | 1 + src/Utils/OsmLink.cpp | 81 +- src/Utils/ProjectionChooser.cpp | 1 + src/Utils/SlippyMapWidget.cpp | 30 +- src/Utils/SlippyMapWidget.h | 12 +- src/Utils/TagSelector.cpp | 6 +- src/common/AboutDialog.ui | 17 +- src/common/Coord.h | 10 - src/common/Document.cpp | 40 +- src/common/Document.h | 3 + src/common/FeatureManipulations.cpp | 41 +- src/common/FeatureManipulations.h | 2 + src/common/Global.h | 7 + src/common/MapView.cpp | 9 +- src/common/MapView.h | 6 +- src/common/Projection.cpp | 6 +- src/common/TerraceDialog.cpp | 2 +- src/src.pro | 57 +- translations/merkaartor_ar.ts | 11 +- translations/merkaartor_cs.ts | 11 +- translations/merkaartor_de.ts | 15 +- translations/merkaartor_es.ts | 11 +- translations/merkaartor_et.ts | 11 +- translations/merkaartor_fr.ts | 11 +- translations/merkaartor_hr.ts | 11 +- translations/merkaartor_hu.ts | 11 +- translations/merkaartor_it.ts | 15 +- translations/merkaartor_ja.ts | 17 +- translations/merkaartor_nl.ts | 11 +- translations/merkaartor_pl.ts | 15 +- translations/merkaartor_pt.ts | 11 +- translations/merkaartor_pt_BR.ts | 17 +- translations/merkaartor_ru.ts | 15 +- translations/merkaartor_sk.ts | 11 +- translations/merkaartor_sv.ts | 11 +- translations/merkaartor_uk.ts | 11 +- windows/Makefile | 2 +- windows/copydeps.sh | 3 + windows/installer.nsi | 146 + 983 files changed, 46805 insertions(+), 93346 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel