From d0852fb2a14a941d5f83d986fff891cd129d840f Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 16 Feb 2022 12:12:50 +0100 Subject: [PATCH] StudioWelcome: Remove unused code MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I380a35cb735669feeeac5d0293ed43c4d2ef7059 Reviewed-by: Reviewed-by: Qt CI Bot Reviewed-by: Henning Gründl --- src/plugins/studiowelcome/examplecheckout.cpp | 66 ------------------- src/plugins/studiowelcome/examplecheckout.h | 29 +------- .../studiowelcome/studiowelcomeplugin.cpp | 25 ------- 3 files changed, 1 insertion(+), 119 deletions(-) diff --git a/src/plugins/studiowelcome/examplecheckout.cpp b/src/plugins/studiowelcome/examplecheckout.cpp index b094fd2f08a..377d0f4cb7f 100644 --- a/src/plugins/studiowelcome/examplecheckout.cpp +++ b/src/plugins/studiowelcome/examplecheckout.cpp @@ -47,11 +47,8 @@ using namespace Utils; -ExampleCheckout::ExampleCheckout(QObject *) {} - void ExampleCheckout::registerTypes() { - FileDownloader::registerQmlType(); static bool once = []() { FileDownloader::registerQmlType(); FileExtractor::registerQmlType(); @@ -61,69 +58,6 @@ void ExampleCheckout::registerTypes() QTC_ASSERT(once, ;); } -void ExampleCheckout::checkoutExample(const QUrl &url, const QString &tempFile, const QString &completeBaseFileName) -{ - registerTypes(); - - m_dialog.reset(new QDialog(Core::ICore::dialogParent())); - m_dialog->setModal(true); - m_dialog->setFixedSize(620, 300); - QHBoxLayout *layout = new QHBoxLayout(m_dialog.get()); - layout->setContentsMargins(2, 2, 2, 2); - - auto widget = new QQuickWidget(m_dialog.get()); - - layout->addWidget(widget); - widget->engine()->addImportPath("qrc:/studiofonts"); - - widget->engine()->addImportPath( - Core::ICore::resourcePath("/qmldesigner/propertyEditorQmlSources/imports").toString()); - - widget->setSource(QUrl("qrc:/qml/downloaddialog/main.qml")); - - m_dialog->setWindowFlag(Qt::Tool, true); - widget->setResizeMode(QQuickWidget::SizeRootObjectToView); - - rootObject = widget->rootObject(); - - QTC_ASSERT(rootObject, qWarning() << "QML error"; return ); - - rootObject->setProperty("url", url); - rootObject->setProperty("tempFile", tempFile); - rootObject->setProperty("completeBaseName", completeBaseFileName); - - m_dialog->show(); - - rootObject = widget->rootObject(); - - connect(rootObject, SIGNAL(canceled()), this, SLOT(handleCancel())); - connect(rootObject, SIGNAL(accepted()), this, SLOT(handleAccepted())); -} - -QString ExampleCheckout::extractionFolder() const -{ - return m_extrationFolder; -} - -ExampleCheckout::~ExampleCheckout() {} - -void ExampleCheckout::handleCancel() -{ - m_dialog->close(); - m_dialog.release()->deleteLater(); - deleteLater(); -} - -void ExampleCheckout::handleAccepted() -{ - QQmlProperty property(rootObject, "path"); - m_extrationFolder = property.read().toString(); - m_dialog->close(); - emit finishedSucessfully(); - m_dialog.release()->deleteLater(); - deleteLater(); -} - void FileDownloader::registerQmlType() { qmlRegisterType("ExampleCheckout", 1, 0, "FileDownloader"); diff --git a/src/plugins/studiowelcome/examplecheckout.h b/src/plugins/studiowelcome/examplecheckout.h index 4e256994377..af2be4893ec 100644 --- a/src/plugins/studiowelcome/examplecheckout.h +++ b/src/plugins/studiowelcome/examplecheckout.h @@ -33,36 +33,9 @@ #include -QT_BEGIN_NAMESPACE -class QDialog; -QT_END_NAMESPACE - -class ExampleCheckout : public QObject +struct ExampleCheckout { - Q_OBJECT -public: - explicit ExampleCheckout(QObject *parent = nullptr); - - Q_INVOKABLE void checkoutExample(const QUrl &url, const QString &tempFile, const QString &completeBaseFileName); - - QString extractionFolder() const; - - ~ExampleCheckout(); - static void registerTypes(); - -public slots: - void handleCancel(); - void handleAccepted(); - -signals: - void finishedSucessfully(); - void progressChanged(int); - -private: - std::unique_ptr m_dialog; - QObject *rootObject = nullptr; - QString m_extrationFolder; }; class FileExtractor : public QObject diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index 0e4e1996fb6..9b20e013162 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -271,31 +271,6 @@ public: const QString &tempFile, const QString &completeBaseName) { - if (!url.isEmpty()) { - ExampleCheckout *checkout = new ExampleCheckout; - checkout->checkoutExample(QUrl::fromUserInput(url), tempFile, completeBaseName); - connect(checkout, - &ExampleCheckout::finishedSucessfully, - this, - [checkout, formFile, example, explicitQmlproject]() { - const QString exampleFolder = checkout->extractionFolder() + "/" + example - + "/"; - - QString projectFile = exampleFolder + example + ".qmlproject"; - - if (!explicitQmlproject.isEmpty()) - projectFile = exampleFolder + explicitQmlproject; - - ProjectExplorer::ProjectExplorerPlugin::openProjectWelcomePage(projectFile); - - const QString qmlFile = QFileInfo(projectFile).dir().absolutePath() + "/" - + formFile; - - Core::EditorManager::openEditor(Utils::FilePath::fromString(qmlFile)); - }); - return; - } - const Utils::FilePath projectFile = Core::ICore::resourcePath("examples") / example / example + ".qmlproject"; ProjectExplorer::ProjectExplorerPlugin::openProjectWelcomePage(projectFile.toString());