resolve conflicts and cleanup

SamGondelman committed 9 years ago

Commit 76869482 parents fb96996 58172cf31 files · +446 −239Browse files

Showing the changes to interface/src/raypick/LaserPointerScriptingInterface.cpp (1 of 31 files). Show all

Unified · Split

interface/src/raypick/LaserPointerScriptingInterface.cpp+1−5

@@ -11,12 +11,8 @@ · 10 unmodified lines
11		11
12	#include "LaserPointerScriptingInterface.h"	12	#include "LaserPointerScriptingInterface.h"
13		13
14	#include <QtCore/QVariant>	14	#include "RegisteredMetaTypes.h"
15
16	#include <GLMHelpers.h>
17
18	#include "PointerScriptingInterface.h"	15	#include "PointerScriptingInterface.h"
19	#include "Application.h"
20		16
21	void LaserPointerScriptingInterface::setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreItems) const {	17	void LaserPointerScriptingInterface::setIgnoreItems(const QUuid& uid, const QScriptValue& ignoreItems) const {
22	DependencyManager::get<PointerManager>()->setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems));	18	DependencyManager::get<PointerManager>()->setIgnoreItems(uid, qVectorQUuidFromScriptValue(ignoreItems));