From cef21f46e8d41d7b9652dd75760477bc8ef83661 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 27 Sep 2021 13:41:33 +0200 Subject: [PATCH] AutoTools: Remove unused AutoToolsOpenProjectWizard Change-Id: I76642cf71f7af4b827e7ad10a75f29e589f33388 Reviewed-by: Christian Stenger Reviewed-by: Qt CI Bot --- .../autotoolsprojectmanager/CMakeLists.txt | 1 - .../autotoolsopenprojectwizard.cpp | 99 ------------------- .../autotoolsopenprojectwizard.h | 69 ------------- .../autotoolsprojectmanager.pro | 2 - .../autotoolsprojectmanager.qbs | 2 - 5 files changed, 173 deletions(-) delete mode 100644 src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp delete mode 100644 src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h diff --git a/src/plugins/autotoolsprojectmanager/CMakeLists.txt b/src/plugins/autotoolsprojectmanager/CMakeLists.txt index d974ce9aaf0..9567ec861a0 100644 --- a/src/plugins/autotoolsprojectmanager/CMakeLists.txt +++ b/src/plugins/autotoolsprojectmanager/CMakeLists.txt @@ -5,7 +5,6 @@ add_qtc_plugin(AutotoolsProjectManager autoreconfstep.cpp autoreconfstep.h autotoolsbuildconfiguration.cpp autotoolsbuildconfiguration.h autotoolsbuildsystem.cpp autotoolsbuildsystem.h - autotoolsopenprojectwizard.cpp autotoolsopenprojectwizard.h autotoolsprojectconstants.h autotoolsprojectplugin.cpp autotoolsprojectplugin.h configurestep.cpp configurestep.h diff --git a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp deleted file mode 100644 index 8617f5e47ef..00000000000 --- a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.cpp +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Openismus GmbH. -** Author: Peter Penz (ppenz@openismus.com) -** Author: Patricia Santana Cruz (patriciasantanacruz@gmail.com) -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "autotoolsopenprojectwizard.h" - -#include - -#include -#include -#include - -using namespace AutotoolsProjectManager; -using namespace AutotoolsProjectManager::Internal; - -////////////////////////////////////// -// AutotoolsOpenProjectWizard class -////////////////////////////////////// -AutotoolsOpenProjectWizard::AutotoolsOpenProjectWizard(const QString &sourceDirectory, - QWidget *parent) : - Utils::Wizard(parent), - m_sourceDirectory(sourceDirectory) -{ - QDir dir(m_sourceDirectory); - m_buildDirectory = dir.absolutePath(); - - setPage(BuildPathPageId, new BuildPathPage(this)); - - setStartId(BuildPathPageId); - setWindowTitle(tr("Autotools Wizard")); -} - -QString AutotoolsOpenProjectWizard::buildDirectory() const -{ - return m_buildDirectory; -} - -QString AutotoolsOpenProjectWizard::sourceDirectory() const -{ - return m_sourceDirectory; -} - -void AutotoolsOpenProjectWizard::setBuildDirectory(const QString &directory) -{ - m_buildDirectory = directory; -} - -///////////////////////// -// BuildPathPage class -///////////////////////// -BuildPathPage::BuildPathPage(AutotoolsOpenProjectWizard *w) : QWizardPage(w), - m_pc(new Utils::PathChooser) -{ - auto fl = new QFormLayout; - this->setLayout(fl); - - QLabel *label = new QLabel(this); - label->setWordWrap(true); - label->setText(tr("Please enter the directory in which you want to build your project. " - "It is not recommended to use the source directory for building. " - "This ensures that the source directory remains clean and enables multiple builds " - "with different settings.")); - fl->addWidget(label); - m_pc->setHistoryCompleter(QLatin1String("AutoTools.BuildDir.History")); - auto wiz = static_cast(wizard()); - m_pc->setBaseDirectory(Utils::FilePath::fromString(wiz->sourceDirectory())); - m_pc->setPath(wiz->buildDirectory()); - connect(m_pc, &Utils::PathChooser::rawPathChanged, this, &BuildPathPage::buildDirectoryChanged); - fl->addRow(tr("Build directory:"), m_pc); - setTitle(tr("Build Location")); -} - -void BuildPathPage::buildDirectoryChanged() -{ - static_cast(wizard())->setBuildDirectory(m_pc->filePath().toString()); -} diff --git a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h b/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h deleted file mode 100644 index 62eeab16d7b..00000000000 --- a/src/plugins/autotoolsprojectmanager/autotoolsopenprojectwizard.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 Openismus GmbH. -** Author: Peter Penz (ppenz@openismus.com) -** Author: Patricia Santana Cruz (patriciasantanacruz@gmail.com) -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#pragma once - -#include - -namespace Utils { class PathChooser; } - -namespace AutotoolsProjectManager { -namespace Internal { - -class AutotoolsOpenProjectWizard : public Utils::Wizard -{ - Q_OBJECT - -public: - enum PageId { BuildPathPageId }; - - AutotoolsOpenProjectWizard(const QString &sourceDirectory, QWidget *parent = nullptr); - - QString buildDirectory() const; - QString sourceDirectory() const; - void setBuildDirectory(const QString &directory); - -private: - QString m_buildDirectory; - QString m_sourceDirectory; -}; - -class BuildPathPage : public QWizardPage -{ - Q_OBJECT - -public: - explicit BuildPathPage(AutotoolsOpenProjectWizard *wizard); - -private: - void buildDirectoryChanged(); - - Utils::PathChooser *m_pc; -}; - -} // namespace Internal -} // namespace AutotoolsProjectManager diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro index 37dce96bbb6..64a8f0f96e4 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.pro @@ -2,7 +2,6 @@ include(../../qtcreatorplugin.pri) HEADERS = autotoolsbuildsystem.h \ autotoolsprojectplugin.h\ - autotoolsopenprojectwizard.h\ autotoolsbuildconfiguration.h\ autotoolsprojectconstants.h\ makestep.h\ @@ -14,7 +13,6 @@ HEADERS = autotoolsbuildsystem.h \ SOURCES = autotoolsbuildsystem.cpp \ autotoolsprojectplugin.cpp\ - autotoolsopenprojectwizard.cpp\ autotoolsbuildconfiguration.cpp\ makestep.cpp\ autogenstep.cpp\ diff --git a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs index ccf503f1786..52bb6ac2d76 100644 --- a/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs +++ b/src/plugins/autotoolsprojectmanager/autotoolsprojectmanager.qbs @@ -20,8 +20,6 @@ QtcPlugin { "autotoolsbuildconfiguration.h", "autotoolsbuildsystem.cpp", "autotoolsbuildsystem.h", - "autotoolsopenprojectwizard.cpp", - "autotoolsopenprojectwizard.h", "autotoolsprojectconstants.h", "autotoolsprojectplugin.cpp", "autotoolsprojectplugin.h",