diff --git a/Doxyfile b/Doxyfile index b5b62b2..3f77b64 100644 --- a/Doxyfile +++ b/Doxyfile @@ -514,7 +514,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = . +INPUT = src/mapmap #../src # This tag can be used to specify the character encoding of the source files diff --git a/INSTALL b/INSTALL index 974215b..cf612fd 100644 --- a/INSTALL +++ b/INSTALL @@ -10,6 +10,12 @@ Install the dependencies. (see below) Build it:: + cd src/mapmap + qmake mapmap.pro + make + +Alternatively:: + ./build.sh Ubuntu 13.10, 14.04, 15.04 and 16.04 LTS @@ -70,6 +76,7 @@ To edit translations -------------------- You might need to update the files:: + cd src/mapmap lupdate mapmap.pro Then, do this:: diff --git a/build.sh b/build.sh index fd4055f..6001ceb 100755 --- a/build.sh +++ b/build.sh @@ -3,6 +3,9 @@ # On Mac, install it from http://qt-project.org/downloads # set -o verbose +cd $(dirname $0) +cd src/mapmap + qtversion=5.8 do_create_dmg() { diff --git a/run.sh b/run.sh index ecc8959..ca0dab5 100755 --- a/run.sh +++ b/run.sh @@ -2,5 +2,11 @@ #export GST_PLUGIN_PATH=/Library/Frameworks/GStreamer.framework/Libraries #export GST_DEBUG=2 export LANG=C -./mapmap.app/Contents/MacOS/mapmap + +if [[ `uname` == 'Linux' ]]; then + ./src/mapmap/mapmap +else #macOS + ./src/mapmap/mapmap.app/Contents/MacOS/mapmap +fi + diff --git a/scripts/update-changelog.sh b/scripts/update-changelog.sh index 7dec2f2..2754198 100755 --- a/scripts/update-changelog.sh +++ b/scripts/update-changelog.sh @@ -1,4 +1,6 @@ #!/bin/sh +cd $(dirname $0) +cd src/mapmap set -o verbose # Convert markdown file to html markdown NEWS > docs/informations/CHANGELOG.html diff --git a/sh_clean.sh b/sh_clean.sh index 6dd22cf..ee63c45 100755 --- a/sh_clean.sh +++ b/sh_clean.sh @@ -1,3 +1,5 @@ #!/bin/bash +cd $(dirname $0) +cd src/mapmap make clean rm -rf MapMap.app mapmap.pro.user diff --git a/sh_release.sh b/sh_release.sh index 5529462..a6440fe 100755 --- a/sh_release.sh +++ b/sh_release.sh @@ -3,6 +3,8 @@ # On Mac, install it from http://qt-project.org/downloads unamestr=$(uname) +cd $(dirname $0) +cd src/mapmap if [[ $unamestr == "Darwin" ]]; then MAKE_CFLAGS_X86_64+="-Xarch_x86_64 -mmacosx-version-min=10.7" diff --git a/sh_show_libs.sh b/sh_show_libs.sh index 0eb198f..8331563 100755 --- a/sh_show_libs.sh +++ b/sh_show_libs.sh @@ -1,5 +1,7 @@ #!/bin/bash unamestr=$(uname) +cd $(dirname $0) +cd src/mapmap if [[ $unamestr == "Darwin" ]]; then otool -L mapmap.app/Contents/MacOS/mapmap diff --git a/src/MapMapProject.pro b/src/MapMapProject.pro new file mode 100644 index 0000000..e541165 --- /dev/null +++ b/src/MapMapProject.pro @@ -0,0 +1,9 @@ +TEMPLATE = subdirs + +SUBDIRS = mapmap tests + +# Adds the tarball target +tarball.target = mapmap-$${VERSION}.tar.gz +tarball.commands = git archive --format=tar.gz -9 --prefix=mapmap-$${VERSION}/ --output=mapmap-$${VERSION}.tar.gz HEAD +tarball.depends = .git +QMAKE_EXTRA_TARGETS += tarball diff --git a/AboutDialog.cpp b/src/mapmap/AboutDialog.cpp similarity index 100% rename from AboutDialog.cpp rename to src/mapmap/AboutDialog.cpp diff --git a/AboutDialog.h b/src/mapmap/AboutDialog.h similarity index 100% rename from AboutDialog.h rename to src/mapmap/AboutDialog.h diff --git a/Commands.cpp b/src/mapmap/Commands.cpp similarity index 100% rename from Commands.cpp rename to src/mapmap/Commands.cpp diff --git a/Commands.h b/src/mapmap/Commands.h similarity index 100% rename from Commands.h rename to src/mapmap/Commands.h diff --git a/ConcurrentQueue.h b/src/mapmap/ConcurrentQueue.h similarity index 100% rename from ConcurrentQueue.h rename to src/mapmap/ConcurrentQueue.h diff --git a/ConsoleWindow.cpp b/src/mapmap/ConsoleWindow.cpp similarity index 100% rename from ConsoleWindow.cpp rename to src/mapmap/ConsoleWindow.cpp diff --git a/ConsoleWindow.h b/src/mapmap/ConsoleWindow.h similarity index 100% rename from ConsoleWindow.h rename to src/mapmap/ConsoleWindow.h diff --git a/Element.cpp b/src/mapmap/Element.cpp similarity index 100% rename from Element.cpp rename to src/mapmap/Element.cpp diff --git a/Element.h b/src/mapmap/Element.h similarity index 100% rename from Element.h rename to src/mapmap/Element.h diff --git a/Ellipse.cpp b/src/mapmap/Ellipse.cpp similarity index 100% rename from Ellipse.cpp rename to src/mapmap/Ellipse.cpp diff --git a/Ellipse.h b/src/mapmap/Ellipse.h similarity index 100% rename from Ellipse.h rename to src/mapmap/Ellipse.h diff --git a/GuiForward.h b/src/mapmap/GuiForward.h similarity index 100% rename from GuiForward.h rename to src/mapmap/GuiForward.h diff --git a/MM.cpp b/src/mapmap/MM.cpp similarity index 100% rename from MM.cpp rename to src/mapmap/MM.cpp diff --git a/MM.h b/src/mapmap/MM.h similarity index 100% rename from MM.h rename to src/mapmap/MM.h diff --git a/MainApplication.cpp b/src/mapmap/MainApplication.cpp similarity index 100% rename from MainApplication.cpp rename to src/mapmap/MainApplication.cpp diff --git a/MainApplication.h b/src/mapmap/MainApplication.h similarity index 100% rename from MainApplication.h rename to src/mapmap/MainApplication.h diff --git a/MainWindow.cpp b/src/mapmap/MainWindow.cpp similarity index 100% rename from MainWindow.cpp rename to src/mapmap/MainWindow.cpp diff --git a/MainWindow.h b/src/mapmap/MainWindow.h similarity index 100% rename from MainWindow.h rename to src/mapmap/MainWindow.h diff --git a/MapperGLCanvas.cpp b/src/mapmap/MapperGLCanvas.cpp similarity index 99% rename from MapperGLCanvas.cpp rename to src/mapmap/MapperGLCanvas.cpp index 9d5300c..a361574 100644 --- a/MapperGLCanvas.cpp +++ b/src/mapmap/MapperGLCanvas.cpp @@ -612,10 +612,11 @@ void MapperGLCanvas::wheelEvent(QWheelEvent *event) // Accept wheel scrolling event. event->accept(); } else { // control is not pressed: scroll + QScrollBar* scrollbar; if (shift_is_pressed) { // shift is pressed: pans horizontally - QScrollBar* const scrollbar = this->horizontalScrollBar(); + scrollbar = this->horizontalScrollBar(); } else { // shift is not pressed: scrolls vertically - QScrollBar* const scrollbar = this->verticalScrollBar(); + scrollbar = this->verticalScrollBar(); } // FIXME: scrolling with the mouse doesn't currently work int scroll = scrollbar->value(); diff --git a/MapperGLCanvas.h b/src/mapmap/MapperGLCanvas.h similarity index 100% rename from MapperGLCanvas.h rename to src/mapmap/MapperGLCanvas.h diff --git a/MapperGLCanvasToolbar.cpp b/src/mapmap/MapperGLCanvasToolbar.cpp similarity index 100% rename from MapperGLCanvasToolbar.cpp rename to src/mapmap/MapperGLCanvasToolbar.cpp diff --git a/MapperGLCanvasToolbar.h b/src/mapmap/MapperGLCanvasToolbar.h similarity index 100% rename from MapperGLCanvasToolbar.h rename to src/mapmap/MapperGLCanvasToolbar.h diff --git a/Mapping.cpp b/src/mapmap/Mapping.cpp similarity index 100% rename from Mapping.cpp rename to src/mapmap/Mapping.cpp diff --git a/Mapping.h b/src/mapmap/Mapping.h similarity index 100% rename from Mapping.h rename to src/mapmap/Mapping.h diff --git a/MappingGui.cpp b/src/mapmap/MappingGui.cpp similarity index 100% rename from MappingGui.cpp rename to src/mapmap/MappingGui.cpp diff --git a/MappingGui.h b/src/mapmap/MappingGui.h similarity index 100% rename from MappingGui.h rename to src/mapmap/MappingGui.h diff --git a/MappingItemDelegate.cpp b/src/mapmap/MappingItemDelegate.cpp similarity index 100% rename from MappingItemDelegate.cpp rename to src/mapmap/MappingItemDelegate.cpp diff --git a/MappingItemDelegate.h b/src/mapmap/MappingItemDelegate.h similarity index 100% rename from MappingItemDelegate.h rename to src/mapmap/MappingItemDelegate.h diff --git a/MappingListModel.cpp b/src/mapmap/MappingListModel.cpp similarity index 100% rename from MappingListModel.cpp rename to src/mapmap/MappingListModel.cpp diff --git a/MappingListModel.h b/src/mapmap/MappingListModel.h similarity index 100% rename from MappingListModel.h rename to src/mapmap/MappingListModel.h diff --git a/MappingManager.cpp b/src/mapmap/MappingManager.cpp similarity index 100% rename from MappingManager.cpp rename to src/mapmap/MappingManager.cpp diff --git a/MappingManager.h b/src/mapmap/MappingManager.h similarity index 100% rename from MappingManager.h rename to src/mapmap/MappingManager.h diff --git a/Maths.h b/src/mapmap/Maths.h similarity index 100% rename from Maths.h rename to src/mapmap/Maths.h diff --git a/Mesh.cpp b/src/mapmap/Mesh.cpp similarity index 100% rename from Mesh.cpp rename to src/mapmap/Mesh.cpp diff --git a/Mesh.h b/src/mapmap/Mesh.h similarity index 100% rename from Mesh.h rename to src/mapmap/Mesh.h diff --git a/MetaObjectRegistry.cpp b/src/mapmap/MetaObjectRegistry.cpp similarity index 100% rename from MetaObjectRegistry.cpp rename to src/mapmap/MetaObjectRegistry.cpp diff --git a/MetaObjectRegistry.h b/src/mapmap/MetaObjectRegistry.h similarity index 100% rename from MetaObjectRegistry.h rename to src/mapmap/MetaObjectRegistry.h diff --git a/OscInterface.cpp b/src/mapmap/OscInterface.cpp similarity index 100% rename from OscInterface.cpp rename to src/mapmap/OscInterface.cpp diff --git a/OscInterface.h b/src/mapmap/OscInterface.h similarity index 100% rename from OscInterface.h rename to src/mapmap/OscInterface.h diff --git a/OscReceiver.cpp b/src/mapmap/OscReceiver.cpp similarity index 100% rename from OscReceiver.cpp rename to src/mapmap/OscReceiver.cpp diff --git a/OscReceiver.h b/src/mapmap/OscReceiver.h similarity index 100% rename from OscReceiver.h rename to src/mapmap/OscReceiver.h diff --git a/OutputGLCanvas.cpp b/src/mapmap/OutputGLCanvas.cpp similarity index 100% rename from OutputGLCanvas.cpp rename to src/mapmap/OutputGLCanvas.cpp diff --git a/OutputGLCanvas.h b/src/mapmap/OutputGLCanvas.h similarity index 100% rename from OutputGLCanvas.h rename to src/mapmap/OutputGLCanvas.h diff --git a/OutputGLWindow.cpp b/src/mapmap/OutputGLWindow.cpp similarity index 100% rename from OutputGLWindow.cpp rename to src/mapmap/OutputGLWindow.cpp diff --git a/OutputGLWindow.h b/src/mapmap/OutputGLWindow.h similarity index 100% rename from OutputGLWindow.h rename to src/mapmap/OutputGLWindow.h diff --git a/Paint.cpp b/src/mapmap/Paint.cpp similarity index 100% rename from Paint.cpp rename to src/mapmap/Paint.cpp diff --git a/Paint.h b/src/mapmap/Paint.h similarity index 100% rename from Paint.h rename to src/mapmap/Paint.h diff --git a/PaintGui.cpp b/src/mapmap/PaintGui.cpp similarity index 100% rename from PaintGui.cpp rename to src/mapmap/PaintGui.cpp diff --git a/PaintGui.h b/src/mapmap/PaintGui.h similarity index 100% rename from PaintGui.h rename to src/mapmap/PaintGui.h diff --git a/Polygon.cpp b/src/mapmap/Polygon.cpp similarity index 100% rename from Polygon.cpp rename to src/mapmap/Polygon.cpp diff --git a/Polygon.h b/src/mapmap/Polygon.h similarity index 100% rename from Polygon.h rename to src/mapmap/Polygon.h diff --git a/PreferenceDialog.cpp b/src/mapmap/PreferenceDialog.cpp similarity index 100% rename from PreferenceDialog.cpp rename to src/mapmap/PreferenceDialog.cpp diff --git a/PreferenceDialog.h b/src/mapmap/PreferenceDialog.h similarity index 100% rename from PreferenceDialog.h rename to src/mapmap/PreferenceDialog.h diff --git a/ProjectLabels.cpp b/src/mapmap/ProjectLabels.cpp similarity index 100% rename from ProjectLabels.cpp rename to src/mapmap/ProjectLabels.cpp diff --git a/ProjectLabels.h b/src/mapmap/ProjectLabels.h similarity index 100% rename from ProjectLabels.h rename to src/mapmap/ProjectLabels.h diff --git a/ProjectReader.cpp b/src/mapmap/ProjectReader.cpp similarity index 100% rename from ProjectReader.cpp rename to src/mapmap/ProjectReader.cpp diff --git a/ProjectReader.h b/src/mapmap/ProjectReader.h similarity index 100% rename from ProjectReader.h rename to src/mapmap/ProjectReader.h diff --git a/ProjectWriter.cpp b/src/mapmap/ProjectWriter.cpp similarity index 100% rename from ProjectWriter.cpp rename to src/mapmap/ProjectWriter.cpp diff --git a/ProjectWriter.h b/src/mapmap/ProjectWriter.h similarity index 100% rename from ProjectWriter.h rename to src/mapmap/ProjectWriter.h diff --git a/Quad.h b/src/mapmap/Quad.h similarity index 100% rename from Quad.h rename to src/mapmap/Quad.h diff --git a/Serializable.cpp b/src/mapmap/Serializable.cpp similarity index 100% rename from Serializable.cpp rename to src/mapmap/Serializable.cpp diff --git a/Serializable.h b/src/mapmap/Serializable.h similarity index 100% rename from Serializable.h rename to src/mapmap/Serializable.h diff --git a/Shape.cpp b/src/mapmap/Shape.cpp similarity index 100% rename from Shape.cpp rename to src/mapmap/Shape.cpp diff --git a/Shape.h b/src/mapmap/Shape.h similarity index 100% rename from Shape.h rename to src/mapmap/Shape.h diff --git a/ShapeControlPainter.cpp b/src/mapmap/ShapeControlPainter.cpp similarity index 100% rename from ShapeControlPainter.cpp rename to src/mapmap/ShapeControlPainter.cpp diff --git a/ShapeControlPainter.h b/src/mapmap/ShapeControlPainter.h similarity index 100% rename from ShapeControlPainter.h rename to src/mapmap/ShapeControlPainter.h diff --git a/ShapeGraphicsItem.cpp b/src/mapmap/ShapeGraphicsItem.cpp similarity index 100% rename from ShapeGraphicsItem.cpp rename to src/mapmap/ShapeGraphicsItem.cpp diff --git a/ShapeGraphicsItem.h b/src/mapmap/ShapeGraphicsItem.h similarity index 100% rename from ShapeGraphicsItem.h rename to src/mapmap/ShapeGraphicsItem.h diff --git a/Shapes.h b/src/mapmap/Shapes.h similarity index 100% rename from Shapes.h rename to src/mapmap/Shapes.h diff --git a/Triangle.h b/src/mapmap/Triangle.h similarity index 100% rename from Triangle.h rename to src/mapmap/Triangle.h diff --git a/UidAllocator.cpp b/src/mapmap/UidAllocator.cpp similarity index 100% rename from UidAllocator.cpp rename to src/mapmap/UidAllocator.cpp diff --git a/UidAllocator.h b/src/mapmap/UidAllocator.h similarity index 100% rename from UidAllocator.h rename to src/mapmap/UidAllocator.h diff --git a/Util.cpp b/src/mapmap/Util.cpp similarity index 100% rename from Util.cpp rename to src/mapmap/Util.cpp diff --git a/Util.h b/src/mapmap/Util.h similarity index 100% rename from Util.h rename to src/mapmap/Util.h diff --git a/VideoImpl.cpp b/src/mapmap/VideoImpl.cpp similarity index 100% rename from VideoImpl.cpp rename to src/mapmap/VideoImpl.cpp diff --git a/VideoImpl.h b/src/mapmap/VideoImpl.h similarity index 100% rename from VideoImpl.h rename to src/mapmap/VideoImpl.h diff --git a/VideoShmSrcImpl.cpp b/src/mapmap/VideoShmSrcImpl.cpp similarity index 100% rename from VideoShmSrcImpl.cpp rename to src/mapmap/VideoShmSrcImpl.cpp diff --git a/VideoShmSrcImpl.h b/src/mapmap/VideoShmSrcImpl.h similarity index 100% rename from VideoShmSrcImpl.h rename to src/mapmap/VideoShmSrcImpl.h diff --git a/VideoUriDecodeBinImpl.cpp b/src/mapmap/VideoUriDecodeBinImpl.cpp similarity index 100% rename from VideoUriDecodeBinImpl.cpp rename to src/mapmap/VideoUriDecodeBinImpl.cpp diff --git a/VideoUriDecodeBinImpl.h b/src/mapmap/VideoUriDecodeBinImpl.h similarity index 100% rename from VideoUriDecodeBinImpl.h rename to src/mapmap/VideoUriDecodeBinImpl.h diff --git a/VideoV4l2SrcImpl.cpp b/src/mapmap/VideoV4l2SrcImpl.cpp similarity index 100% rename from VideoV4l2SrcImpl.cpp rename to src/mapmap/VideoV4l2SrcImpl.cpp diff --git a/VideoV4l2SrcImpl.h b/src/mapmap/VideoV4l2SrcImpl.h similarity index 100% rename from VideoV4l2SrcImpl.h rename to src/mapmap/VideoV4l2SrcImpl.h diff --git a/contrib/qtpropertybrowser-extension/fileedit.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/fileedit.cpp similarity index 100% rename from contrib/qtpropertybrowser-extension/fileedit.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/fileedit.cpp diff --git a/contrib/qtpropertybrowser-extension/fileedit.h b/src/mapmap/contrib/qtpropertybrowser-extension/fileedit.h similarity index 100% rename from contrib/qtpropertybrowser-extension/fileedit.h rename to src/mapmap/contrib/qtpropertybrowser-extension/fileedit.h diff --git a/contrib/qtpropertybrowser-extension/fileeditfactory.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.cpp similarity index 100% rename from contrib/qtpropertybrowser-extension/fileeditfactory.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.cpp diff --git a/contrib/qtpropertybrowser-extension/fileeditfactory.h b/src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.h similarity index 100% rename from contrib/qtpropertybrowser-extension/fileeditfactory.h rename to src/mapmap/contrib/qtpropertybrowser-extension/fileeditfactory.h diff --git a/contrib/qtpropertybrowser-extension/filepathmanager.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.cpp similarity index 100% rename from contrib/qtpropertybrowser-extension/filepathmanager.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.cpp diff --git a/contrib/qtpropertybrowser-extension/filepathmanager.h b/src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.h similarity index 100% rename from contrib/qtpropertybrowser-extension/filepathmanager.h rename to src/mapmap/contrib/qtpropertybrowser-extension/filepathmanager.h diff --git a/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri b/src/mapmap/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri similarity index 100% rename from contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri rename to src/mapmap/contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri diff --git a/contrib/qtpropertybrowser-extension/variantfactory.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.cpp similarity index 100% rename from contrib/qtpropertybrowser-extension/variantfactory.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.cpp diff --git a/contrib/qtpropertybrowser-extension/variantfactory.h b/src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.h similarity index 100% rename from contrib/qtpropertybrowser-extension/variantfactory.h rename to src/mapmap/contrib/qtpropertybrowser-extension/variantfactory.h diff --git a/contrib/qtpropertybrowser-extension/variantmanager.cpp b/src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.cpp similarity index 100% rename from contrib/qtpropertybrowser-extension/variantmanager.cpp rename to src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.cpp diff --git a/contrib/qtpropertybrowser-extension/variantmanager.h b/src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.h similarity index 100% rename from contrib/qtpropertybrowser-extension/variantmanager.h rename to src/mapmap/contrib/qtpropertybrowser-extension/variantmanager.h diff --git a/contrib/qtpropertybrowser/INSTALL.TXT b/src/mapmap/contrib/qtpropertybrowser/INSTALL.TXT similarity index 100% rename from contrib/qtpropertybrowser/INSTALL.TXT rename to src/mapmap/contrib/qtpropertybrowser/INSTALL.TXT diff --git a/contrib/qtpropertybrowser/README.TXT b/src/mapmap/contrib/qtpropertybrowser/README.TXT similarity index 100% rename from contrib/qtpropertybrowser/README.TXT rename to src/mapmap/contrib/qtpropertybrowser/README.TXT diff --git a/contrib/qtpropertybrowser/buildlib/buildlib.pro b/src/mapmap/contrib/qtpropertybrowser/buildlib/buildlib.pro similarity index 100% rename from contrib/qtpropertybrowser/buildlib/buildlib.pro rename to src/mapmap/contrib/qtpropertybrowser/buildlib/buildlib.pro diff --git a/contrib/qtpropertybrowser/common.pri b/src/mapmap/contrib/qtpropertybrowser/common.pri similarity index 100% rename from contrib/qtpropertybrowser/common.pri rename to src/mapmap/contrib/qtpropertybrowser/common.pri diff --git a/contrib/qtpropertybrowser/configure b/src/mapmap/contrib/qtpropertybrowser/configure similarity index 100% rename from contrib/qtpropertybrowser/configure rename to src/mapmap/contrib/qtpropertybrowser/configure diff --git a/contrib/qtpropertybrowser/configure.bat b/src/mapmap/contrib/qtpropertybrowser/configure.bat similarity index 100% rename from contrib/qtpropertybrowser/configure.bat rename to src/mapmap/contrib/qtpropertybrowser/configure.bat diff --git a/contrib/qtpropertybrowser/doc/images/canvas_typed.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_typed.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/canvas_typed.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_typed.png diff --git a/contrib/qtpropertybrowser/doc/images/canvas_variant.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_variant.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/canvas_variant.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/canvas_variant.png diff --git a/contrib/qtpropertybrowser/doc/images/decoration.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/decoration.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/decoration.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/decoration.png diff --git a/contrib/qtpropertybrowser/doc/images/demo.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/demo.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/demo.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/demo.png diff --git a/contrib/qtpropertybrowser/doc/images/extension.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/extension.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/extension.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/extension.png diff --git a/contrib/qtpropertybrowser/doc/images/object_controller.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/object_controller.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/object_controller.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/object_controller.png diff --git a/contrib/qtpropertybrowser/doc/images/qt-logo.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qt-logo.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/qt-logo.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/qt-logo.png diff --git a/contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/qtbuttonpropertybrowser.png diff --git a/contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/qtgroupboxpropertybrowser.png diff --git a/contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser-duplicate.png diff --git a/contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/qtpropertybrowser.png diff --git a/contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/qttreepropertybrowser.png diff --git a/contrib/qtpropertybrowser/doc/images/simple.png b/src/mapmap/contrib/qtpropertybrowser/doc/images/simple.png similarity index 100% rename from contrib/qtpropertybrowser/doc/images/simple.png rename to src/mapmap/contrib/qtpropertybrowser/doc/images/simple.png diff --git a/contrib/qtpropertybrowser/doc/index.qdoc b/src/mapmap/contrib/qtpropertybrowser/doc/index.qdoc similarity index 100% rename from contrib/qtpropertybrowser/doc/index.qdoc rename to src/mapmap/contrib/qtpropertybrowser/doc/index.qdoc diff --git a/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.pro diff --git a/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/canvas_typed.qdoc diff --git a/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_typed/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/main.cpp diff --git a/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.cpp diff --git a/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/mainwindow.h diff --git a/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.cpp diff --git a/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_typed/qtcanvas.h diff --git a/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.pro diff --git a/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/canvas_variant.qdoc diff --git a/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_variant/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/main.cpp diff --git a/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.cpp diff --git a/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/mainwindow.h diff --git a/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.cpp diff --git a/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h b/src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h similarity index 100% rename from contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h rename to src/mapmap/contrib/qtpropertybrowser/examples/canvas_variant/qtcanvas.h diff --git a/contrib/qtpropertybrowser/examples/decoration/decoration.pro b/src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.pro similarity index 100% rename from contrib/qtpropertybrowser/examples/decoration/decoration.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.pro diff --git a/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc similarity index 100% rename from contrib/qtpropertybrowser/examples/decoration/decoration.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/decoration/decoration.qdoc diff --git a/contrib/qtpropertybrowser/examples/decoration/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/decoration/main.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/decoration/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/decoration/main.cpp diff --git a/contrib/qtpropertybrowser/examples/demo/demo.pro b/src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.pro similarity index 100% rename from contrib/qtpropertybrowser/examples/demo/demo.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.pro diff --git a/contrib/qtpropertybrowser/examples/demo/demo.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qdoc similarity index 100% rename from contrib/qtpropertybrowser/examples/demo/demo.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qdoc diff --git a/contrib/qtpropertybrowser/examples/demo/demo.qrc b/src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qrc similarity index 100% rename from contrib/qtpropertybrowser/examples/demo/demo.qrc rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/demo.qrc diff --git a/contrib/qtpropertybrowser/examples/demo/images/down.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/down.png similarity index 100% rename from contrib/qtpropertybrowser/examples/demo/images/down.png rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/images/down.png diff --git a/contrib/qtpropertybrowser/examples/demo/images/left.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/left.png similarity index 100% rename from contrib/qtpropertybrowser/examples/demo/images/left.png rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/images/left.png diff --git a/contrib/qtpropertybrowser/examples/demo/images/right.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/right.png similarity index 100% rename from contrib/qtpropertybrowser/examples/demo/images/right.png rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/images/right.png diff --git a/contrib/qtpropertybrowser/examples/demo/images/up.png b/src/mapmap/contrib/qtpropertybrowser/examples/demo/images/up.png similarity index 100% rename from contrib/qtpropertybrowser/examples/demo/images/up.png rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/images/up.png diff --git a/contrib/qtpropertybrowser/examples/demo/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/demo/main.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/demo/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/demo/main.cpp diff --git a/contrib/qtpropertybrowser/examples/examples.pro b/src/mapmap/contrib/qtpropertybrowser/examples/examples.pro similarity index 100% rename from contrib/qtpropertybrowser/examples/examples.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/examples.pro diff --git a/contrib/qtpropertybrowser/examples/extension/extension.pro b/src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.pro similarity index 100% rename from contrib/qtpropertybrowser/examples/extension/extension.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.pro diff --git a/contrib/qtpropertybrowser/examples/extension/extension.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.qdoc similarity index 100% rename from contrib/qtpropertybrowser/examples/extension/extension.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/extension/extension.qdoc diff --git a/contrib/qtpropertybrowser/examples/extension/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/extension/main.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/extension/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/extension/main.cpp diff --git a/contrib/qtpropertybrowser/examples/object_controller/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/main.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/object_controller/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/main.cpp diff --git a/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro similarity index 100% rename from contrib/qtpropertybrowser/examples/object_controller/object_controller.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.pro diff --git a/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc similarity index 100% rename from contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/object_controller.qdoc diff --git a/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.cpp diff --git a/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h b/src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h similarity index 100% rename from contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h rename to src/mapmap/contrib/qtpropertybrowser/examples/object_controller/objectcontroller.h diff --git a/contrib/qtpropertybrowser/examples/simple/main.cpp b/src/mapmap/contrib/qtpropertybrowser/examples/simple/main.cpp similarity index 100% rename from contrib/qtpropertybrowser/examples/simple/main.cpp rename to src/mapmap/contrib/qtpropertybrowser/examples/simple/main.cpp diff --git a/contrib/qtpropertybrowser/examples/simple/simple.pro b/src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.pro similarity index 100% rename from contrib/qtpropertybrowser/examples/simple/simple.pro rename to src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.pro diff --git a/contrib/qtpropertybrowser/examples/simple/simple.qdoc b/src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.qdoc similarity index 100% rename from contrib/qtpropertybrowser/examples/simple/simple.qdoc rename to src/mapmap/contrib/qtpropertybrowser/examples/simple/simple.qdoc diff --git a/contrib/qtpropertybrowser/qtpropertybrowser.pro b/src/mapmap/contrib/qtpropertybrowser/qtpropertybrowser.pro similarity index 100% rename from contrib/qtpropertybrowser/qtpropertybrowser.pro rename to src/mapmap/contrib/qtpropertybrowser/qtpropertybrowser.pro diff --git a/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase b/src/mapmap/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase similarity index 100% rename from contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase rename to src/mapmap/contrib/qtpropertybrowser/src/QtAbstractEditorFactoryBase diff --git a/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser b/src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser similarity index 100% rename from contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser rename to src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyBrowser diff --git a/contrib/qtpropertybrowser/src/QtAbstractPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtAbstractPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtAbstractPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtBoolPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtBoolPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtBoolPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtBoolPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtBrowserItem b/src/mapmap/contrib/qtpropertybrowser/src/QtBrowserItem similarity index 100% rename from contrib/qtpropertybrowser/src/QtBrowserItem rename to src/mapmap/contrib/qtpropertybrowser/src/QtBrowserItem diff --git a/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser b/src/mapmap/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser similarity index 100% rename from contrib/qtpropertybrowser/src/QtButtonPropertyBrowser rename to src/mapmap/contrib/qtpropertybrowser/src/QtButtonPropertyBrowser diff --git a/contrib/qtpropertybrowser/src/QtCharEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtCharEditorFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtCharEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtCharEditorFactory diff --git a/contrib/qtpropertybrowser/src/QtCharPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtCharPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtCharPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtCharPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtCheckBoxFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtCheckBoxFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtCheckBoxFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtCheckBoxFactory diff --git a/contrib/qtpropertybrowser/src/QtColorEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtColorEditorFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtColorEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtColorEditorFactory diff --git a/contrib/qtpropertybrowser/src/QtColorPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtColorPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtColorPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtColorPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtCursorEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtCursorEditorFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtCursorEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtCursorEditorFactory diff --git a/contrib/qtpropertybrowser/src/QtCursorPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtCursorPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtCursorPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtCursorPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtDateEditFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtDateEditFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtDateEditFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtDateEditFactory diff --git a/contrib/qtpropertybrowser/src/QtDatePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtDatePropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtDatePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtDatePropertyManager diff --git a/contrib/qtpropertybrowser/src/QtDateTimeEditFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtDateTimeEditFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtDateTimeEditFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtDateTimeEditFactory diff --git a/contrib/qtpropertybrowser/src/QtDateTimePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtDateTimePropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtDateTimePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtDateTimePropertyManager diff --git a/contrib/qtpropertybrowser/src/QtDoublePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtDoublePropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtDoublePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtDoublePropertyManager diff --git a/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtDoubleSpinBoxFactory diff --git a/contrib/qtpropertybrowser/src/QtEnumEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtEnumEditorFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtEnumEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtEnumEditorFactory diff --git a/contrib/qtpropertybrowser/src/QtEnumPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtEnumPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtEnumPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtEnumPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtFlagPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtFlagPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtFlagPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtFlagPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtFontEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtFontEditorFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtFontEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtFontEditorFactory diff --git a/contrib/qtpropertybrowser/src/QtFontPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtFontPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtFontPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtFontPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser b/src/mapmap/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser similarity index 100% rename from contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser rename to src/mapmap/contrib/qtpropertybrowser/src/QtGroupBoxPropertyBrowser diff --git a/contrib/qtpropertybrowser/src/QtGroupPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtGroupPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtGroupPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtGroupPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtIntPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtIntPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtIntPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtIntPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtKeySequenceEditorFactory diff --git a/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtKeySequencePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtKeySequencePropertyManager diff --git a/contrib/qtpropertybrowser/src/QtLineEditFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtLineEditFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtLineEditFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtLineEditFactory diff --git a/contrib/qtpropertybrowser/src/QtLocalePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtLocalePropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtLocalePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtLocalePropertyManager diff --git a/contrib/qtpropertybrowser/src/QtPointFPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtPointFPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtPointFPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtPointFPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtPointPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtPointPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtPointPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtPointPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtProperty b/src/mapmap/contrib/qtpropertybrowser/src/QtProperty similarity index 100% rename from contrib/qtpropertybrowser/src/QtProperty rename to src/mapmap/contrib/qtpropertybrowser/src/QtProperty diff --git a/contrib/qtpropertybrowser/src/QtRectFPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtRectFPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtRectFPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtRectFPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtRectPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtRectPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtRectPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtRectPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtScrollBarFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtScrollBarFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtScrollBarFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtScrollBarFactory diff --git a/contrib/qtpropertybrowser/src/QtSizeFPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtSizeFPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtSizeFPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtSizeFPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtSizePolicyPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtSizePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtSizePropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtSizePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtSizePropertyManager diff --git a/contrib/qtpropertybrowser/src/QtSliderFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtSliderFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtSliderFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtSliderFactory diff --git a/contrib/qtpropertybrowser/src/QtSpinBoxFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtSpinBoxFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtSpinBoxFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtSpinBoxFactory diff --git a/contrib/qtpropertybrowser/src/QtStringPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtStringPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtStringPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtStringPropertyManager diff --git a/contrib/qtpropertybrowser/src/QtTimeEditFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtTimeEditFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtTimeEditFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtTimeEditFactory diff --git a/contrib/qtpropertybrowser/src/QtTimePropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtTimePropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtTimePropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtTimePropertyManager diff --git a/contrib/qtpropertybrowser/src/QtTreePropertyBrowser b/src/mapmap/contrib/qtpropertybrowser/src/QtTreePropertyBrowser similarity index 100% rename from contrib/qtpropertybrowser/src/QtTreePropertyBrowser rename to src/mapmap/contrib/qtpropertybrowser/src/QtTreePropertyBrowser diff --git a/contrib/qtpropertybrowser/src/QtVariantEditorFactory b/src/mapmap/contrib/qtpropertybrowser/src/QtVariantEditorFactory similarity index 100% rename from contrib/qtpropertybrowser/src/QtVariantEditorFactory rename to src/mapmap/contrib/qtpropertybrowser/src/QtVariantEditorFactory diff --git a/contrib/qtpropertybrowser/src/QtVariantProperty b/src/mapmap/contrib/qtpropertybrowser/src/QtVariantProperty similarity index 100% rename from contrib/qtpropertybrowser/src/QtVariantProperty rename to src/mapmap/contrib/qtpropertybrowser/src/QtVariantProperty diff --git a/contrib/qtpropertybrowser/src/QtVariantPropertyManager b/src/mapmap/contrib/qtpropertybrowser/src/QtVariantPropertyManager similarity index 100% rename from contrib/qtpropertybrowser/src/QtVariantPropertyManager rename to src/mapmap/contrib/qtpropertybrowser/src/QtVariantPropertyManager diff --git a/contrib/qtpropertybrowser/src/images/cursor-arrow.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-arrow.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-arrow.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-arrow.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-busy.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-busy.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-busy.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-busy.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-closedhand.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-closedhand.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-closedhand.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-closedhand.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-cross.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-cross.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-cross.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-cross.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-forbidden.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-forbidden.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-forbidden.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-forbidden.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-hand.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hand.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-hand.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hand.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-hsplit.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hsplit.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-hsplit.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-hsplit.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-ibeam.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-ibeam.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-ibeam.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-ibeam.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-openhand.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-openhand.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-openhand.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-openhand.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-sizeall.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeall.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-sizeall.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeall.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-sizeb.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeb.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-sizeb.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeb.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-sizef.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizef.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-sizef.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizef.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-sizeh.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeh.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-sizeh.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizeh.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-sizev.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizev.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-sizev.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-sizev.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-uparrow.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-uparrow.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-uparrow.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-uparrow.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-vsplit.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-vsplit.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-vsplit.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-vsplit.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-wait.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-wait.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-wait.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-wait.png diff --git a/contrib/qtpropertybrowser/src/images/cursor-whatsthis.png b/src/mapmap/contrib/qtpropertybrowser/src/images/cursor-whatsthis.png similarity index 100% rename from contrib/qtpropertybrowser/src/images/cursor-whatsthis.png rename to src/mapmap/contrib/qtpropertybrowser/src/images/cursor-whatsthis.png diff --git a/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp similarity index 100% rename from contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.cpp diff --git a/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h b/src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h similarity index 100% rename from contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtbuttonpropertybrowser.h diff --git a/contrib/qtpropertybrowser/src/qteditorfactory.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.cpp similarity index 100% rename from contrib/qtpropertybrowser/src/qteditorfactory.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.cpp diff --git a/contrib/qtpropertybrowser/src/qteditorfactory.h b/src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.h similarity index 100% rename from contrib/qtpropertybrowser/src/qteditorfactory.h rename to src/mapmap/contrib/qtpropertybrowser/src/qteditorfactory.h diff --git a/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp similarity index 100% rename from contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.cpp diff --git a/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h b/src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h similarity index 100% rename from contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtgroupboxpropertybrowser.h diff --git a/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp similarity index 100% rename from contrib/qtpropertybrowser/src/qtpropertybrowser.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.cpp diff --git a/contrib/qtpropertybrowser/src/qtpropertybrowser.h b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.h similarity index 100% rename from contrib/qtpropertybrowser/src/qtpropertybrowser.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.h diff --git a/contrib/qtpropertybrowser/src/qtpropertybrowser.pri b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.pri similarity index 100% rename from contrib/qtpropertybrowser/src/qtpropertybrowser.pri rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.pri diff --git a/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc similarity index 100% rename from contrib/qtpropertybrowser/src/qtpropertybrowser.qrc rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowser.qrc diff --git a/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp similarity index 100% rename from contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils.cpp diff --git a/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h similarity index 100% rename from contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertybrowserutils_p.h diff --git a/contrib/qtpropertybrowser/src/qtpropertymanager.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.cpp similarity index 100% rename from contrib/qtpropertybrowser/src/qtpropertymanager.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.cpp diff --git a/contrib/qtpropertybrowser/src/qtpropertymanager.h b/src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.h similarity index 100% rename from contrib/qtpropertybrowser/src/qtpropertymanager.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtpropertymanager.h diff --git a/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp similarity index 100% rename from contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.cpp diff --git a/contrib/qtpropertybrowser/src/qttreepropertybrowser.h b/src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.h similarity index 100% rename from contrib/qtpropertybrowser/src/qttreepropertybrowser.h rename to src/mapmap/contrib/qtpropertybrowser/src/qttreepropertybrowser.h diff --git a/contrib/qtpropertybrowser/src/qtvariantproperty.cpp b/src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.cpp similarity index 100% rename from contrib/qtpropertybrowser/src/qtvariantproperty.cpp rename to src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.cpp diff --git a/contrib/qtpropertybrowser/src/qtvariantproperty.h b/src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.h similarity index 100% rename from contrib/qtpropertybrowser/src/qtvariantproperty.h rename to src/mapmap/contrib/qtpropertybrowser/src/qtvariantproperty.h diff --git a/docs/LibremappingUML.dia b/src/mapmap/docs/LibremappingUML.dia similarity index 100% rename from docs/LibremappingUML.dia rename to src/mapmap/docs/LibremappingUML.dia diff --git a/docs/datasheet.rst b/src/mapmap/docs/datasheet.rst similarity index 100% rename from docs/datasheet.rst rename to src/mapmap/docs/datasheet.rst diff --git a/docs/documentation.qrc b/src/mapmap/docs/documentation.qrc similarity index 100% rename from docs/documentation.qrc rename to src/mapmap/docs/documentation.qrc diff --git a/docs/informations/CHANGELOG.html b/src/mapmap/docs/informations/CHANGELOG.html similarity index 100% rename from docs/informations/CHANGELOG.html rename to src/mapmap/docs/informations/CHANGELOG.html diff --git a/docs/informations/CONTRIBUTORS.html b/src/mapmap/docs/informations/CONTRIBUTORS.html similarity index 100% rename from docs/informations/CONTRIBUTORS.html rename to src/mapmap/docs/informations/CONTRIBUTORS.html diff --git a/docs/informations/CONTRIBUTORS.md b/src/mapmap/docs/informations/CONTRIBUTORS.md similarity index 100% rename from docs/informations/CONTRIBUTORS.md rename to src/mapmap/docs/informations/CONTRIBUTORS.md diff --git a/docs/informations/LICENSE b/src/mapmap/docs/informations/LICENSE similarity index 100% rename from docs/informations/LICENSE rename to src/mapmap/docs/informations/LICENSE diff --git a/docs/informations/LICENSE_SHORT.txt b/src/mapmap/docs/informations/LICENSE_SHORT.txt similarity index 100% rename from docs/informations/LICENSE_SHORT.txt rename to src/mapmap/docs/informations/LICENSE_SHORT.txt diff --git a/docs/informations/MAPPING b/src/mapmap/docs/informations/MAPPING similarity index 100% rename from docs/informations/MAPPING rename to src/mapmap/docs/informations/MAPPING diff --git a/docs/informations/osc.html b/src/mapmap/docs/informations/osc.html similarity index 100% rename from docs/informations/osc.html rename to src/mapmap/docs/informations/osc.html diff --git a/docs/informations/osc.md b/src/mapmap/docs/informations/osc.md similarity index 100% rename from docs/informations/osc.md rename to src/mapmap/docs/informations/osc.md diff --git a/interface.qrc b/src/mapmap/interface.qrc similarity index 100% rename from interface.qrc rename to src/mapmap/interface.qrc diff --git a/main.cpp b/src/mapmap/main.cpp similarity index 100% rename from main.cpp rename to src/mapmap/main.cpp diff --git a/mapmap.pro b/src/mapmap/mapmap.pro similarity index 100% rename from mapmap.pro rename to src/mapmap/mapmap.pro diff --git a/mapmap_resource.rc b/src/mapmap/mapmap_resource.rc similarity index 100% rename from mapmap_resource.rc rename to src/mapmap/mapmap_resource.rc diff --git a/resources/fonts/DroidSans.otf b/src/mapmap/resources/fonts/DroidSans.otf similarity index 100% rename from resources/fonts/DroidSans.otf rename to src/mapmap/resources/fonts/DroidSans.otf diff --git a/resources/fonts/Hack-Regular.otf b/src/mapmap/resources/fonts/Hack-Regular.otf similarity index 100% rename from resources/fonts/Hack-Regular.otf rename to src/mapmap/resources/fonts/Hack-Regular.otf diff --git a/resources/images/box/box.png b/src/mapmap/resources/images/box/box.png similarity index 100% rename from resources/images/box/box.png rename to src/mapmap/resources/images/box/box.png diff --git a/resources/images/box/box2.png b/src/mapmap/resources/images/box/box2.png similarity index 100% rename from resources/images/box/box2.png rename to src/mapmap/resources/images/box/box2.png diff --git a/resources/images/box/box3.png b/src/mapmap/resources/images/box/box3.png similarity index 100% rename from resources/images/box/box3.png rename to src/mapmap/resources/images/box/box3.png diff --git a/resources/images/checkbox/checkbox-checked-focused.png b/src/mapmap/resources/images/checkbox/checkbox-checked-focused.png similarity index 100% rename from resources/images/checkbox/checkbox-checked-focused.png rename to src/mapmap/resources/images/checkbox/checkbox-checked-focused.png diff --git a/resources/images/checkbox/checkbox-checked.png b/src/mapmap/resources/images/checkbox/checkbox-checked.png similarity index 100% rename from resources/images/checkbox/checkbox-checked.png rename to src/mapmap/resources/images/checkbox/checkbox-checked.png diff --git a/resources/images/checkbox/checkbox-unchecked-focused.png b/src/mapmap/resources/images/checkbox/checkbox-unchecked-focused.png similarity index 100% rename from resources/images/checkbox/checkbox-unchecked-focused.png rename to src/mapmap/resources/images/checkbox/checkbox-unchecked-focused.png diff --git a/resources/images/checkbox/checkbox-unchecked.png b/src/mapmap/resources/images/checkbox/checkbox-unchecked.png similarity index 100% rename from resources/images/checkbox/checkbox-unchecked.png rename to src/mapmap/resources/images/checkbox/checkbox-unchecked.png diff --git a/resources/images/ctrl/pause.png b/src/mapmap/resources/images/ctrl/pause.png similarity index 100% rename from resources/images/ctrl/pause.png rename to src/mapmap/resources/images/ctrl/pause.png diff --git a/resources/images/ctrl/play.png b/src/mapmap/resources/images/ctrl/play.png similarity index 100% rename from resources/images/ctrl/play.png rename to src/mapmap/resources/images/ctrl/play.png diff --git a/resources/images/ctrl/stop.png b/src/mapmap/resources/images/ctrl/stop.png similarity index 100% rename from resources/images/ctrl/stop.png rename to src/mapmap/resources/images/ctrl/stop.png diff --git a/resources/images/icons/add_circ.png b/src/mapmap/resources/images/icons/add_circ.png similarity index 100% rename from resources/images/icons/add_circ.png rename to src/mapmap/resources/images/icons/add_circ.png diff --git a/resources/images/icons/add_circ2.png b/src/mapmap/resources/images/icons/add_circ2.png similarity index 100% rename from resources/images/icons/add_circ2.png rename to src/mapmap/resources/images/icons/add_circ2.png diff --git a/resources/images/icons/add_circ_w.png b/src/mapmap/resources/images/icons/add_circ_w.png similarity index 100% rename from resources/images/icons/add_circ_w.png rename to src/mapmap/resources/images/icons/add_circ_w.png diff --git a/resources/images/icons/add_color.png b/src/mapmap/resources/images/icons/add_color.png similarity index 100% rename from resources/images/icons/add_color.png rename to src/mapmap/resources/images/icons/add_color.png diff --git a/resources/images/icons/add_color2_w.png b/src/mapmap/resources/images/icons/add_color2_w.png similarity index 100% rename from resources/images/icons/add_color2_w.png rename to src/mapmap/resources/images/icons/add_color2_w.png diff --git a/resources/images/icons/add_color3.png b/src/mapmap/resources/images/icons/add_color3.png similarity index 100% rename from resources/images/icons/add_color3.png rename to src/mapmap/resources/images/icons/add_color3.png diff --git a/resources/images/icons/add_color3_sof_w.png b/src/mapmap/resources/images/icons/add_color3_sof_w.png similarity index 100% rename from resources/images/icons/add_color3_sof_w.png rename to src/mapmap/resources/images/icons/add_color3_sof_w.png diff --git a/resources/images/icons/add_color3_w.png b/src/mapmap/resources/images/icons/add_color3_w.png similarity index 100% rename from resources/images/icons/add_color3_w.png rename to src/mapmap/resources/images/icons/add_color3_w.png diff --git a/resources/images/icons/add_color_w.png b/src/mapmap/resources/images/icons/add_color_w.png similarity index 100% rename from resources/images/icons/add_color_w.png rename to src/mapmap/resources/images/icons/add_color_w.png diff --git a/resources/images/icons/add_img.png b/src/mapmap/resources/images/icons/add_img.png similarity index 100% rename from resources/images/icons/add_img.png rename to src/mapmap/resources/images/icons/add_img.png diff --git a/resources/images/icons/add_img_w.png b/src/mapmap/resources/images/icons/add_img_w.png similarity index 100% rename from resources/images/icons/add_img_w.png rename to src/mapmap/resources/images/icons/add_img_w.png diff --git a/resources/images/icons/add_movie.png b/src/mapmap/resources/images/icons/add_movie.png similarity index 100% rename from resources/images/icons/add_movie.png rename to src/mapmap/resources/images/icons/add_movie.png diff --git a/resources/images/icons/add_movie_w.png b/src/mapmap/resources/images/icons/add_movie_w.png similarity index 100% rename from resources/images/icons/add_movie_w.png rename to src/mapmap/resources/images/icons/add_movie_w.png diff --git a/resources/images/icons/add_paint.png b/src/mapmap/resources/images/icons/add_paint.png similarity index 100% rename from resources/images/icons/add_paint.png rename to src/mapmap/resources/images/icons/add_paint.png diff --git a/resources/images/icons/add_paint_w.png b/src/mapmap/resources/images/icons/add_paint_w.png similarity index 100% rename from resources/images/icons/add_paint_w.png rename to src/mapmap/resources/images/icons/add_paint_w.png diff --git a/resources/images/icons/add_quad.png b/src/mapmap/resources/images/icons/add_quad.png similarity index 100% rename from resources/images/icons/add_quad.png rename to src/mapmap/resources/images/icons/add_quad.png diff --git a/resources/images/icons/add_quad2.png b/src/mapmap/resources/images/icons/add_quad2.png similarity index 100% rename from resources/images/icons/add_quad2.png rename to src/mapmap/resources/images/icons/add_quad2.png diff --git a/resources/images/icons/add_quad_w.png b/src/mapmap/resources/images/icons/add_quad_w.png similarity index 100% rename from resources/images/icons/add_quad_w.png rename to src/mapmap/resources/images/icons/add_quad_w.png diff --git a/resources/images/icons/add_tri.png b/src/mapmap/resources/images/icons/add_tri.png similarity index 100% rename from resources/images/icons/add_tri.png rename to src/mapmap/resources/images/icons/add_tri.png diff --git a/resources/images/icons/add_tri_2.png b/src/mapmap/resources/images/icons/add_tri_2.png similarity index 100% rename from resources/images/icons/add_tri_2.png rename to src/mapmap/resources/images/icons/add_tri_2.png diff --git a/resources/images/icons/color.png b/src/mapmap/resources/images/icons/color.png similarity index 100% rename from resources/images/icons/color.png rename to src/mapmap/resources/images/icons/color.png diff --git a/resources/images/icons/color2.png b/src/mapmap/resources/images/icons/color2.png similarity index 100% rename from resources/images/icons/color2.png rename to src/mapmap/resources/images/icons/color2.png diff --git a/resources/images/icons/color2_w.png b/src/mapmap/resources/images/icons/color2_w.png similarity index 100% rename from resources/images/icons/color2_w.png rename to src/mapmap/resources/images/icons/color2_w.png diff --git a/resources/images/icons/color3.png b/src/mapmap/resources/images/icons/color3.png similarity index 100% rename from resources/images/icons/color3.png rename to src/mapmap/resources/images/icons/color3.png diff --git a/resources/images/icons/color3_w.png b/src/mapmap/resources/images/icons/color3_w.png similarity index 100% rename from resources/images/icons/color3_w.png rename to src/mapmap/resources/images/icons/color3_w.png diff --git a/resources/images/icons/color_p.png b/src/mapmap/resources/images/icons/color_p.png similarity index 100% rename from resources/images/icons/color_p.png rename to src/mapmap/resources/images/icons/color_p.png diff --git a/resources/images/icons/ctrl.png b/src/mapmap/resources/images/icons/ctrl.png similarity index 100% rename from resources/images/icons/ctrl.png rename to src/mapmap/resources/images/icons/ctrl.png diff --git a/resources/images/icons/ctrl2.png b/src/mapmap/resources/images/icons/ctrl2.png similarity index 100% rename from resources/images/icons/ctrl2.png rename to src/mapmap/resources/images/icons/ctrl2.png diff --git a/resources/images/icons/ctrl2_w.png b/src/mapmap/resources/images/icons/ctrl2_w.png similarity index 100% rename from resources/images/icons/ctrl2_w.png rename to src/mapmap/resources/images/icons/ctrl2_w.png diff --git a/resources/images/icons/ctrl3_w.png b/src/mapmap/resources/images/icons/ctrl3_w.png similarity index 100% rename from resources/images/icons/ctrl3_w.png rename to src/mapmap/resources/images/icons/ctrl3_w.png diff --git a/resources/images/icons/ctrl_w.png b/src/mapmap/resources/images/icons/ctrl_w.png similarity index 100% rename from resources/images/icons/ctrl_w.png rename to src/mapmap/resources/images/icons/ctrl_w.png diff --git a/resources/images/icons/fullscreen.png b/src/mapmap/resources/images/icons/fullscreen.png similarity index 100% rename from resources/images/icons/fullscreen.png rename to src/mapmap/resources/images/icons/fullscreen.png diff --git a/resources/images/icons/fullscreen2.png b/src/mapmap/resources/images/icons/fullscreen2.png similarity index 100% rename from resources/images/icons/fullscreen2.png rename to src/mapmap/resources/images/icons/fullscreen2.png diff --git a/resources/images/icons/fullscreen3_w.png b/src/mapmap/resources/images/icons/fullscreen3_w.png similarity index 100% rename from resources/images/icons/fullscreen3_w.png rename to src/mapmap/resources/images/icons/fullscreen3_w.png diff --git a/resources/images/icons/fullscreen_w.png b/src/mapmap/resources/images/icons/fullscreen_w.png similarity index 100% rename from resources/images/icons/fullscreen_w.png rename to src/mapmap/resources/images/icons/fullscreen_w.png diff --git a/resources/images/icons/grille.png b/src/mapmap/resources/images/icons/grille.png similarity index 100% rename from resources/images/icons/grille.png rename to src/mapmap/resources/images/icons/grille.png diff --git a/resources/images/icons/grille_w.png b/src/mapmap/resources/images/icons/grille_w.png similarity index 100% rename from resources/images/icons/grille_w.png rename to src/mapmap/resources/images/icons/grille_w.png diff --git a/resources/images/icons/newdoc.png b/src/mapmap/resources/images/icons/newdoc.png similarity index 100% rename from resources/images/icons/newdoc.png rename to src/mapmap/resources/images/icons/newdoc.png diff --git a/resources/images/icons/newdoc_w.png b/src/mapmap/resources/images/icons/newdoc_w.png similarity index 100% rename from resources/images/icons/newdoc_w.png rename to src/mapmap/resources/images/icons/newdoc_w.png diff --git a/resources/images/icons/nofullscreen.png b/src/mapmap/resources/images/icons/nofullscreen.png similarity index 100% rename from resources/images/icons/nofullscreen.png rename to src/mapmap/resources/images/icons/nofullscreen.png diff --git a/resources/images/icons/nofullscreen_w.png b/src/mapmap/resources/images/icons/nofullscreen_w.png similarity index 100% rename from resources/images/icons/nofullscreen_w.png rename to src/mapmap/resources/images/icons/nofullscreen_w.png diff --git a/resources/images/icons/open.png b/src/mapmap/resources/images/icons/open.png similarity index 100% rename from resources/images/icons/open.png rename to src/mapmap/resources/images/icons/open.png diff --git a/resources/images/icons/open_w.png b/src/mapmap/resources/images/icons/open_w.png similarity index 100% rename from resources/images/icons/open_w.png rename to src/mapmap/resources/images/icons/open_w.png diff --git a/resources/images/icons/pause.png b/src/mapmap/resources/images/icons/pause.png similarity index 100% rename from resources/images/icons/pause.png rename to src/mapmap/resources/images/icons/pause.png diff --git a/resources/images/icons/pause_w.png b/src/mapmap/resources/images/icons/pause_w.png similarity index 100% rename from resources/images/icons/pause_w.png rename to src/mapmap/resources/images/icons/pause_w.png diff --git a/resources/images/icons/pause_w2.png b/src/mapmap/resources/images/icons/pause_w2.png similarity index 100% rename from resources/images/icons/pause_w2.png rename to src/mapmap/resources/images/icons/pause_w2.png diff --git a/resources/images/icons/play.png b/src/mapmap/resources/images/icons/play.png similarity index 100% rename from resources/images/icons/play.png rename to src/mapmap/resources/images/icons/play.png diff --git a/resources/images/icons/play_w.png b/src/mapmap/resources/images/icons/play_w.png similarity index 100% rename from resources/images/icons/play_w.png rename to src/mapmap/resources/images/icons/play_w.png diff --git a/resources/images/icons/rewind.png b/src/mapmap/resources/images/icons/rewind.png similarity index 100% rename from resources/images/icons/rewind.png rename to src/mapmap/resources/images/icons/rewind.png diff --git a/resources/images/icons/rewind_w.png b/src/mapmap/resources/images/icons/rewind_w.png similarity index 100% rename from resources/images/icons/rewind_w.png rename to src/mapmap/resources/images/icons/rewind_w.png diff --git a/resources/images/icons/save.png b/src/mapmap/resources/images/icons/save.png similarity index 100% rename from resources/images/icons/save.png rename to src/mapmap/resources/images/icons/save.png diff --git a/resources/images/icons/save_w.png b/src/mapmap/resources/images/icons/save_w.png similarity index 100% rename from resources/images/icons/save_w.png rename to src/mapmap/resources/images/icons/save_w.png diff --git a/resources/images/icons/small/delete.png b/src/mapmap/resources/images/icons/small/delete.png similarity index 100% rename from resources/images/icons/small/delete.png rename to src/mapmap/resources/images/icons/small/delete.png diff --git a/resources/images/icons/small/delete_w.png b/src/mapmap/resources/images/icons/small/delete_w.png similarity index 100% rename from resources/images/icons/small/delete_w.png rename to src/mapmap/resources/images/icons/small/delete_w.png diff --git a/resources/images/icons/small/duplicate.png b/src/mapmap/resources/images/icons/small/duplicate.png similarity index 100% rename from resources/images/icons/small/duplicate.png rename to src/mapmap/resources/images/icons/small/duplicate.png diff --git a/resources/images/icons/small/duplicate_w.png b/src/mapmap/resources/images/icons/small/duplicate_w.png similarity index 100% rename from resources/images/icons/small/duplicate_w.png rename to src/mapmap/resources/images/icons/small/duplicate_w.png diff --git a/resources/images/icons/small/lock.png b/src/mapmap/resources/images/icons/small/lock.png similarity index 100% rename from resources/images/icons/small/lock.png rename to src/mapmap/resources/images/icons/small/lock.png diff --git a/resources/images/icons/small/lock_w.png b/src/mapmap/resources/images/icons/small/lock_w.png similarity index 100% rename from resources/images/icons/small/lock_w.png rename to src/mapmap/resources/images/icons/small/lock_w.png diff --git a/resources/images/icons/small/solo.png b/src/mapmap/resources/images/icons/small/solo.png similarity index 100% rename from resources/images/icons/small/solo.png rename to src/mapmap/resources/images/icons/small/solo.png diff --git a/resources/images/icons/small/solo_w.png b/src/mapmap/resources/images/icons/small/solo_w.png similarity index 100% rename from resources/images/icons/small/solo_w.png rename to src/mapmap/resources/images/icons/small/solo_w.png diff --git a/resources/images/icons/small/visible.png b/src/mapmap/resources/images/icons/small/visible.png similarity index 100% rename from resources/images/icons/small/visible.png rename to src/mapmap/resources/images/icons/small/visible.png diff --git a/resources/images/icons/small/visible_w.png b/src/mapmap/resources/images/icons/small/visible_w.png similarity index 100% rename from resources/images/icons/small/visible_w.png rename to src/mapmap/resources/images/icons/small/visible_w.png diff --git a/resources/images/icons/test_signal_w.png b/src/mapmap/resources/images/icons/test_signal_w.png similarity index 100% rename from resources/images/icons/test_signal_w.png rename to src/mapmap/resources/images/icons/test_signal_w.png diff --git a/resources/images/icons/zoom_fit.png b/src/mapmap/resources/images/icons/zoom_fit.png similarity index 100% rename from resources/images/icons/zoom_fit.png rename to src/mapmap/resources/images/icons/zoom_fit.png diff --git a/resources/images/icons/zoom_fit_w.png b/src/mapmap/resources/images/icons/zoom_fit_w.png similarity index 100% rename from resources/images/icons/zoom_fit_w.png rename to src/mapmap/resources/images/icons/zoom_fit_w.png diff --git a/resources/images/icons/zoom_in.png b/src/mapmap/resources/images/icons/zoom_in.png similarity index 100% rename from resources/images/icons/zoom_in.png rename to src/mapmap/resources/images/icons/zoom_in.png diff --git a/resources/images/icons/zoom_in_w.png b/src/mapmap/resources/images/icons/zoom_in_w.png similarity index 100% rename from resources/images/icons/zoom_in_w.png rename to src/mapmap/resources/images/icons/zoom_in_w.png diff --git a/resources/images/icons/zoom_out.png b/src/mapmap/resources/images/icons/zoom_out.png similarity index 100% rename from resources/images/icons/zoom_out.png rename to src/mapmap/resources/images/icons/zoom_out.png diff --git a/resources/images/icons/zoom_out_w.png b/src/mapmap/resources/images/icons/zoom_out_w.png similarity index 100% rename from resources/images/icons/zoom_out_w.png rename to src/mapmap/resources/images/icons/zoom_out_w.png diff --git a/resources/images/icons/zoom_reset.png b/src/mapmap/resources/images/icons/zoom_reset.png similarity index 100% rename from resources/images/icons/zoom_reset.png rename to src/mapmap/resources/images/icons/zoom_reset.png diff --git a/resources/images/icons/zoom_reset_w.png b/src/mapmap/resources/images/icons/zoom_reset_w.png similarity index 100% rename from resources/images/icons/zoom_reset_w.png rename to src/mapmap/resources/images/icons/zoom_reset_w.png diff --git a/resources/images/logo/logo_m_big_mapmap.png b/src/mapmap/resources/images/logo/logo_m_big_mapmap.png similarity index 100% rename from resources/images/logo/logo_m_big_mapmap.png rename to src/mapmap/resources/images/logo/logo_m_big_mapmap.png diff --git a/resources/images/logo/logo_m_mapmap.png b/src/mapmap/resources/images/logo/logo_m_mapmap.png similarity index 100% rename from resources/images/logo/logo_m_mapmap.png rename to src/mapmap/resources/images/logo/logo_m_mapmap.png diff --git a/resources/images/logo/logomapmap-light.png b/src/mapmap/resources/images/logo/logomapmap-light.png similarity index 100% rename from resources/images/logo/logomapmap-light.png rename to src/mapmap/resources/images/logo/logomapmap-light.png diff --git a/resources/images/logo/logomapmap.png b/src/mapmap/resources/images/logo/logomapmap.png similarity index 100% rename from resources/images/logo/logomapmap.png rename to src/mapmap/resources/images/logo/logomapmap.png diff --git a/resources/images/logo/mapmap-fullname.svg b/src/mapmap/resources/images/logo/mapmap-fullname.svg similarity index 100% rename from resources/images/logo/mapmap-fullname.svg rename to src/mapmap/resources/images/logo/mapmap-fullname.svg diff --git a/resources/images/logo/mapmap-logo.ico b/src/mapmap/resources/images/logo/mapmap-logo.ico similarity index 100% rename from resources/images/logo/mapmap-logo.ico rename to src/mapmap/resources/images/logo/mapmap-logo.ico diff --git a/resources/images/logo/mapmap-logo.png b/src/mapmap/resources/images/logo/mapmap-logo.png similarity index 100% rename from resources/images/logo/mapmap-logo.png rename to src/mapmap/resources/images/logo/mapmap-logo.png diff --git a/resources/images/logo/mapmap-wide-with-border.svg b/src/mapmap/resources/images/logo/mapmap-wide-with-border.svg similarity index 100% rename from resources/images/logo/mapmap-wide-with-border.svg rename to src/mapmap/resources/images/logo/mapmap-wide-with-border.svg diff --git a/resources/images/logo/mapmap.ico b/src/mapmap/resources/images/logo/mapmap.ico similarity index 100% rename from resources/images/logo/mapmap.ico rename to src/mapmap/resources/images/logo/mapmap.ico diff --git a/resources/images/logo/mapmap.svg b/src/mapmap/resources/images/logo/mapmap.svg similarity index 100% rename from resources/images/logo/mapmap.svg rename to src/mapmap/resources/images/logo/mapmap.svg diff --git a/resources/images/logo/splash.png b/src/mapmap/resources/images/logo/splash.png similarity index 100% rename from resources/images/logo/splash.png rename to src/mapmap/resources/images/logo/splash.png diff --git a/resources/images/media/photo.png b/src/mapmap/resources/images/media/photo.png similarity index 100% rename from resources/images/media/photo.png rename to src/mapmap/resources/images/media/photo.png diff --git a/resources/images/media/video.png b/src/mapmap/resources/images/media/video.png similarity index 100% rename from resources/images/media/video.png rename to src/mapmap/resources/images/media/video.png diff --git a/resources/images/media/webcam.png b/src/mapmap/resources/images/media/webcam.png similarity index 100% rename from resources/images/media/webcam.png rename to src/mapmap/resources/images/media/webcam.png diff --git a/resources/images/menu/add_cam.png b/src/mapmap/resources/images/menu/add_cam.png similarity index 100% rename from resources/images/menu/add_cam.png rename to src/mapmap/resources/images/menu/add_cam.png diff --git a/resources/images/menu/add_color.png b/src/mapmap/resources/images/menu/add_color.png similarity index 100% rename from resources/images/menu/add_color.png rename to src/mapmap/resources/images/menu/add_color.png diff --git a/resources/images/menu/fullscreen.png b/src/mapmap/resources/images/menu/fullscreen.png similarity index 100% rename from resources/images/menu/fullscreen.png rename to src/mapmap/resources/images/menu/fullscreen.png diff --git a/resources/images/menu/midi.png b/src/mapmap/resources/images/menu/midi.png similarity index 100% rename from resources/images/menu/midi.png rename to src/mapmap/resources/images/menu/midi.png diff --git a/resources/images/menu/preferences.png b/src/mapmap/resources/images/menu/preferences.png similarity index 100% rename from resources/images/menu/preferences.png rename to src/mapmap/resources/images/menu/preferences.png diff --git a/resources/images/menu/record.png b/src/mapmap/resources/images/menu/record.png similarity index 100% rename from resources/images/menu/record.png rename to src/mapmap/resources/images/menu/record.png diff --git a/resources/images/menu/reseaux.png b/src/mapmap/resources/images/menu/reseaux.png similarity index 100% rename from resources/images/menu/reseaux.png rename to src/mapmap/resources/images/menu/reseaux.png diff --git a/resources/images/menu/save.png b/src/mapmap/resources/images/menu/save.png similarity index 100% rename from resources/images/menu/save.png rename to src/mapmap/resources/images/menu/save.png diff --git a/resources/images/menu/sound.png b/src/mapmap/resources/images/menu/sound.png similarity index 100% rename from resources/images/menu/sound.png rename to src/mapmap/resources/images/menu/sound.png diff --git a/resources/images/menu/webcam.png b/src/mapmap/resources/images/menu/webcam.png similarity index 100% rename from resources/images/menu/webcam.png rename to src/mapmap/resources/images/menu/webcam.png diff --git a/resources/images/shapes/add_circle.png b/src/mapmap/resources/images/shapes/add_circle.png similarity index 100% rename from resources/images/shapes/add_circle.png rename to src/mapmap/resources/images/shapes/add_circle.png diff --git a/resources/images/shapes/add_line.png b/src/mapmap/resources/images/shapes/add_line.png similarity index 100% rename from resources/images/shapes/add_line.png rename to src/mapmap/resources/images/shapes/add_line.png diff --git a/resources/images/shapes/add_quad.png b/src/mapmap/resources/images/shapes/add_quad.png similarity index 100% rename from resources/images/shapes/add_quad.png rename to src/mapmap/resources/images/shapes/add_quad.png diff --git a/resources/images/shapes/add_triangle.png b/src/mapmap/resources/images/shapes/add_triangle.png similarity index 100% rename from resources/images/shapes/add_triangle.png rename to src/mapmap/resources/images/shapes/add_triangle.png diff --git a/resources/images/shapes/mask.png b/src/mapmap/resources/images/shapes/mask.png similarity index 100% rename from resources/images/shapes/mask.png rename to src/mapmap/resources/images/shapes/mask.png diff --git a/resources/images/shapes/timeline.png b/src/mapmap/resources/images/shapes/timeline.png similarity index 100% rename from resources/images/shapes/timeline.png rename to src/mapmap/resources/images/shapes/timeline.png diff --git a/resources/images/shapes/warping.png b/src/mapmap/resources/images/shapes/warping.png similarity index 100% rename from resources/images/shapes/warping.png rename to src/mapmap/resources/images/shapes/warping.png diff --git a/resources/images/test-signal/examples/classic-test-card.png b/src/mapmap/resources/images/test-signal/examples/classic-test-card.png similarity index 100% rename from resources/images/test-signal/examples/classic-test-card.png rename to src/mapmap/resources/images/test-signal/examples/classic-test-card.png diff --git a/resources/images/test-signal/examples/ntsc-test-card.png b/src/mapmap/resources/images/test-signal/examples/ntsc-test-card.png similarity index 100% rename from resources/images/test-signal/examples/ntsc-test-card.png rename to src/mapmap/resources/images/test-signal/examples/ntsc-test-card.png diff --git a/resources/images/test-signal/examples/pal-test-card.png b/src/mapmap/resources/images/test-signal/examples/pal-test-card.png similarity index 100% rename from resources/images/test-signal/examples/pal-test-card.png rename to src/mapmap/resources/images/test-signal/examples/pal-test-card.png diff --git a/resources/images/test-signal/ntsc-test-signal.svg b/src/mapmap/resources/images/test-signal/ntsc-test-signal.svg similarity index 100% rename from resources/images/test-signal/ntsc-test-signal.svg rename to src/mapmap/resources/images/test-signal/ntsc-test-signal.svg diff --git a/resources/images/test-signal/pal-test-signal.svg b/src/mapmap/resources/images/test-signal/pal-test-signal.svg similarity index 100% rename from resources/images/test-signal/pal-test-signal.svg rename to src/mapmap/resources/images/test-signal/pal-test-signal.svg diff --git a/resources/images/test-signal/test-signal.svg b/src/mapmap/resources/images/test-signal/test-signal.svg similarity index 100% rename from resources/images/test-signal/test-signal.svg rename to src/mapmap/resources/images/test-signal/test-signal.svg diff --git a/resources/qss/mapmap.qss b/src/mapmap/resources/qss/mapmap.qss similarity index 100% rename from resources/qss/mapmap.qss rename to src/mapmap/resources/qss/mapmap.qss diff --git a/resources/texts/mapmap.desktop b/src/mapmap/resources/texts/mapmap.desktop similarity index 100% rename from resources/texts/mapmap.desktop rename to src/mapmap/resources/texts/mapmap.desktop diff --git a/resources/texts/mapmap.xml b/src/mapmap/resources/texts/mapmap.xml similarity index 100% rename from resources/texts/mapmap.xml rename to src/mapmap/resources/texts/mapmap.xml diff --git a/translations/mapmap_en.ts b/src/mapmap/translations/mapmap_en.ts similarity index 100% rename from translations/mapmap_en.ts rename to src/mapmap/translations/mapmap_en.ts diff --git a/translations/mapmap_fr.ts b/src/mapmap/translations/mapmap_fr.ts similarity index 100% rename from translations/mapmap_fr.ts rename to src/mapmap/translations/mapmap_fr.ts diff --git a/translations/translation.qrc b/src/mapmap/translations/translation.qrc similarity index 100% rename from translations/translation.qrc rename to src/mapmap/translations/translation.qrc diff --git a/src/tests/TestMaths.cpp b/src/tests/TestMaths.cpp new file mode 100644 index 0000000..a214eb0 --- /dev/null +++ b/src/tests/TestMaths.cpp @@ -0,0 +1,10 @@ +#include "TestMaths.h" + +void TestMaths::toUpper() +{ + QString str = "Hello"; + QCOMPARE(str.toUpper(), QString("HELLO")); +} + +QTEST_MAIN(TestMaths) + diff --git a/src/tests/TestMaths.h b/src/tests/TestMaths.h new file mode 100644 index 0000000..a04d597 --- /dev/null +++ b/src/tests/TestMaths.h @@ -0,0 +1,10 @@ +#include + +class TestMaths: public QObject +{ + Q_OBJECT + + private slots: + void toUpper(); +}; + diff --git a/src/tests/tests.pro b/src/tests/tests.pro new file mode 100644 index 0000000..b923a21 --- /dev/null +++ b/src/tests/tests.pro @@ -0,0 +1,16 @@ +QT += testlib +QT += core + +CONFIG += c++11 + +TARGET = TestMaths + +CONFIG += console +CONFIG += app_bundle + +SOURCES = TestMaths.cpp + +HEADERS = TestMaths.h + +INCLUDEPATH += $$PWD/../mapmap/ +