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

SelectableFilesModel: Use Utils::FileName

Browse Source 
* Fix fallout caused by that

Change-Id: If1f068b060b414402918118a826a0f9405c976cd
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-11-03 13:03:39 +01:00
parent 26c872f3e6
commit e484160081
8 changed files with 97 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ void FilesSelectionWizardPage::initializePage()
this, &FilesSelectionWizardPage::parsingProgress);
connect(m_model, &ProjectExplorer::SelectableFilesModel::parsingFinished,
this, &FilesSelectionWizardPage::parsingFinished);
m_model->startParsing(m_genericProjectWizardDialog->path());
m_model->startParsing(Utils::FileName::fromString(m_genericProjectWizardDialog->path()));
m_hideFilesFilterLabel->setVisible(false);
m_hideFilesfilterLineEdit->setVisible(false);
@@ -145,9 +145,9 @@ void FilesSelectionWizardPage::cleanupPage()
m_model->cancel();
}
void FilesSelectionWizardPage::parsingProgress(const QString &text)
void FilesSelectionWizardPage::parsingProgress(const Utils::FileName &text)
{
m_label->setText(tr("Generating file list...\n\n%1").arg(text));
m_label->setText(tr("Generating file list...\n\n%1").arg(text.toUserOutput()));
}
void FilesSelectionWizardPage::parsingFinished()
@@ -175,14 +175,14 @@ bool FilesSelectionWizardPage::isComplete() const
return m_finished;
}
QStringList FilesSelectionWizardPage::selectedPaths() const
QList<Utils::FileName> FilesSelectionWizardPage::selectedPaths() const
{
return m_model ? m_model->selectedPaths() : QStringList();
return m_model ? m_model->selectedPaths() : QList<Utils::FileName>();
}
QStringList FilesSelectionWizardPage::selectedFiles() const
QList<Utils::FileName> FilesSelectionWizardPage::selectedFiles() const
{
return m_model ? m_model->selectedFiles() : QStringList();
return m_model ? m_model->selectedFiles() : QList<Utils::FileName>();
}
void FilesSelectionWizardPage::applyFilter()