summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2021-03-05 16:12:19 +0100
committerUlf Hermann <ulf.hermann@qt.io>2021-03-05 22:02:51 +0100
commit63735fb1b1169fb1538104b0017645c009772ecc (patch)
tree9803800b956774ee43034dc5e94653162e547efd
parenta3c2852720f048ef228f8e76f6bda36118ec14db (diff)
Inline most of QQmlTypeLoaderQmldirContent
Those are all one-liners. Change-Id: Ib7a14716e50b3350a5704d282e0a89d9147f3270 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
-rw-r--r--src/qml/qml/qqmltypeloaderqmldircontent.cpp49
-rw-r--r--src/qml/qml/qqmltypeloaderqmldircontent_p.h20
2 files changed, 10 insertions, 59 deletions
diff --git a/src/qml/qml/qqmltypeloaderqmldircontent.cpp b/src/qml/qml/qqmltypeloaderqmldircontent.cpp
index ca9f5fc80d..6365d0900c 100644
--- a/src/qml/qml/qqmltypeloaderqmldircontent.cpp
+++ b/src/qml/qml/qqmltypeloaderqmldircontent.cpp
@@ -43,15 +43,6 @@
QT_BEGIN_NAMESPACE
-QQmlTypeLoaderQmldirContent::QQmlTypeLoaderQmldirContent()
-{
-}
-
-bool QQmlTypeLoaderQmldirContent::hasError() const
-{
- return m_parser.hasError();
-}
-
QList<QQmlError> QQmlTypeLoaderQmldirContent::errors(const QString &uri) const
{
QList<QQmlError> errors;
@@ -68,11 +59,6 @@ QList<QQmlError> QQmlTypeLoaderQmldirContent::errors(const QString &uri) const
return errors;
}
-QString QQmlTypeLoaderQmldirContent::typeNamespace() const
-{
- return m_parser.typeNamespace();
-}
-
void QQmlTypeLoaderQmldirContent::setContent(const QString &location, const QString &content)
{
Q_ASSERT(!m_hasContent);
@@ -90,39 +76,4 @@ void QQmlTypeLoaderQmldirContent::setError(const QQmlError &error)
m_parser.setError(parseError);
}
-QQmlDirComponents QQmlTypeLoaderQmldirContent::components() const
-{
- return m_parser.components();
-}
-
-QQmlDirScripts QQmlTypeLoaderQmldirContent::scripts() const
-{
- return m_parser.scripts();
-}
-
-QQmlDirPlugins QQmlTypeLoaderQmldirContent::plugins() const
-{
- return m_parser.plugins();
-}
-
-QQmlDirImports QQmlTypeLoaderQmldirContent::imports() const
-{
- return m_parser.imports();
-}
-
-QString QQmlTypeLoaderQmldirContent::qmldirLocation() const
-{
- return m_location;
-}
-
-QString QQmlTypeLoaderQmldirContent::preferredPath() const
-{
- return m_parser.preferredPath();
-}
-
-bool QQmlTypeLoaderQmldirContent::designerSupported() const
-{
- return m_parser.designerSupported();
-}
-
QT_END_NAMESPACE
diff --git a/src/qml/qml/qqmltypeloaderqmldircontent_p.h b/src/qml/qml/qqmltypeloaderqmldircontent_p.h
index 11f98b5c63..55cd846925 100644
--- a/src/qml/qml/qqmltypeloaderqmldircontent_p.h
+++ b/src/qml/qml/qqmltypeloaderqmldircontent_p.h
@@ -65,25 +65,25 @@ private:
void setError(const QQmlError &);
public:
- QQmlTypeLoaderQmldirContent();
+ QQmlTypeLoaderQmldirContent() = default;
QQmlTypeLoaderQmldirContent(const QQmlTypeLoaderQmldirContent &) = default;
QQmlTypeLoaderQmldirContent &operator=(const QQmlTypeLoaderQmldirContent &) = default;
bool hasContent() const { return m_hasContent; }
- bool hasError() const;
+ bool hasError() const { return m_parser.hasError(); }
QList<QQmlError> errors(const QString &uri) const;
- QString typeNamespace() const;
+ QString typeNamespace() const { return m_parser.typeNamespace(); }
- QQmlDirComponents components() const;
- QQmlDirScripts scripts() const;
- QQmlDirPlugins plugins() const;
- QQmlDirImports imports() const;
+ QQmlDirComponents components() const { return m_parser.components(); }
+ QQmlDirScripts scripts() const { return m_parser.scripts(); }
+ QQmlDirPlugins plugins() const { return m_parser.plugins(); }
+ QQmlDirImports imports() const { return m_parser.imports(); }
- QString qmldirLocation() const;
- QString preferredPath() const;
+ QString qmldirLocation() const { return m_location; }
+ QString preferredPath() const { return m_parser.preferredPath(); }
- bool designerSupported() const;
+ bool designerSupported() const { return m_parser.designerSupported(); }
private:
QQmlDirParser m_parser;