Ignore mocs, obj and qrc directory (reverted from commit 58ae7b474d)

.gitignore

@@ -51,9 +51,6 @@ moc_*.cpp
 prototypes/gst/
 qrc_*.cpp
 *.moc
-src/*/mocs/
-src/*/objs/
-src/*/qrc/
 
 # Folders not to be included
 html/

resources/interface.qrc

@@ -1,51 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file alias="new">images/icons/newdoc_w.png</file>
-        <file alias="open">images/icons/open_w.png</file>
-        <file alias="save">images/icons/save_w.png</file>
-        <file alias="save-as">images/icons/save_w.png</file>
-        <file alias="fullscreen">images/icons/fullscreen_w.png</file>
-        <file alias="output-window">images/icons/nofullscreen_w.png</file>
-        <file alias="control-points">images/icons/ctrl2_w.png</file>
-        <file alias="toggle-test-signal">images/icons/test_signal_w.png</file>
-        <file alias="add-video">images/icons/add_movie_w.png</file>
-        <file alias="add-image">images/icons/add_img_w.png</file>
-        <file alias="add-color">images/icons/add_paint_w.png</file>
-        <file alias="add-mesh">images/shapes/add_quad.png</file>
-        <file alias="add-triangle">images/shapes/add_triangle.png</file>
-        <file alias="add-ellipse">images/shapes/add_circle.png</file>
-        <file alias="play">images/icons/play_w.png</file>
-        <file alias="pause">images/icons/pause_w.png</file>
-        <file alias="rewind">images/icons/rewind_w.png</file>
-        <file alias="shape-mesh">images/shapes/add_quad.png</file>
-        <file alias="shape-triangle">images/shapes/add_triangle.png</file>
-        <file alias="shape-ellipse">images/shapes/add_circle.png</file>
-        <file alias="shape-polygon">images/shapes/add_circle.png</file>
-        <file alias="mapmap-title">images/logo/logomapmap.png</file>
-        <file alias="mapmap-title-light">images/logo/logomapmap-light.png</file>
-        <file alias="mapmap-logo">images/logo/mapmap-logo.png</file>
-        <file alias="mapmap-splash">images/logo/splash.png</file>
-        <file alias="logo-title">fonts/DroidSans.otf</file>
-        <file alias="base-font">fonts/DroidSans.otf</file>
-        <file alias="test-signal">images/test-signal/test-signal.svg</file>
-        <file alias="reset-zoom">images/icons/zoom_reset_w.png</file>
-        <file alias="zoom-in">images/icons/zoom_in_w.png</file>
-        <file alias="zoom-out">images/icons/zoom_out_w.png</file>
-        <file alias="zoom-fit">images/icons/zoom_fit_w.png</file>
-        <file alias="delete-mapping">images/icons/small/delete_w.png</file>
-        <file alias="lock-mapping">images/icons/small/lock_w.png</file>
-        <file alias="visible-mapping">images/icons/small/visible_w.png</file>
-        <file alias="duplicate-mapping">images/icons/small/duplicate_w.png</file>
-        <file alias="solo-mapping">images/icons/small/solo.png</file>
-        <file alias="stylesheet">qss/mapmap.qss</file>
-        <file alias="console-font">fonts/Hack-Regular.otf</file>
-        <file alias="preferences">images/menu/preferences.png</file>
-        <file alias="pal-test-card">images/test-signal/pal-test-signal.svg</file>
-        <file alias="classic-test">images/test-signal/examples/classic-test-card.png</file>
-        <file alias="pal-test">images/test-signal/examples/pal-test-card.png</file>
-        <file alias="ntsc-test">images/test-signal/examples/ntsc-test-card.png</file>
-        <file>images/checkbox/checkbox-unchecked.png</file>
-        <file alias="ntsc-test-card">images/test-signal/ntsc-test-signal.svg</file>
-        <file alias="mapmap-logo-with-border">images/logo/mapmap-wide-with-border.svg</file>
-    </qresource>
-</RCC>

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

src/app/app.pri

@@ -1,11 +0,0 @@
-
-include(../src.pri)
-
-HEADERS += $$PWD/MainApplication.h
-
-SOURCES += $$PWD/MainApplication.cpp \
-    $$PWD/main.cpp
-
-MOC_DIR = $$PWD/mocs
-OBJECTS_DIR = $$PWD/objs
-RCC_DIR = $$PWD/qrc

src/control/control.pri

@@ -1,9 +0,0 @@
-
-include(../src.pri)
-
-HEADERS += $$PWD/ConcurrentQueue.h \
-    $$PWD/OscInterface.h \
-    $$PWD/OscReceiver.h
-
-SOURCES += $$PWD/OscInterface.cpp \
-    $$PWD/OscReceiver.cpp

src/core/core.pri

@@ -1,39 +0,0 @@
-
-include(../src.pri)
-
-HEADERS += $$PWD/Commands.h \
-    $$PWD/Element.h \
-    $$PWD/Mapping.h \
-    $$PWD/MappingManager.h \
-    $$PWD/Maths.h \
-    $$PWD/MetaObjectRegistry.h \
-    $$PWD/MM.h \
-    $$PWD/Paint.h \
-    $$PWD/ProjectLabels.h \
-    $$PWD/ProjectReader.h \
-    $$PWD/ProjectWriter.h \
-    $$PWD/Serializable.h \
-    $$PWD/UidAllocator.h \
-    $$PWD/VideoImpl.h \
-    $$PWD/VideoShmSrcImpl.h \
-    $$PWD/VideoUriDecodeBinImpl.h \
-    $$PWD/VideoV4l2SrcImpl.h \
-    $$PWD/Util.h
-
-SOURCES += $$PWD/Commands.cpp \
-    $$PWD/Element.cpp \
-    $$PWD/Mapping.cpp \
-    $$PWD/MappingManager.cpp \
-    $$PWD/MetaObjectRegistry.cpp \
-    $$PWD/MM.cpp \
-    $$PWD/Paint.cpp \
-    $$PWD/ProjectLabels.cpp \
-    $$PWD/ProjectReader.cpp \
-    $$PWD/ProjectWriter.cpp \
-    $$PWD/Serializable.cpp \
-    $$PWD/UidAllocator.cpp \
-    $$PWD/VideoImpl.cpp \
-    $$PWD/VideoShmSrcImpl.cpp \
-    $$PWD/VideoUriDecodeBinImpl.cpp \
-    $$PWD/VideoV4l2SrcImpl.cpp \
-    $$PWD/Util.cpp

src/gui/gui.pri

@@ -1,36 +0,0 @@
-
-include(../src.pri)
-
-include(contrib/qtpropertybrowser/src/qtpropertybrowser.pri)
-include(contrib/qtpropertybrowser-extension/qtpropertybrowser-extension.pri)
-
-HEADERS += $$PWD/AboutDialog.h \
-    $$PWD/ConsoleWindow.h \
-    $$PWD/GuiForward.h \
-    $$PWD/MainWindow.h \
-    $$PWD/MapperGLCanvas.h \
-    $$PWD/MapperGLCanvasToolbar.h \
-    $$PWD/MappingGui.h \
-    $$PWD/MappingItemDelegate.h \
-    $$PWD/MappingListModel.h \
-    $$PWD/OutputGLCanvas.h \
-    $$PWD/OutputGLWindow.h \
-    $$PWD/PaintGui.h \
-    $$PWD/PreferenceDialog.h \
-    $$PWD/ShapeControlPainter.h \
-    $$PWD/ShapeGraphicsItem.h
-
-SOURCES += $$PWD/AboutDialog.cpp \
-    $$PWD/ConsoleWindow.cpp \
-    $$PWD/MainWindow.cpp \
-    $$PWD/MapperGLCanvas.cpp \
-    $$PWD/MapperGLCanvasToolbar.cpp \
-    $$PWD/MappingGui.cpp \
-    $$PWD/MappingItemDelegate.cpp \
-    $$PWD/MappingListModel.cpp \
-    $$PWD/OutputGLCanvas.cpp \
-    $$PWD/OutputGLWindow.cpp \
-    $$PWD/PaintGui.cpp \
-    $$PWD/PreferenceDialog.cpp \
-    $$PWD/ShapeControlPainter.cpp \
-    $$PWD/ShapeGraphicsItem.cpp

src/mapmap/ConcurrentQueue.h

@@ -31,6 +31,7 @@
 #include <queue>
 #include <QMutex>
 #include <QWaitCondition>
+#include "MM.h"
 
 namespace mmp {
 

src/mapmap/Mapping.cpp

@@ -92,7 +92,7 @@ void Mapping::read(const QDomElement& obj)
 
   // Read paint.
   int paintId = obj.attribute("paintId").toInt();
-//  setPaint(MainWindow::window()->getMappingManager().getPaintById(paintId));
+  setPaint(MainWindow::window()->getMappingManager().getPaintById(paintId));
 
   // Read output shape.
   _readShape(obj, true);