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

Utils: Rename FileName to FilePath

Browse Source 
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.

Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -83,12 +83,12 @@ QString GenericProjectWizardDialog::path() const
return m_firstPage->path();
}
Utils::FileNameList GenericProjectWizardDialog::selectedPaths() const
Utils::FilePathList GenericProjectWizardDialog::selectedPaths() const
{
return m_secondPage->selectedPaths();
}
Utils::FileNameList GenericProjectWizardDialog::selectedFiles() const
Utils::FilePathList GenericProjectWizardDialog::selectedFiles() const
{
return m_secondPage->selectedFiles();
}
@@ -151,7 +151,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
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 QStringList paths = Utils::transform(wizard->selectedPaths(), &Utils::FileName::toString);
const QStringList paths = Utils::transform(wizard->selectedPaths(), &Utils::FilePath::toString);
Utils::MimeType headerTy = Utils::mimeTypeForName(QLatin1String("text/x-chdr"));
@@ -175,7 +175,7 @@ Core::GeneratedFiles GenericProjectWizard::generateFiles(const QWizard *w,
generatedCreatorFile.setContents(QLatin1String("[General]\n"));
generatedCreatorFile.setAttributes(Core::GeneratedFile::OpenProjectAttribute);
QStringList sources = Utils::transform(wizard->selectedFiles(), &Utils::FileName::toString);
QStringList sources = Utils::transform(wizard->selectedFiles(), &Utils::FilePath::toString);
for (int i = 0; i < sources.length(); ++i)
sources[i] = dir.relativeFilePath(sources[i]);
Utils::sort(sources);