History

Fixes to most scripting-related warnings

ksuprynowicz committed 4 years ago

Commit 6f321731 parent a14c64435 files · +195 −149Browse files

Showing the changes to libraries/script-engine/src/qtscript/ScriptObjectQtProxy.h (1 of 35 files). Show all

Unified · Split

libraries/script-engine/src/qtscript/ScriptObjectQtProxy.h+3−3
@@ -63,7 +63,7 @@ private: // implementation · 62 unmodified lines
6363
6464 public: // construction
6565 inline ScriptObjectQtProxy(ScriptEngineQtScript* engine, QObject* object, bool ownsObject, const ScriptEngine::QObjectWrapOptions& options) :
66− QScriptClass(engine), _engine(engine), _object(object), _wrapOptions(options), _ownsObject(ownsObject) {
66+ QScriptClass(engine), _engine(engine), _wrapOptions(options), _ownsObject(ownsObject), _object(object) {
6767 investigate();
6868 }
6969 virtual ~ScriptObjectQtProxy();
@@ -144,7 +144,7 @@ public: // construction · 74 unmodified lines
144144 inline ScriptMethodQtProxy(ScriptEngineQtScript* engine, QObject* object, QScriptValue lifetime,
145145 const QList<QMetaMethod>& metas, int numMaxParms) :
146146 QScriptClass(engine),
147− _engine(engine), _object(object), _objectLifetime(lifetime), _metas(metas), _numMaxParms(numMaxParms) {}
147+ _numMaxParms(numMaxParms), _engine(engine), _object(object), _objectLifetime(lifetime), _metas(metas) {}
148148
149149 public: // QScriptClass implementation
150150 virtual QString name() const override { return fullName(); }
@@ -187,7 +187,7 @@ public: // construction · 36 unmodified lines
187187 _engine(engine), _object(object), _objectLifetime(lifetime), _meta(meta), _metaCallId(discoverMetaCallIdx()) {}
188188
189189 private: // implementation
190− virtual int qt_metacall(QMetaObject::Call call, int id, void** arguments);
190+ virtual int qt_metacall(QMetaObject::Call call, int id, void** arguments) override;
191191 int discoverMetaCallIdx();
192192 ConnectionList::iterator findConnection(QScriptValue thisObject, QScriptValue callback);
193193 QString fullName() const;

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