From 80b3c9c35f72a7369a2a1dac9b56171cf86ec97c Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 13 Dec 2023 21:05:22 +0100 Subject: [PATCH] QmlDesignerPlugin: Make code less verbose Replace some emit helpers with direct emission. Change-Id: I832fc942234424f96da8516a18bd4b9e0c66c71a Reviewed-by: Tim Jenssen --- .../assetslibrary/assetslibrarywidget.cpp | 5 ++- src/plugins/qmldesigner/qmldesignerplugin.cpp | 34 +++---------------- src/plugins/qmldesigner/qmldesignerplugin.h | 4 --- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp index 5c6ebf07c5d..13178c6dd2e 100644 --- a/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/assetslibrary/assetslibrarywidget.cpp @@ -115,9 +115,8 @@ AssetsLibraryWidget::AssetsLibraryWidget(AsynchronousImageCache &asynchronousFon m_assetsWidget->setClearColor(Theme::getColor(Theme::Color::QmlDesigner_BackgroundColorDarkAlternate)); m_assetsWidget->engine()->addImageProvider("qmldesigner_assets", m_assetsIconProvider); - connect(m_assetsModel, &AssetsLibraryModel::fileChanged, [](const QString &changeFilePath) { - QmlDesignerPlugin::instance()->emitAssetChanged(changeFilePath); - }); + connect(m_assetsModel, &AssetsLibraryModel::fileChanged, + QmlDesignerPlugin::instance(), &QmlDesignerPlugin::assetChanged); auto layout = new QVBoxLayout(this); layout->setContentsMargins({}); diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 6e1aa10584f..93e698065c1 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -665,18 +665,12 @@ void QmlDesignerPlugin::enforceDelayedInitialize() DesignDocument *QmlDesignerPlugin::currentDesignDocument() const { - if (d) - return d->documentManager.currentDesignDocument(); - - return nullptr; + return d ? d->documentManager.currentDesignDocument() : nullptr; } Internal::DesignModeWidget *QmlDesignerPlugin::mainWidget() const { - if (d) - return &d->mainWidget; - - return nullptr; + return d ? &d->mainWidget : nullptr; } QWidget *QmlDesignerPlugin::createProjectExplorerWidget(QWidget *parent) const @@ -686,7 +680,7 @@ QWidget *QmlDesignerPlugin::createProjectExplorerWidget(QWidget *parent) const void QmlDesignerPlugin::switchToTextModeDeferred() { - QTimer::singleShot(0, this, [] () { + QTimer::singleShot(0, this, [] { Core::ModeManager::activateMode(Core::Constants::MODE_EDIT); }); } @@ -698,11 +692,6 @@ void QmlDesignerPlugin::emitCurrentTextEditorChanged(Core::IEditor *editor) d->blockEditorChange = false; } -void QmlDesignerPlugin::emitAssetChanged(const QString &assetPath) -{ - emit assetChanged(assetPath); -} - double QmlDesignerPlugin::formEditorDevicePixelRatio() { if (QmlDesignerPlugin::settings().value(DesignerSettingsKey::IGNORE_DEVICE_PIXEL_RATIO).toBool()) @@ -716,7 +705,7 @@ double QmlDesignerPlugin::formEditorDevicePixelRatio() void QmlDesignerPlugin::contextHelp(const Core::IContext::HelpCallback &callback, const QString &id) { - emitUsageStatisticsHelpRequested(id); + emitUsageStatistics(Constants::EVENT_HELP_REQUESTED + id); QmlDesignerPlugin::instance()->viewManager().qmlJSEditorContextHelp(callback); } @@ -732,7 +721,7 @@ void QmlDesignerPlugin::emitUsageStatistics(const QString &identifier) const int currentTime = privateInstance()->timer.elapsed(); const int currentDuration = (currentTime - activeData.time); if (currentDuration < activeData.maxDuration) - instance()->emitUsageStatisticsUsageDuration(activeData.newIdentifer, currentDuration); + emit instance()->usageStatisticsUsageDuration(activeData.newIdentifer, currentDuration); privateInstance()->m_activeTraceIdentifierDataHash.remove(identifier); } @@ -760,11 +749,6 @@ void QmlDesignerPlugin::emitUsageStatisticsContextAction(const QString &identifi emitUsageStatistics(Constants::EVENT_ACTION_EXECUTED + identifier); } -void QmlDesignerPlugin::emitUsageStatisticsHelpRequested(const QString &identifier) -{ - emitUsageStatistics(Constants::EVENT_HELP_REQUESTED + identifier); -} - AsynchronousImageCache &QmlDesignerPlugin::imageCache() { return m_instance->d->projectManager.asynchronousImageCache(); @@ -775,7 +759,6 @@ void QmlDesignerPlugin::registerPreviewImageProvider(QQmlEngine *engine) m_instance->d->projectManager.registerPreviewImageProvider(engine); } - bool isParent(QWidget *parent, QWidget *widget) { if (!widget) @@ -879,17 +862,10 @@ void QmlDesignerPlugin::closeFeedbackPopup() void QmlDesignerPlugin::emitUsageStatisticsTime(const QString &identifier, int elapsed) { - QTC_ASSERT(instance(), return); emit instance()->usageStatisticsUsageTimer(normalizeIdentifier(identifier), elapsed); } -void QmlDesignerPlugin::emitUsageStatisticsUsageDuration(const QString &identifier, int elapsed) -{ - QTC_ASSERT(instance(), return ); - emit instance()->usageStatisticsUsageDuration(identifier, elapsed); -} - QmlDesignerPlugin *QmlDesignerPlugin::instance() { return m_instance; diff --git a/src/plugins/qmldesigner/qmldesignerplugin.h b/src/plugins/qmldesigner/qmldesignerplugin.h index e9e8847fbe1..e18b502c584 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.h +++ b/src/plugins/qmldesigner/qmldesignerplugin.h @@ -66,17 +66,13 @@ public: void switchToTextModeDeferred(); void emitCurrentTextEditorChanged(Core::IEditor *editor); - void emitAssetChanged(const QString &assetPath); - static double formEditorDevicePixelRatio(); static void contextHelp(const Core::IContext::HelpCallback &callback, const QString &id); static void emitUsageStatistics(const QString &identifier); static void emitUsageStatisticsContextAction(const QString &identifier); - static void emitUsageStatisticsHelpRequested(const QString &identifier); static void emitUsageStatisticsTime(const QString &identifier, int elapsed); - static void emitUsageStatisticsUsageDuration(const QString &identifier, int elapsed); static AsynchronousImageCache &imageCache();