diff options
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_preview')
7 files changed, 43 insertions, 38 deletions
diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp index d983fdb1b5..5feaa17545 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmldebugtranslationservice.cpp @@ -374,7 +374,7 @@ void QQmlDebugTranslationServiceImpl::engineAboutToBeRemoved(QJSEngine *engine) void QQmlDebugTranslationServiceImpl::foundTranslationBinding(const TranslationBindingInformation &translationBindingInformation) { QObject *scopeObject = translationBindingInformation.scopeObject; - connect(scopeObject, &QObject::destroyed, [this, scopeObject] () { + connect(scopeObject, &QObject::destroyed, this, [this, scopeObject] () { this->d->objectTranslationBindingMultiMap.remove(scopeObject); }); diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp index c4b42ed1be..30d6a9db5b 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewblacklist.cpp @@ -138,8 +138,8 @@ void QQmlPreviewBlacklist::Node::remove(const QString &path, int offset) if (offset == path.size()) return; - auto it = m_next.find(path.at(offset)); - if (it != m_next.end()) + auto it = m_next.constFind(path.at(offset)); + if (it != m_next.cend()) (*it)->remove(path, ++offset); } diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp index fef0773613..f03de0aa08 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.cpp @@ -40,12 +40,11 @@ bool isRootPath(const QString &path) class QQmlPreviewFileEngineIterator : public QAbstractFileEngineIterator { public: - QQmlPreviewFileEngineIterator(QDir::Filters filters, const QStringList &filterNames, - const QStringList &m_entries); + QQmlPreviewFileEngineIterator(const QString &path, QDir::Filters filters, + const QStringList &filterNames, const QStringList &m_entries); ~QQmlPreviewFileEngineIterator(); - QString next() override; - bool hasNext() const override; + bool advance() override; QString currentFileName() const override; private: @@ -53,10 +52,11 @@ private: int m_index; }; -QQmlPreviewFileEngineIterator::QQmlPreviewFileEngineIterator(QDir::Filters filters, +QQmlPreviewFileEngineIterator::QQmlPreviewFileEngineIterator(const QString &path, + QDir::Filters filters, const QStringList &filterNames, const QStringList &entries) - : QAbstractFileEngineIterator(filters, filterNames), m_entries(entries), m_index(0) + : QAbstractFileEngineIterator(path, filters, filterNames), m_entries(entries), m_index(0) { } @@ -64,17 +64,13 @@ QQmlPreviewFileEngineIterator::~QQmlPreviewFileEngineIterator() { } -QString QQmlPreviewFileEngineIterator::next() +bool QQmlPreviewFileEngineIterator::advance() { - if (!hasNext()) - return QString(); - ++m_index; - return currentFilePath(); -} + if (m_index >= m_entries.size()) + return false; -bool QQmlPreviewFileEngineIterator::hasNext() const -{ - return m_index < m_entries.size(); + ++m_index; + return true; } QString QQmlPreviewFileEngineIterator::currentFileName() const @@ -215,14 +211,15 @@ uint QQmlPreviewFileEngine::ownerId(QAbstractFileEngine::FileOwner owner) const return m_fallback ? m_fallback->ownerId(owner) : static_cast<uint>(-2); } -QAbstractFileEngine::Iterator *QQmlPreviewFileEngine::beginEntryList(QDir::Filters filters, - const QStringList &filterNames) +QAbstractFileEngine::IteratorUniquePtr QQmlPreviewFileEngine::beginEntryList( + const QString &path, QDir::Filters filters, const QStringList &filterNames) { - return m_fallback ? m_fallback->beginEntryList(filters, filterNames) - : new QQmlPreviewFileEngineIterator(filters, filterNames, m_entries); + return m_fallback ? m_fallback->beginEntryList(path, filters, filterNames) + : std::make_unique<QQmlPreviewFileEngineIterator>( + path, filters, filterNames, m_entries); } -QAbstractFileEngine::Iterator *QQmlPreviewFileEngine::endEntryList() +QAbstractFileEngine::IteratorUniquePtr QQmlPreviewFileEngine::endEntryList() { return m_fallback ? m_fallback->endEntryList() : nullptr; } @@ -327,7 +324,7 @@ QString QQmlPreviewFileEngine::owner(FileOwner owner) const return m_fallback ? m_fallback->owner(owner) : QString(); } -QDateTime QQmlPreviewFileEngine::fileTime(FileTime time) const +QDateTime QQmlPreviewFileEngine::fileTime(QFile::FileTime time) const { // Files we replace are always newer than the ones we had before. This makes the QML engine // actually recompile them, rather than pick them from the cache. @@ -378,7 +375,7 @@ void QQmlPreviewFileEngine::load() const m_entries = m_loader->entries(); break; case QQmlPreviewFileLoader::Fallback: - m_fallback.reset(QAbstractFileEngine::create(m_name)); + m_fallback = QAbstractFileEngine::create(m_name); break; case QQmlPreviewFileLoader::Unknown: Q_UNREACHABLE(); @@ -391,7 +388,8 @@ QQmlPreviewFileEngineHandler::QQmlPreviewFileEngineHandler(QQmlPreviewFileLoader { } -QAbstractFileEngine *QQmlPreviewFileEngineHandler::create(const QString &fileName) const +std::unique_ptr<QAbstractFileEngine> QQmlPreviewFileEngineHandler::create( + const QString &fileName) const { // Don't load compiled QML/JS over the network if (fileName.endsWith(".qmlc") || fileName.endsWith(".jsc") || isRootPath(fileName)) { @@ -407,8 +405,10 @@ QAbstractFileEngine *QQmlPreviewFileEngineHandler::create(const QString &fileNam const QString absolute = relative.startsWith(':') ? relative : absolutePath(relative); - return m_loader->isBlacklisted(absolute) - ? nullptr : new QQmlPreviewFileEngine(relative, absolute, m_loader.data()); + if (m_loader->isBlacklisted(absolute)) + return {}; + + return std::make_unique<QQmlPreviewFileEngine>(relative, absolute, m_loader.data()); } QT_END_NAMESPACE diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.h b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.h index 3d256e80e2..1705e89b5d 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.h +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewfileengine.h @@ -17,10 +17,13 @@ #include "qqmlpreviewfileloader.h" +#include <QtCore/qpointer.h> #include <private/qabstractfileengine_p.h> #include <private/qfsfileengine_p.h> #include <QtCore/qbuffer.h> +#include <memory> + QT_BEGIN_NAMESPACE class QQmlPreviewFileEngine : public QAbstractFileEngine @@ -42,8 +45,9 @@ public: QString fileName(QAbstractFileEngine::FileName file) const override; uint ownerId(FileOwner) const override; - Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; - Iterator *endEntryList() override; + IteratorUniquePtr beginEntryList(const QString &path, QDir::Filters filters, + const QStringList &filterNames) override; + IteratorUniquePtr endEntryList() override; // Forwarding to fallback if exists bool flush() override; @@ -64,7 +68,7 @@ public: bool setPermissions(uint perms) override; QByteArray id() const override; QString owner(FileOwner) const override; - QDateTime fileTime(FileTime time) const override; + QDateTime fileTime(QFile::FileTime time) const override; int handle() const override; qint64 readLine(char *data, qint64 maxlen) override; qint64 write(const char *data, qint64 len) override; @@ -80,15 +84,16 @@ private: mutable QBuffer m_contents; mutable QStringList m_entries; - mutable QScopedPointer<QAbstractFileEngine> m_fallback; + mutable std::unique_ptr<QAbstractFileEngine> m_fallback; mutable QQmlPreviewFileLoader::Result m_result = QQmlPreviewFileLoader::Unknown; }; class QQmlPreviewFileEngineHandler : public QAbstractFileEngineHandler { + Q_DISABLE_COPY_MOVE(QQmlPreviewFileEngineHandler) public: QQmlPreviewFileEngineHandler(QQmlPreviewFileLoader *loader); - QAbstractFileEngine *create(const QString &fileName) const override; + std::unique_ptr<QAbstractFileEngine> create(const QString &fileName) const override; private: QPointer<QQmlPreviewFileLoader> m_loader; diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp index 7601c59cac..f32954ed34 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewhandler.cpp @@ -13,7 +13,7 @@ #include <QtQuick/qquickitem.h> #include <QtQml/qqmlcomponent.h> -#include <private/qquickpixmapcache_p.h> +#include <private/qquickpixmap_p.h> #include <private/qquickview_p.h> #include <private/qhighdpiscaling_p.h> @@ -23,7 +23,8 @@ struct QuitLockDisabler { const bool quitLockEnabled; - QuitLockDisabler() : quitLockEnabled(QCoreApplication::isQuitLockEnabled()) + Q_NODISCARD_CTOR QuitLockDisabler() + : quitLockEnabled(QCoreApplication::isQuitLockEnabled()) { QCoreApplication::setQuitLockEnabled(false); } diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp index cf20fc4768..48588c7973 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewposition.cpp @@ -56,14 +56,13 @@ QQmlPreviewPosition::QQmlPreviewPosition() { m_savePositionTimer.setSingleShot(true); m_savePositionTimer.setInterval(500); - QObject::connect(&m_savePositionTimer, &QTimer::timeout, [this]() { + QObject::connect(&m_savePositionTimer, &QTimer::timeout, &m_savePositionTimer, [this]() { saveWindowPosition(); }); } QQmlPreviewPosition::~QQmlPreviewPosition() { - saveWindowPosition(); } void QQmlPreviewPosition::takePosition(QWindow *window, InitializeState state) diff --git a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp index e1e98537da..336395b131 100644 --- a/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp +++ b/src/plugins/qmltooling/qmldbg_preview/qqmlpreviewservice.cpp @@ -10,7 +10,7 @@ #include <QtQuick/qquickitem.h> #include <QtGui/qguiapplication.h> -#include <private/qquickpixmapcache_p.h> +#include <private/qquickpixmap_p.h> #include <private/qqmldebugconnector_p.h> #include <private/qversionedpacket_p.h> |