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

GenericProject: Pass base directory to startParsing(...) method

Browse Source 
Change-Id: I59645aabac99261526808887e5fe25e575d8d79d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-04-06 17:46:04 +02:00
parent c76548ce29
commit e819357bc9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/projectexplorer/selectablefilesmodel.cpp
View File

@@ -560,7 +560,7 @@ SelectableFilesWidget::SelectableFilesWidget(QWidget *parent) :
connect(m_baseDirChooser, &Utils::PathChooser::validChanged, connect(m_baseDirChooser, &Utils::PathChooser::validChanged,
this, &SelectableFilesWidget::baseDirectoryChanged); this, &SelectableFilesWidget::baseDirectoryChanged);
connect(m_startParsingButton, &QAbstractButton::clicked, connect(m_startParsingButton, &QAbstractButton::clicked,
this, &SelectableFilesWidget::startParsing); this, [this]() { startParsing(m_baseDirChooser->fileName()); });
m_showFilesFilterLabel->setText(tr("Show files matching:")); m_showFilesFilterLabel->setText(tr("Show files matching:"));
m_showFilesFilterEdit->setText(showFilter); m_showFilesFilterEdit->setText(showFilter);
@@ -641,7 +641,7 @@ void SelectableFilesWidget::resetModel(const Utils::FileName &path, const Utils:
m_baseDirChooser->setFileName(path); m_baseDirChooser->setFileName(path);
m_view->setModel(m_model); m_view->setModel(m_model);
startParsing(); startParsing(path);
} }
void SelectableFilesWidget::cancelParsing() void SelectableFilesWidget::cancelParsing()
@@ -675,13 +675,13 @@ void SelectableFilesWidget::baseDirectoryChanged(bool validState)
m_startParsingButton->setEnabled(validState); m_startParsingButton->setEnabled(validState);
} }
void SelectableFilesWidget::startParsing() void SelectableFilesWidget::startParsing(const Utils::FileName &baseDir)
{ {
if (!m_model) if (!m_model)
return; return;
enableWidgets(false); enableWidgets(false);
m_model->startParsing(m_baseDirChooser->fileName()); m_model->startParsing(baseDir);
} }
void SelectableFilesWidget::parsingProgress(const Utils::FileName &fileName) void SelectableFilesWidget::parsingProgress(const Utils::FileName &fileName)

2
src/plugins/projectexplorer/selectablefilesmodel.h
View File

@@ -176,7 +176,7 @@ private:
void applyFilter(); void applyFilter();
void baseDirectoryChanged(bool validState); void baseDirectoryChanged(bool validState);
void startParsing(); void startParsing(const Utils::FileName &baseDir);
void parsingProgress(const Utils::FileName &fileName); void parsingProgress(const Utils::FileName &fileName);
void parsingFinished(); void parsingFinished();