feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use FilePath in several file wizards

Browse Source 
Change-Id: I9bab9d602096a3872f73fb16d901b8aedcd82516
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-09-27 18:06:38 +02:00
parent 324105febe
commit 4bbab39467
27 changed files with 153 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/genericprojectmanager/filesselectionwizardpage.cpp
View File

@@ -59,8 +59,7 @@ FilesSelectionWizardPage::FilesSelectionWizardPage(GenericProjectWizardDialog *g
void FilesSelectionWizardPage::initializePage()
{
m_filesWidget->resetModel(Utils::FilePath::fromString(m_genericProjectWizardDialog->path()),
Utils::FilePaths());
m_filesWidget->resetModel(m_genericProjectWizardDialog->filePath(), Utils::FilePaths());
}
void FilesSelectionWizardPage::cleanupPage()

37
src/plugins/genericprojectmanager/genericprojectwizard.cpp
View File

@@ -46,13 +46,14 @@
#include <QPixmap>
#include <QStyle>
using namespace Utils;
namespace GenericProjectManager {
namespace Internal {
static const char *const ConfigFileTemplate =
const char ConfigFileTemplate[] =
"// Add predefined macros for your project here. For example:\n"
"// #define THE_ANSWER 42\n"
;
"// #define THE_ANSWER 42\n";
//////////////////////////////////////////////////////////////////////////////
//
@@ -79,24 +80,24 @@ GenericProjectWizardDialog::GenericProjectWizardDialog(const Core::BaseFileWizar
addPage(m_secondPage);
}
QString GenericProjectWizardDialog::path() const
FilePath GenericProjectWizardDialog::filePath() const
{
return m_firstPage->path();
return m_firstPage->filePath();
}
Utils::FilePaths GenericProjectWizardDialog::selectedPaths() const
FilePaths GenericProjectWizardDialog::selectedPaths() const
{
return m_secondPage->selectedPaths();
}
Utils::FilePaths GenericProjectWizardDialog::selectedFiles() const
FilePaths GenericProjectWizardDialog::selectedFiles() const
{
return m_secondPage->selectedFiles();
}
void GenericProjectWizardDialog::setPath(const QString &path)
void GenericProjectWizardDialog::setFilePath(const FilePath &path)
{
m_firstPage->setPath(path);
m_firstPage->setFilePath(path);
}
QString GenericProjectWizardDialog::projectName() const
@@ -129,7 +130,7 @@ Core::BaseFileWizard *GenericProjectWizard::create(QWidget *parent,
{
auto wizard = new GenericProjectWizardDialog(this, parent);
wizard->setPath(parameters.defaultPath());
wizard->setFilePath(parameters.defaultPath());
foreach (QWizardPage *p, wizard->extensionPages())
wizard->addPage(p);
@@ -143,15 +144,14 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
Q_UNUSED(errorMessage)
auto wizard = qobject_cast<const GenericProjectWizardDialog *>(w);
const QString projectPath = wizard->path();
const QDir dir(projectPath);
const FilePath projectPath = wizard->filePath();
const QString projectName = wizard->projectName();
const QString creatorFileName = QFileInfo(dir, projectName + QLatin1String(".creator")).absoluteFilePath();
const QString filesFileName = QFileInfo(dir, projectName + QLatin1String(".files")).absoluteFilePath();
const QString includesFileName = QFileInfo(dir, projectName + QLatin1String(".includes")).absoluteFilePath();
const QString configFileName = QFileInfo(dir, projectName + QLatin1String(".config")).absoluteFilePath();
const QString cxxflagsFileName = QFileInfo(dir, projectName + QLatin1String(".cxxflags")).absoluteFilePath();
const QString cflagsFileName = QFileInfo(dir, projectName + QLatin1String(".cflags")).absoluteFilePath();
const FilePath creatorFileName = projectPath.pathAppended(projectName + ".creator");
const FilePath filesFileName = projectPath.pathAppended(projectName + ".files");
const FilePath includesFileName = projectPath.pathAppended(projectName + ".includes");
const FilePath configFileName = projectPath.pathAppended(projectName + ".config");
const FilePath cxxflagsFileName = projectPath.pathAppended(projectName + ".cxxflags");
const FilePath cflagsFileName = projectPath.pathAppended(projectName + ".cflags");
const QStringList paths = Utils::transform(wizard->selectedPaths(), &Utils::FilePath::toString);
Utils::MimeType headerTy = Utils::mimeTypeForName(QLatin1String("text/x-chdr"));
@@ -159,6 +159,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
QStringList nameFilters = headerTy.globPatterns();
QStringList includePaths;
const QDir dir(projectPath.toString());
foreach (const QString &path, paths) {
QFileInfo fileInfo(path);
QDir thisDir(fileInfo.absoluteFilePath());

4
src/plugins/genericprojectmanager/genericprojectwizard.h
View File

@@ -44,8 +44,8 @@ class GenericProjectWizardDialog : public Core::BaseFileWizard
public:
explicit GenericProjectWizardDialog(const Core::BaseFileWizardFactory *factory, QWidget *parent = nullptr);
QString path() const;
void setPath(const QString &path);
Utils::FilePath filePath() const;
void setFilePath(const Utils::FilePath &path);
Utils::FilePaths selectedFiles() const;
Utils::FilePaths selectedPaths() const;