History

add -Wsuggest-override to compile flags and deal with fallout

Seth Alves committed 10 years ago

Commit 87dbfa71 parent 89df576122 files · +768 −732Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.h+4−3
@@ -138,7 +138,8 @@ public: · 137 unmodified lines
138 static void loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload);138 static void loadEntityScript(QWeakPointer<ScriptEngine> theEngine, const EntityItemID& entityID, const QString& entityScript, bool forceRedownload);
139 Q_INVOKABLE void unloadEntityScript(const EntityItemID& entityID); // will call unload method139 Q_INVOKABLE void unloadEntityScript(const EntityItemID& entityID); // will call unload method
140 Q_INVOKABLE void unloadAllEntityScripts();140 Q_INVOKABLE void unloadAllEntityScripts();
141 Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const QStringList& params = QStringList());141 Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName,
142 const QStringList& params = QStringList()) override;
142 Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const MouseEvent& event);143 Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const MouseEvent& event);
143 Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const EntityItemID& otherID, const Collision& collision);144 Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const EntityItemID& otherID, const Collision& collision);
144 145
@@ -157,8 +158,8 @@ public: · 12 unmodified lines
157 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////158 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
158 // NOTE - These are the callback implementations for ScriptUser the get called by ScriptCache when the contents159 // NOTE - These are the callback implementations for ScriptUser the get called by ScriptCache when the contents
159 // of a script are available.160 // of a script are available.
160 virtual void scriptContentsAvailable(const QUrl& url, const QString& scriptContents);161 virtual void scriptContentsAvailable(const QUrl& url, const QString& scriptContents) override;
161 virtual void errorInLoadingScript(const QUrl& url);162 virtual void errorInLoadingScript(const QUrl& url) override;
162 163
163 // These are currently used by Application to track if a script is user loaded or not. Consider finding a solution164 // These are currently used by Application to track if a script is user loaded or not. Consider finding a solution
164 // inside of Application so that the ScriptEngine class is not polluted by this notion165 // inside of Application so that the ScriptEngine class is not polluted by this notion