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

DirectoryFilter: Hide public methods

Browse Source 
Make most of the public methods of DirectoryFilter
protected. Move connection to project manager signals
into AllProjectFilesFilter c'tor. Remove unused
DirectoryFilter::directories().

Change-Id: I66d16c2c90188de6a03fb072fed6c87ea3d9ce4c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2023-04-03 11:47:19 +02:00
parent abe7738811
commit 59c1fae60b
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/locator/directoryfilter.cpp
View File

@@ -411,11 +411,6 @@ void DirectoryFilter::removeDirectory(const FilePath &directory)
setDirectories(directories); setDirectories(directories);
} }
FilePaths DirectoryFilter::directories() const
{
return m_directories;
}
void DirectoryFilter::setFilters(const QStringList &filters) void DirectoryFilter::setFilters(const QStringList &filters)
{ {
m_filters = filters; m_filters = filters;

5
src/plugins/coreplugin/locator/directoryfilter.h
View File

@@ -20,19 +20,18 @@ public:
void restoreState(const QByteArray &state) override; void restoreState(const QByteArray &state) override;
bool openConfigDialog(QWidget *parent, bool &needsRefresh) override; bool openConfigDialog(QWidget *parent, bool &needsRefresh) override;
protected:
void setIsCustomFilter(bool value); void setIsCustomFilter(bool value);
void setDirectories(const Utils::FilePaths &directories);
void addDirectory(const Utils::FilePath &directory); void addDirectory(const Utils::FilePath &directory);
void removeDirectory(const Utils::FilePath &directory); void removeDirectory(const Utils::FilePath &directory);
Utils::FilePaths directories() const;
void setFilters(const QStringList &filters); void setFilters(const QStringList &filters);
void setExclusionFilters(const QStringList &exclusionFilters); void setExclusionFilters(const QStringList &exclusionFilters);
protected:
void saveState(QJsonObject &object) const override; void saveState(QJsonObject &object) const override;
void restoreState(const QJsonObject &object) override; void restoreState(const QJsonObject &object) override;
private: private:
void setDirectories(const Utils::FilePaths &directories);
void handleAddDirectory(); void handleAddDirectory();
void handleEditDirectory(); void handleEditDirectory();
void handleRemoveDirectory(); void handleRemoveDirectory();

19
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -863,16 +863,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
connect(SessionManager::instance(), &SessionManager::sessionLoaded, connect(SessionManager::instance(), &SessionManager::sessionLoaded,
dd, &ProjectExplorerPluginPrivate::loadSesssionTasks); dd, &ProjectExplorerPluginPrivate::loadSesssionTasks);
connect(sessionManager, &ProjectManager::projectAdded, dd, [](ProjectExplorer::Project *project) {
dd->m_allProjectDirectoriesFilter.addDirectory(project->projectDirectory());
});
connect(sessionManager,
&ProjectManager::projectRemoved,
dd,
[](ProjectExplorer::Project *project) {
dd->m_allProjectDirectoriesFilter.removeDirectory(project->projectDirectory());
});
ProjectTree *tree = &dd->m_projectTree; ProjectTree *tree = &dd->m_projectTree;
connect(tree, &ProjectTree::currentProjectChanged, dd, [] { connect(tree, &ProjectTree::currentProjectChanged, dd, [] {
dd->updateContextMenuActions(ProjectTree::currentNode()); dd->updateContextMenuActions(ProjectTree::currentNode());
@@ -4371,6 +4361,15 @@ AllProjectFilesFilter::AllProjectFilesFilter()
"Matches all files from all project directories. Append \"+<number>\" or " "Matches all files from all project directories. Append \"+<number>\" or "
"\":<number>\" to jump to the given line number. Append another " "\":<number>\" to jump to the given line number. Append another "
"\"+<number>\" or \":<number>\" to jump to the column number as well.")); "\"+<number>\" or \":<number>\" to jump to the column number as well."));
ProjectManager *projectManager = ProjectManager::instance();
QTC_ASSERT(projectManager, return);
connect(projectManager, &ProjectManager::projectAdded, this, [this](Project *project) {
addDirectory(project->projectDirectory());
});
connect(projectManager, &ProjectManager::projectRemoved, this, [this](Project *project) {
removeDirectory(project->projectDirectory());
});
} }
const char kDirectoriesKey[] = "directories"; const char kDirectoriesKey[] = "directories";