Commit ca29cbfc authored by Tobias Hunger's avatar Tobias Hunger

Consistently use Utils::FileNameList

Consistently use Utils::FileNameList in favor of QList<Utils::FileName>

Change-Id: Iafbb466c882bfd91c25c9e78f107d401bfdb6d55
Reviewed-by: default avatarNiels Weber <niels.weber@theqtcompany.com>
parent 153d593b
......@@ -198,9 +198,9 @@ bool AndroidToolChain::fromMap(const QVariantMap &data)
return isValid();
}
QList<FileName> AndroidToolChain::suggestedMkspecList() const
FileNameList AndroidToolChain::suggestedMkspecList() const
{
return QList<FileName>()<< FileName::fromLatin1("android-g++");
return FileNameList()<< FileName::fromLatin1("android-g++");
}
QString AndroidToolChain::makeCommand(const Environment &env) const
......
......@@ -56,7 +56,7 @@ public:
QVariantMap toMap() const override;
bool fromMap(const QVariantMap &data) override;
QList<Utils::FileName> suggestedMkspecList() const override;
Utils::FileNameList suggestedMkspecList() const override;
QString makeCommand(const Utils::Environment &environment) const override;
QString ndkToolChainVersion() const;
......
......@@ -65,9 +65,7 @@ int distance(const QString &targetDirectory, const FileName &fileName)
void CMakeCbpParser::sortFiles()
{
QLoggingCategory log("qtc.cmakeprojectmanager.filetargetmapping");
QList<FileName> fileNames = Utils::transform(m_fileList, [] (FileNode *node) {
return node->filePath();
});
FileNameList fileNames = Utils::transform(m_fileList, &FileNode::filePath);
Utils::sort(fileNames);
......
......@@ -163,7 +163,7 @@ static void readAndDeleteLegacyCMakeSettings ()
static QList<CMakeTool *> autoDetectCMakeTools()
{
QList<FileName> suspects;
FileNameList suspects;
Utils::Environment env = Environment::systemEnvironment();
......
......@@ -139,7 +139,7 @@ QList<DebuggerItem> DebuggerItemManager::debuggers()
void DebuggerItemManager::autoDetectCdbDebuggers()
{
QList<FileName> cdbs;
FileNameList cdbs;
QStringList programDirs;
programDirs.append(QString::fromLocal8Bit(qgetenv("ProgramFiles")));
......@@ -227,7 +227,7 @@ void DebuggerItemManager::autoDetectGdbOrLldbDebuggers()
}
*/
QList<FileName> suspects;
FileNameList suspects;
if (HostOsInfo::isMacHost()) {
QProcess lldbInfo;
......
......@@ -175,14 +175,14 @@ bool FilesSelectionWizardPage::isComplete() const
return m_finished;
}
QList<Utils::FileName> FilesSelectionWizardPage::selectedPaths() const
Utils::FileNameList FilesSelectionWizardPage::selectedPaths() const
{
return m_model ? m_model->selectedPaths() : QList<Utils::FileName>();
return m_model ? m_model->selectedPaths() : Utils::FileNameList();
}
QList<Utils::FileName> FilesSelectionWizardPage::selectedFiles() const
Utils::FileNameList FilesSelectionWizardPage::selectedFiles() const
{
return m_model ? m_model->selectedFiles() : QList<Utils::FileName>();
return m_model ? m_model->selectedFiles() : Utils::FileNameList();
}
void FilesSelectionWizardPage::applyFilter()
......
......@@ -33,6 +33,8 @@
#include <QWizardPage>
#include <utils/fileutils.h>
QT_BEGIN_NAMESPACE
class QVBoxLayout;
class QLabel;
......@@ -40,7 +42,6 @@ class QTreeView;
class QLineEdit;
QT_END_NAMESPACE
namespace Utils { class FileName; }
namespace ProjectExplorer { class SelectableFilesModel; }
namespace GenericProjectManager {
......@@ -57,8 +58,8 @@ public:
bool isComplete() const;
void initializePage();
void cleanupPage();
QList<Utils::FileName> selectedFiles() const;
QList<Utils::FileName> selectedPaths() const;
Utils::FileNameList selectedFiles() const;
Utils::FileNameList selectedPaths() const;
private slots:
void applyFilter();
......
......@@ -86,12 +86,12 @@ QString GenericProjectWizardDialog::path() const
return m_firstPage->path();
}
QList<Utils::FileName> GenericProjectWizardDialog::selectedPaths() const
Utils::FileNameList GenericProjectWizardDialog::selectedPaths() const
{
return m_secondPage->selectedPaths();
}
QList<Utils::FileName> GenericProjectWizardDialog::selectedFiles() const
Utils::FileNameList GenericProjectWizardDialog::selectedFiles() const
{
return m_secondPage->selectedFiles();
}
......
......@@ -33,12 +33,10 @@
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
#include <utils/fileutils.h>
#include <utils/wizard.h>
namespace Utils {
class FileName;
class FileWizardPage;
} // namespace Utils
namespace Utils { class FileWizardPage; }
namespace GenericProjectManager {
namespace Internal {
......@@ -54,8 +52,8 @@ public:
QString path() const;
void setPath(const QString &path);
QList<Utils::FileName> selectedFiles() const;
QList<Utils::FileName> selectedPaths() const;
Utils::FileNameList selectedFiles() const;
Utils::FileNameList selectedPaths() const;
QString projectName() const;
......
......@@ -181,7 +181,7 @@ void CustomToolChain::addToEnvironment(Environment &env) const
}
}
QList<FileName> CustomToolChain::suggestedMkspecList() const
FileNameList CustomToolChain::suggestedMkspecList() const
{
return m_mkspecs;
}
......
......@@ -91,7 +91,7 @@ public:
QList<HeaderPath> systemHeaderPaths(const QStringList &cxxFlags,
const Utils::FileName &) const override;
void addToEnvironment(Utils::Environment &env) const override;
QList<Utils::FileName> suggestedMkspecList() const override;
Utils::FileNameList suggestedMkspecList() const override;
IOutputParser *outputParser() const override;
QStringList headerPathsList() const;
void setHeaderPaths(const QStringList &list);
......@@ -135,7 +135,7 @@ private:
QStringList m_predefinedMacros;
QList<HeaderPath> m_systemHeaderPaths;
QStringList m_cxx11Flags;
QList<Utils::FileName> m_mkspecs;
Utils::FileNameList m_mkspecs;
OutputParser m_outputParser;
CustomParserSettings m_customParserSettings;
......
......@@ -565,7 +565,7 @@ void GccToolChain::addToEnvironment(Environment &env) const
addCommandPathToEnvironment(m_compilerCommand, env);
}
QList<FileName> GccToolChain::suggestedMkspecList() const
FileNameList GccToolChain::suggestedMkspecList() const
{
Abi abi = targetAbi();
Abi host = Abi::hostAbi();
......@@ -574,34 +574,34 @@ QList<FileName> GccToolChain::suggestedMkspecList() const
if (abi.architecture() != host.architecture()
|| abi.os() != host.os()
|| abi.osFlavor() != host.osFlavor()) // Note: This can fail:-(
return QList<FileName>();
return FileNameList();
if (abi.os() == Abi::MacOS) {
QString v = version();
// prefer versioned g++ on mac. This is required to enable building for older Mac OS versions
if (v.startsWith(QLatin1String("4.0")) && m_compilerCommand.endsWith(QLatin1String("-4.0")))
return QList<FileName>() << FileName::fromLatin1("macx-g++40");
return FileNameList() << FileName::fromLatin1("macx-g++40");
if (v.startsWith(QLatin1String("4.2")) && m_compilerCommand.endsWith(QLatin1String("-4.2")))
return QList<FileName>() << FileName::fromLatin1("macx-g++42");
return QList<FileName>() << FileName::fromLatin1("macx-g++");
return FileNameList() << FileName::fromLatin1("macx-g++42");
return FileNameList() << FileName::fromLatin1("macx-g++");
}
if (abi.os() == Abi::LinuxOS) {
if (abi.osFlavor() != Abi::GenericLinuxFlavor)
return QList<FileName>(); // most likely not a desktop, so leave the mkspec alone.
return FileNameList(); // most likely not a desktop, so leave the mkspec alone.
if (abi.wordWidth() == host.wordWidth()) {
// no need to explicitly set the word width, but provide that mkspec anyway to make sure
// that the correct compiler is picked if a mkspec with a wordwidth is given.
return QList<FileName>() << FileName::fromLatin1("linux-g++")
<< FileName::fromString(QLatin1String("linux-g++-") + QString::number(m_targetAbi.wordWidth()));
return FileNameList() << FileName::fromLatin1("linux-g++")
<< FileName::fromString(QLatin1String("linux-g++-") + QString::number(m_targetAbi.wordWidth()));
}
return QList<FileName>() << FileName::fromString(QLatin1String("linux-g++-") + QString::number(m_targetAbi.wordWidth()));
return FileNameList() << FileName::fromString(QLatin1String("linux-g++-") + QString::number(m_targetAbi.wordWidth()));
}
if (abi.os() == Abi::BsdOS && abi.osFlavor() == Abi::FreeBsdFlavor)
return QList<FileName>() << FileName::fromLatin1("freebsd-g++");
return FileNameList() << FileName::fromLatin1("freebsd-g++");
return QList<FileName>();
return FileNameList();
}
QString GccToolChain::makeCommand(const Environment &environment) const
......@@ -1069,20 +1069,20 @@ ToolChain::WarningFlags ClangToolChain::warningFlags(const QStringList &cflags)
return flags;
}
QList<FileName> ClangToolChain::suggestedMkspecList() const
FileNameList ClangToolChain::suggestedMkspecList() const
{
Abi abi = targetAbi();
if (abi.os() == Abi::MacOS)
return QList<FileName>()
return FileNameList()
<< FileName::fromLatin1("macx-clang")
<< FileName::fromLatin1("macx-clang-32")
<< FileName::fromLatin1("unsupported/macx-clang")
<< FileName::fromLatin1("macx-ios-clang");
else if (abi.os() == Abi::LinuxOS)
return QList<FileName>()
return FileNameList()
<< FileName::fromLatin1("linux-clang")
<< FileName::fromLatin1("unsupported/linux-clang");
return QList<FileName>(); // Note: Not supported by Qt yet, so default to the mkspec the Qt was build with
return FileNameList(); // Note: Not supported by Qt yet, so default to the mkspec the Qt was build with
}
void ClangToolChain::addToEnvironment(Environment &env) const
......@@ -1148,21 +1148,21 @@ QString MingwToolChain::typeDisplayName() const
return MingwToolChainFactory::tr("MinGW");
}
QList<FileName> MingwToolChain::suggestedMkspecList() const
FileNameList MingwToolChain::suggestedMkspecList() const
{
if (HostOsInfo::isWindowsHost())
return QList<FileName>() << FileName::fromLatin1("win32-g++");
return FileNameList() << FileName::fromLatin1("win32-g++");
if (HostOsInfo::isLinuxHost()) {
if (version().startsWith(QLatin1String("4.6.")))
return QList<FileName>()
return FileNameList()
<< FileName::fromLatin1("win32-g++-4.6-cross")
<< FileName::fromLatin1("unsupported/win32-g++-4.6-cross");
else
return QList<FileName>()
return FileNameList()
<< FileName::fromLatin1("win32-g++-cross")
<< FileName::fromLatin1("unsupported/win32-g++-cross");
}
return QList<FileName>();
return FileNameList();
}
QString MingwToolChain::makeCommand(const Environment &environment) const
......@@ -1256,9 +1256,9 @@ IOutputParser *LinuxIccToolChain::outputParser() const
return new LinuxIccParser;
}
QList<FileName> LinuxIccToolChain::suggestedMkspecList() const
FileNameList LinuxIccToolChain::suggestedMkspecList() const
{
return QList<FileName>()
return FileNameList()
<< FileName::fromString(QLatin1String("linux-icc-") + QString::number(targetAbi().wordWidth()));
}
......
......@@ -74,7 +74,7 @@ public:
const Utils::FileName &sysRoot) const override;
void addToEnvironment(Utils::Environment &env) const override;
QString makeCommand(const Utils::Environment &environment) const override;
QList<Utils::FileName> suggestedMkspecList() const override;
Utils::FileNameList suggestedMkspecList() const override;
IOutputParser *outputParser() const override;
QVariantMap toMap() const override;
......@@ -172,7 +172,7 @@ public:
ToolChain *clone() const override;
QList<Utils::FileName> suggestedMkspecList() const override;
Utils::FileNameList suggestedMkspecList() const override;
void addToEnvironment(Utils::Environment &env) const override;
protected:
......@@ -195,7 +195,7 @@ public:
ToolChain *clone() const override;
QList<Utils::FileName> suggestedMkspecList() const override;
Utils::FileNameList suggestedMkspecList() const override;
private:
explicit MingwToolChain(Detection d);
......@@ -218,7 +218,7 @@ public:
ToolChain *clone() const override;
QList<Utils::FileName> suggestedMkspecList() const override;
Utils::FileNameList suggestedMkspecList() const override;
private:
explicit LinuxIccToolChain(Detection d);
......
......@@ -316,9 +316,9 @@ JsonWizardFactory *JsonWizardFactory::createWizardFactory(const QVariantMap &dat
return factory;
}
QList<Utils::FileName> &JsonWizardFactory::searchPaths()
Utils::FileNameList &JsonWizardFactory::searchPaths()
{
static QList<Utils::FileName> m_searchPaths = QList<Utils::FileName>()
static Utils::FileNameList m_searchPaths = Utils::FileNameList()
<< Utils::FileName::fromString(Core::ICore::userResourcePath() + QLatin1Char('/') +
QLatin1String(WIZARD_PATH))
<< Utils::FileName::fromString(Core::ICore::resourcePath() + QLatin1Char('/') +
......
......@@ -102,7 +102,7 @@ private:
static QList<IWizardFactory *> createWizardFactories();
static JsonWizardFactory *createWizardFactory(const QVariantMap &data, const QDir &baseDir,
QString *errorMessage);
static QList<Utils::FileName> &searchPaths();
static Utils::FileNameList &searchPaths();
static void setVerbose(int level);
static int verbose();
......
......@@ -379,21 +379,21 @@ QString MsvcToolChain::typeDisplayName() const
return MsvcToolChainFactory::tr("MSVC");
}
QList<Utils::FileName> MsvcToolChain::suggestedMkspecList() const
Utils::FileNameList MsvcToolChain::suggestedMkspecList() const
{
switch (m_abi.osFlavor()) {
case Abi::WindowsMsvc2005Flavor:
return QList<Utils::FileName>() << Utils::FileName::fromLatin1("win32-msvc2005");
return Utils::FileNameList() << Utils::FileName::fromLatin1("win32-msvc2005");
case Abi::WindowsMsvc2008Flavor:
return QList<Utils::FileName>() << Utils::FileName::fromLatin1("win32-msvc2008");
return Utils::FileNameList() << Utils::FileName::fromLatin1("win32-msvc2008");
case Abi::WindowsMsvc2010Flavor:
return QList<Utils::FileName>() << Utils::FileName::fromLatin1("win32-msvc2010");
return Utils::FileNameList() << Utils::FileName::fromLatin1("win32-msvc2010");
case Abi::WindowsMsvc2012Flavor:
return QList<Utils::FileName>()
return Utils::FileNameList()
<< Utils::FileName::fromLatin1("win32-msvc2012")
<< Utils::FileName::fromLatin1("win32-msvc2010");
case Abi::WindowsMsvc2013Flavor:
return QList<Utils::FileName>()
return Utils::FileNameList()
<< Utils::FileName::fromLatin1("win32-msvc2013")
<< Utils::FileName::fromLatin1("winphone-arm-msvc2013")
<< Utils::FileName::fromLatin1("winphone-x86-msvc2013")
......@@ -403,7 +403,7 @@ QList<Utils::FileName> MsvcToolChain::suggestedMkspecList() const
<< Utils::FileName::fromLatin1("win32-msvc2012")
<< Utils::FileName::fromLatin1("win32-msvc2010");
case Abi::WindowsMsvc2015Flavor:
return QList<Utils::FileName>()
return Utils::FileNameList()
<< Utils::FileName::fromLatin1("win32-msvc2015")
<< Utils::FileName::fromLatin1("winphone-arm-msvc2015")
<< Utils::FileName::fromLatin1("winphone-x86-msvc2015")
......@@ -413,7 +413,7 @@ QList<Utils::FileName> MsvcToolChain::suggestedMkspecList() const
default:
break;
}
return QList<Utils::FileName>();
return Utils::FileNameList();
}
QVariantMap MsvcToolChain::toMap() const
......
......@@ -61,7 +61,7 @@ public:
MsvcToolChain(const QString &name, const Abi &abi,
const QString &varsBat, const QString &varsBatArg, Detection d = ManualDetection);
bool isValid() const override;
QList<Utils::FileName> suggestedMkspecList() const override;
Utils::FileNameList suggestedMkspecList() const override;
static MsvcToolChain *readFromMap(const QVariantMap &data);
......
......@@ -3148,7 +3148,7 @@ void ProjectExplorerPluginPrivate::addExistingDirectory()
QTC_ASSERT(folderNode, return);
SelectableFilesDialogAddDirectory dialog(Utils::FileName::fromString(directoryFor(ProjectTree::currentNode())),
QList<Utils::FileName>(), ICore::mainWindow());
Utils::FileNameList(), ICore::mainWindow());
dialog.setAddFileFilter(folderNode->addFileFilter());
if (dialog.exec() == QDialog::Accepted)
......
......@@ -62,7 +62,7 @@ SelectableFilesModel::SelectableFilesModel(QObject *parent) : QAbstractItemModel
m_root->parent = 0;
}
void SelectableFilesModel::setInitialMarkedFiles(const QList<Utils::FileName> &files)
void SelectableFilesModel::setInitialMarkedFiles(const Utils::FileNameList &files)
{
m_files = files.toSet();
m_outOfBaseDirFiles
......@@ -312,14 +312,14 @@ Qt::ItemFlags SelectableFilesModel::flags(const QModelIndex &index) const
return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable;
}
QList<Utils::FileName> SelectableFilesModel::selectedPaths() const
Utils::FileNameList SelectableFilesModel::selectedPaths() const
{
QList<Utils::FileName> result;
Utils::FileNameList result;
collectPaths(m_root, &result);
return result;
}
void SelectableFilesModel::collectPaths(Tree *root, QList<Utils::FileName> *result) const
void SelectableFilesModel::collectPaths(Tree *root, Utils::FileNameList *result) const
{
if (root->checked == Qt::Unchecked)
return;
......@@ -328,19 +328,19 @@ void SelectableFilesModel::collectPaths(Tree *root, QList<Utils::FileName> *resu
collectPaths(t, result);
}
QList<Utils::FileName> SelectableFilesModel::selectedFiles() const
Utils::FileNameList SelectableFilesModel::selectedFiles() const
{
QList<Utils::FileName> result = m_outOfBaseDirFiles.toList();
Utils::FileNameList result = m_outOfBaseDirFiles.toList();
collectFiles(m_root, &result);
return result;
}
QList<Utils::FileName> SelectableFilesModel::preservedFiles() const
Utils::FileNameList SelectableFilesModel::preservedFiles() const
{
return m_outOfBaseDirFiles.toList();
}
void SelectableFilesModel::collectFiles(Tree *root, QList<Utils::FileName> *result) const
void SelectableFilesModel::collectFiles(Tree *root, Utils::FileNameList *result) const
{
if (root->checked == Qt::Unchecked)
return;
......@@ -514,7 +514,7 @@ Qt::CheckState SelectableFilesModel::applyFilter(const QModelIndex &index)
//////////
SelectableFilesDialogEditFiles::SelectableFilesDialogEditFiles(const Utils::FileName &path,
const QList<Utils::FileName> &files,
const Utils::FileNameList &files,
QWidget *parent)
: QDialog(parent)
{
......@@ -634,7 +634,7 @@ void SelectableFilesDialogEditFiles::parsingFinished()
smartExpand(m_selectableFilesModel->index(0,0, QModelIndex()));
applyFilter();
const QList<Utils::FileName> preservedFiles = m_selectableFilesModel->preservedFiles();
const Utils::FileNameList preservedFiles = m_selectableFilesModel->preservedFiles();
m_preservedFiles->setText(tr("Not showing %n files that are outside of the base directory.\nThese files are preserved.", 0, preservedFiles.count()));
m_preservedFiles->setVisible(!preservedFiles.isEmpty());
}
......@@ -649,7 +649,7 @@ void SelectableFilesDialogEditFiles::smartExpand(const QModelIndex &index)
}
}
QList<Utils::FileName> SelectableFilesDialogEditFiles::selectedFiles() const
Utils::FileNameList SelectableFilesDialogEditFiles::selectedFiles() const
{
return m_selectableFilesModel->selectedFiles();
}
......@@ -671,7 +671,7 @@ void SelectableFilesDialogEditFiles::applyFilter()
}
SelectableFilesDialogAddDirectory::SelectableFilesDialogAddDirectory(const Utils::FileName &path,
const QList<Utils::FileName> &files,
const Utils::FileNameList &files,
QWidget *parent) :
SelectableFilesDialogEditFiles(path, files, parent)
{
......
......@@ -97,7 +97,7 @@ public:
SelectableFilesModel(QObject *parent);
~SelectableFilesModel();
void setInitialMarkedFiles(const QList<Utils::FileName> &files);
void setInitialMarkedFiles(const Utils::FileNameList &files);
int columnCount(const QModelIndex &parent) const;
int rowCount(const QModelIndex &parent) const;
......@@ -108,9 +108,9 @@ public:
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
Qt::ItemFlags flags(const QModelIndex &index) const;
QList<Utils::FileName> selectedFiles() const;
QList<Utils::FileName> selectedPaths() const;
QList<Utils::FileName> preservedFiles() const;
Utils::FileNameList selectedFiles() const;
Utils::FileNameList selectedPaths() const;
Utils::FileNameList preservedFiles() const;
void startParsing(const Utils::FileName &baseDir);
void cancel();
......@@ -130,8 +130,8 @@ private:
Qt::CheckState applyFilter(const QModelIndex &index);
bool filter(Tree *t);
void run(QFutureInterface<void> &fi);
void collectFiles(Tree *root, QList<Utils::FileName> *result) const;
void collectPaths(Tree *root, QList<Utils::FileName> *result) const;
void collectFiles(Tree *root, Utils::FileNameList *result) const;
void collectPaths(Tree *root, Utils::FileNameList *result) const;
void buildTree(const Utils::FileName &baseDir, Tree *tree, QFutureInterface<void> &fi, int symlinkDepth);
void propagateUp(const QModelIndex &index);
void propagateDown(const QModelIndex &index);
......@@ -157,9 +157,10 @@ class PROJECTEXPLORER_EXPORT SelectableFilesDialogEditFiles : public QDialog
Q_OBJECT
public:
SelectableFilesDialogEditFiles(const Utils::FileName &path, const QList<Utils::FileName> &files, QWidget *parent);
SelectableFilesDialogEditFiles(const Utils::FileName &path, const Utils::FileNameList &files,
QWidget *parent);
~SelectableFilesDialogEditFiles();
QList<Utils::FileName> selectedFiles() const;
Utils::FileNameList selectedFiles() const;
void setAddFileFilter(const QString &filter);
......@@ -194,7 +195,8 @@ class SelectableFilesDialogAddDirectory : public SelectableFilesDialogEditFiles
Q_OBJECT
public:
SelectableFilesDialogAddDirectory(const Utils::FileName &path, const QList<Utils::FileName> &files, QWidget *parent);
SelectableFilesDialogAddDirectory(const Utils::FileName &path, const Utils::FileNameList &files,
QWidget *parent);
private slots:
void validityOfDirectoryChanged(bool validState);
......
......@@ -514,7 +514,7 @@ public:
return m_upgraders.at(pos);
return 0;
}
Settings bestSettings(const SettingsAccessor *accessor, const QList<FileName> &pathList);
Settings bestSettings(const SettingsAccessor *accessor, const FileNameList &pathList);
QList<VersionUpgrader *> m_upgraders;
PersistentSettingsWriter *m_writer;
......@@ -979,9 +979,9 @@ bool SettingsAccessor::addVersionUpgrader(VersionUpgrader *upgrader)
}
/* Will always return the default name first (if applicable) */
QList<FileName> SettingsAccessor::settingsFiles(const QString &suffix) const
FileNameList SettingsAccessor::settingsFiles(const QString &suffix) const
{
QList<FileName> result;
FileNameList result;
QFileInfoList list;
const QFileInfo pfi = project()->projectFilePath().toFileInfo();
......@@ -1062,7 +1062,7 @@ void SettingsAccessor::backupUserFile() const
QVariantMap SettingsAccessor::readUserSettings(QWidget *parent) const
{
SettingsAccessorPrivate::Settings result;
QList<FileName> fileList = settingsFiles(m_userSuffix);
FileNameList fileList = settingsFiles(m_userSuffix);
if (fileList.isEmpty()) // No settings found at all.
return result.map;
......@@ -1112,7 +1112,7 @@ QVariantMap SettingsAccessor::readSharedSettings(QWidget *parent) const
}
SettingsAccessorPrivate::Settings SettingsAccessorPrivate::bestSettings(const SettingsAccessor *accessor,
const QList<FileName> &pathList)
const FileNameList &pathList)
{
Settings bestMatch;
foreach (const FileName &path, pathList) {
......
......@@ -120,7 +120,7 @@ protected:
virtual IssueInfo findIssues(const QVariantMap &data, const Utils::FileName &path) const;
private:
QList<Utils::FileName> settingsFiles(const QString &suffix) const;
Utils::FileNameList settingsFiles(const QString &suffix) const;
static QByteArray creatorId();
QString defaultFileName(const QString &suffix) const;
void backupUserFile() const;
......
......@@ -125,9 +125,9 @@ QByteArray ToolChain::id() const
return d->m_id;
}
QList<Utils::FileName> ToolChain::suggestedMkspecList() const
Utils::FileNameList ToolChain::suggestedMkspecList() const
{
return QList<Utils::FileName>();
return Utils::FileNameList();
}
Utils::FileName ToolChain::suggestedDebugger() const
......
......@@ -34,14 +34,13 @@
#include "projectexplorer_export.h"
#include <coreplugin/id.h>
#include <utils/fileutils.h>
#include <QObject>
#include <QString>
#include <QVariantMap>
namespace Utils {
class Environment;
class FileName;
}