BlueBrain · dnachbaur · Feb 6, 2018 · Feb 5, 2018
diff --git a/CMake/common b/CMake/common
diff --git a/deflect/qt/CMakeLists.txt b/deflect/qt/CMakeLists.txt
@@ -5,7 +5,6 @@
 
 set(DEFLECTQT_HEADERS
   EventReceiver.h
-  helpers.h
   QmlGestures.h
   QmlStreamerImpl.h
 )

diff --git a/deflect/qt/QmlStreamerImpl.cpp b/deflect/qt/QmlStreamerImpl.cpp
@@ -43,7 +43,6 @@
 #include "EventReceiver.h"
 #include "QmlGestures.h"
 #include "TouchInjector.h"
-#include "helpers.h"
 
 #include <QCoreApplication>
 #include <QQmlContext>
@@ -70,7 +69,7 @@ namespace qt
 {
 QmlStreamer::Impl::Impl(const QString& qmlFile, const std::string& streamHost,
                         const std::string& streamId)
-    : _quickView{new OffscreenQuickView{make_unique<QQuickRenderControl>(),
+    : _quickView{new OffscreenQuickView{std::make_unique<QQuickRenderControl>(),
                                         renderMode}}
     , _qmlGestures{new QmlGestures}
     , _touchInjector{TouchInjector::create(*_quickView)}

diff --git a/deflect/qt/TouchInjector.cpp b/deflect/qt/TouchInjector.cpp
@@ -39,8 +39,6 @@
 
 #include "TouchInjector.h"
 
-#include "helpers.h"
-
 #include <QCoreApplication>
 #include <QWindow>
 
@@ -61,7 +59,7 @@ std::unique_ptr<TouchInjector> TouchInjector::create(QWindow& window)
         return QPointF{normPos.x() * window.width(),
                        normPos.y() * window.height()};
     };
-    return make_unique<TouchInjector>(window, mapFunc);
+    return std::make_unique<TouchInjector>(window, mapFunc);
 }
 
 void TouchInjector::addTouchPoint(const int id, const QPointF position)

diff --git a/deflect/qt/helpers.h b/deflect/qt/helpers.h
+37 −2		CHANGES.md
+1 −1		ChoosePython.cmake
+2 −6		Common.cmake
+1 −1		CommonCPPCTest.cmake
+5 −7		CommonCPack.cmake
+44 −0		CommonCPackUtils.cmake
+11 −22		CommonCompiler.cmake
+21 −4		CommonFindPackage.cmake
+117 −51		CommonGraph.cmake
+30 −0		CommonInstallProject.cmake
+5 −3		CommonPythonCTest.cmake
+2 −1		DoxygenRule.cmake
+2 −2		FindFFMPEG.cmake
+4 −2		FindLibJpegTurbo.cmake
+6 −124		GitExternal.cmake
+3 −1		GitInfo.cmake
+8 −26		README.md
+36 −33		SubProject.cmake
+2 −7		cpp/version.cpp
+8 −0		cpp/version.h
+1 −1		ittnotify.h
+3 −3		util/cpplint.py
+1 −1		util/git_pre-commit.in