Move to C++14

BlueBrain · Feb 6, 2018 · 600fed6 · 600fed6
1 parent 54c6e95
commit 600fed6
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 67 deletions.
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