From 0faed9dda40c5145dd239a2bcdcc07f665d19170 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 21 Mar 2023 15:07:09 +0100 Subject: [PATCH] QmlDesigner: Remove unused PuppetBuildProgressDialog Change-Id: Id2e9da8c4fea128105cefe37d3c99ca5537d3acf Reviewed-by: Qt CI Bot Reviewed-by: Thomas Hartmann Reviewed-by: Reviewed-by: Alessandro Portale --- src/plugins/qmldesigner/CMakeLists.txt | 7 -- .../instances/puppetbuildprogressdialog.cpp | 65 ---------------- .../instances/puppetbuildprogressdialog.h | 38 --------- .../instances/puppetbuildprogressdialog.ui | 78 ------------------- 4 files changed, 188 deletions(-) delete mode 100644 src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.cpp delete mode 100644 src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h delete mode 100644 src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.ui diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt index d436d10e0ef..74fcd863302 100644 --- a/src/plugins/qmldesigner/CMakeLists.txt +++ b/src/plugins/qmldesigner/CMakeLists.txt @@ -91,11 +91,6 @@ extend_qtc_library(QmlDesignerCore PUBLIC_DEPENDS rt ) -set(UI_FILES - ${CMAKE_CURRENT_LIST_DIR}/designercore/instances/puppetbuildprogressdialog.ui -) -qt_wrap_ui(UI_SOURCES ${UI_FILES}) - extend_qtc_library(QmlDesignerCore INCLUDES ${CMAKE_CURRENT_BINARY_DIR} SOURCES @@ -290,8 +285,6 @@ extend_qtc_library(QmlDesignerCore nodeinstanceserverproxy.cpp nodeinstanceserverproxy.h nodeinstanceview.cpp - puppetbuildprogressdialog.cpp - puppetbuildprogressdialog.h puppetstartdata.h puppetstarter.cpp puppetstarter.h diff --git a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.cpp b/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.cpp deleted file mode 100644 index 53489fa5b85..00000000000 --- a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.cpp +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#include "puppetbuildprogressdialog.h" -#include "ui_puppetbuildprogressdialog.h" - -#include -#include -#include - -namespace QmlDesigner { - -PuppetBuildProgressDialog::PuppetBuildProgressDialog() : - QDialog(Core::ICore::dialogParent()), - ui(new Ui::PuppetBuildProgressDialog), - m_lineCount(0), - m_useFallbackPuppet(false) -{ - setWindowFlags(Qt::SplashScreen); - setWindowModality(Qt::ApplicationModal); - ui->setupUi(this); - ui->buildProgressBar->setMaximum(85); - connect(ui->useFallbackPuppetPushButton, &QAbstractButton::clicked, this, &PuppetBuildProgressDialog::setUseFallbackPuppet); -} - -PuppetBuildProgressDialog::~PuppetBuildProgressDialog() -{ - delete ui; -} - -void PuppetBuildProgressDialog::setProgress(int progress) -{ - ui->buildProgressBar->setValue(progress); -} - -bool PuppetBuildProgressDialog::useFallbackPuppet() const -{ - return m_useFallbackPuppet; -} - -void PuppetBuildProgressDialog::setErrorOutputFile(const QString &filePath) -{ - ui->openErrorOutputFileLabel->setText(QString::fromLatin1("%2").arg( - filePath, ui->openErrorOutputFileLabel->text())); -} - -void PuppetBuildProgressDialog::setErrorMessage(const QString &message) -{ - ui->label->setText(QString::fromLatin1("%1").arg(message)); - ui->useFallbackPuppetPushButton->setText(tr("OK")); - connect(ui->useFallbackPuppetPushButton, &QAbstractButton::clicked, this, &QDialog::accept); -} - -void PuppetBuildProgressDialog::setUseFallbackPuppet() -{ - m_useFallbackPuppet = true; -} - -void PuppetBuildProgressDialog::newBuildOutput(const QByteArray &standardOutput) -{ - m_lineCount += standardOutput.count('\n'); - setProgress(m_lineCount); -} - -} diff --git a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h b/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h deleted file mode 100644 index c7db04eaeca..00000000000 --- a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2016 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -#pragma once - -#include - -namespace QmlDesigner { - -namespace Ui { -class PuppetBuildProgressDialog; -} - - -class PuppetBuildProgressDialog : public QDialog -{ - Q_OBJECT - -public: - explicit PuppetBuildProgressDialog(); - ~PuppetBuildProgressDialog() override; - - void setProgress(int progress); - void newBuildOutput(const QByteArray &standardOutput); - bool useFallbackPuppet() const; - void setErrorOutputFile(const QString &filePath); - void setErrorMessage(const QString &message); - -private: - void setUseFallbackPuppet(); - -private: - Ui::PuppetBuildProgressDialog *ui; - int m_lineCount; - bool m_useFallbackPuppet; -}; - -} diff --git a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.ui b/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.ui deleted file mode 100644 index 626eb6b5574..00000000000 --- a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.ui +++ /dev/null @@ -1,78 +0,0 @@ - - - QmlDesigner::PuppetBuildProgressDialog - - - - 0 - 0 - 695 - 99 - - - - Build Progress - - - true - - - - - - Building Adapter for the current Qt. Happens only once for every Qt installation. - - - - - - - 0 - - - - - - - - - Open error output file - - - true - - - Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Use Fallback QML Emulation Layer - - - false - - - - - - - - - -