Skip to content

Commit 600fed6

Browse files
committed
Move to C++14
1 parent 54c6e95 commit 600fed6

File tree

5 files changed

+3
-67
lines changed

5 files changed

+3
-67
lines changed

deflect/qt/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
set(DEFLECTQT_HEADERS
77
EventReceiver.h
8-
helpers.h
98
QmlGestures.h
109
QmlStreamerImpl.h
1110
)

deflect/qt/QmlStreamerImpl.cpp

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
#include "EventReceiver.h"
4444
#include "QmlGestures.h"
4545
#include "TouchInjector.h"
46-
#include "helpers.h"
4746

4847
#include <QCoreApplication>
4948
#include <QQmlContext>
@@ -70,7 +69,7 @@ namespace qt
7069
{
7170
QmlStreamer::Impl::Impl(const QString& qmlFile, const std::string& streamHost,
7271
const std::string& streamId)
73-
: _quickView{new OffscreenQuickView{make_unique<QQuickRenderControl>(),
72+
: _quickView{new OffscreenQuickView{std::make_unique<QQuickRenderControl>(),
7473
renderMode}}
7574
, _qmlGestures{new QmlGestures}
7675
, _touchInjector{TouchInjector::create(*_quickView)}

deflect/qt/TouchInjector.cpp

+1-3
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939

4040
#include "TouchInjector.h"
4141

42-
#include "helpers.h"
43-
4442
#include <QCoreApplication>
4543
#include <QWindow>
4644

@@ -61,7 +59,7 @@ std::unique_ptr<TouchInjector> TouchInjector::create(QWindow& window)
6159
return QPointF{normPos.x() * window.width(),
6260
normPos.y() * window.height()};
6361
};
64-
return make_unique<TouchInjector>(window, mapFunc);
62+
return std::make_unique<TouchInjector>(window, mapFunc);
6563
}
6664

6765
void TouchInjector::addTouchPoint(const int id, const QPointF position)

deflect/qt/helpers.h

-60
This file was deleted.

0 commit comments

Comments
 (0)