History

convert script engine variables from QSharedPointer to std::shared_ptr

Heather Anderson committed 5 years ago

Commit 70fbe761 parent 82535ca49 files · +194 −164Browse files

Showing the changes to libraries/script-engine/src/ScriptContext.h (1 of 49 files). Show all

Unified · Split

libraries/script-engine/src/ScriptContext.h+5−4
@@ -15,7 +15,8 @@ · 14 unmodified lines
15#ifndef hifi_ScriptContext_h15#ifndef hifi_ScriptContext_h
16#define hifi_ScriptContext_h16#define hifi_ScriptContext_h
17 17
18#include <QtCore/QSharedPointer>18#include <memory>
19
19#include <QtCore/QString>20#include <QtCore/QString>
20#include <QtCore/QStringList>21#include <QtCore/QStringList>
21 22
@@ -24,9 +25,9 @@ · 2 unmodified lines
24class ScriptContext;25class ScriptContext;
25class ScriptEngine;26class ScriptEngine;
26class ScriptFunctionContext;27class ScriptFunctionContext;
27using ScriptContextPointer = QSharedPointer<ScriptContext>;28using ScriptContextPointer = std::shared_ptr<ScriptContext>;
28using ScriptFunctionContextPointer = QSharedPointer<ScriptFunctionContext>;29using ScriptFunctionContextPointer = std::shared_ptr<ScriptFunctionContext>;
29using ScriptEnginePointer = QSharedPointer<ScriptEngine>;30using ScriptEnginePointer = std::shared_ptr<ScriptEngine>;
30 31
31/// [ScriptInterface] Provides an engine-independent interface for QScriptContextInfo32/// [ScriptInterface] Provides an engine-independent interface for QScriptContextInfo
32class ScriptFunctionContext {33class ScriptFunctionContext {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t