diff options
Diffstat (limited to 'src/qml/qml/qqmltypeloader_p.h')
-rw-r--r-- | src/qml/qml/qqmltypeloader_p.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/qml/qml/qqmltypeloader_p.h b/src/qml/qml/qqmltypeloader_p.h index 53cf4234e1..b1d6451974 100644 --- a/src/qml/qml/qqmltypeloader_p.h +++ b/src/qml/qml/qqmltypeloader_p.h @@ -243,8 +243,8 @@ public: virtual void scriptImported(QQmlScriptBlob *, const QV4::CompiledData::Location &, const QString &, const QString &) {} - virtual void dependencyError(QQmlDataBlob *); - virtual void dependencyComplete(QQmlDataBlob *); + void dependencyError(QQmlDataBlob *) override; + void dependencyComplete(QQmlDataBlob *) override; protected: virtual QString stringAt(int) const { return QString(); } @@ -287,7 +287,7 @@ public: QQmlTypeLoader(QQmlEngine *); ~QQmlTypeLoader(); - QQmlImportDatabase *importDatabase(); + QQmlImportDatabase *importDatabase() const; QQmlTypeData *getType(const QUrl &url, Mode mode = PreferSynchronous); QQmlTypeData *getType(const QByteArray &, const QUrl &url, Mode mode = PreferSynchronous); @@ -434,14 +434,14 @@ public: void unregisterCallback(TypeDataCallback *); protected: - virtual void done(); - virtual void completed(); - virtual void dataReceived(const Data &); - virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit); - virtual void allDependenciesDone(); - virtual void downloadProgressChanged(qreal); + void done() override; + void completed() override; + void dataReceived(const Data &) override; + void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override; + void allDependenciesDone() override; + void downloadProgressChanged(qreal) override; - virtual QString stringAt(int index) const; + QString stringAt(int index) const override; private: bool tryLoadFromDiskCache(); @@ -458,7 +458,7 @@ private: const QV4::CompiledData::ResolvedTypeReferenceMap &resolvedTypeCache); bool resolveType(const QString &typeName, int &majorVersion, int &minorVersion, TypeReference &ref); - virtual void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace); + void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace) override; qint64 m_sourceTimeStamp = 0; @@ -510,7 +510,7 @@ public: QV4::ReturnedValue scriptValueForContext(QQmlContextData *parentCtxt); protected: - virtual void clear(); // From QQmlCleanup + void clear() override; // From QQmlCleanup private: friend class QQmlScriptBlob; @@ -546,14 +546,14 @@ public: QQmlScriptData *scriptData() const; protected: - virtual void dataReceived(const Data &); - virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit); - virtual void done(); + void dataReceived(const Data &) override; + void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit *unit) override; + void done() override; - virtual QString stringAt(int index) const; + QString stringAt(int index) const override; private: - virtual void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace); + void scriptImported(QQmlScriptBlob *blob, const QV4::CompiledData::Location &location, const QString &qualifier, const QString &nameSpace) override; void initializeFromCompilationUnit(QV4::CompiledData::CompilationUnit *unit); QList<ScriptReference> m_scripts; @@ -577,8 +577,8 @@ public: void setPriority(int); protected: - virtual void dataReceived(const Data &); - virtual void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*); + void dataReceived(const Data &) override; + void initializeFromCachedUnit(const QQmlPrivate::CachedQmlUnit*) override; private: QString m_content; |