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

BaseFileFind: Make searchDir() non-virtual

Browse Source 
Replace FindInFiles::pathChanged() with
BaseFileFind::searchDirChanged().

Change-Id: I3cbe507968391fe45f513490424a7fe6fbbffee1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2023-06-28 23:55:16 +02:00
parent bf09d17992
commit 7a28ed76b8
5 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/texteditor/findinfiles.cpp
View File

@@ -147,7 +147,8 @@ QWidget *FindInFiles::createConfigWidget()
m_directory->setExpectedKind(PathChooser::ExistingDirectory);
m_directory->setPromptDialogTitle(Tr::tr("Directory to Search"));
connect(m_directory.data(), &PathChooser::textChanged, this,
[this] { pathChanged(m_directory->filePath()); });
[this] { setSearchDir(m_directory->filePath()); });
connect(this, &BaseFileFind::searchDirChanged, m_directory, &PathChooser::setFilePath);
m_directory->setHistoryCompleter(QLatin1String(HistoryKey),
/*restoreLastItemFromHistory=*/ true);
if (!HistoryCompleter::historyExistsFor(QLatin1String(HistoryKey))) {
@@ -181,11 +182,6 @@ QWidget *FindInFiles::createConfigWidget()
return m_configWidget;
}
FilePath FindInFiles::searchDir() const
{
return m_directory->filePath();
}
void FindInFiles::writeSettings(QSettings *settings)
{
settings->beginGroup(QLatin1String("FindInFiles"));
@@ -200,27 +196,17 @@ void FindInFiles::readSettings(QSettings *settings)
settings->endGroup();
}
void FindInFiles::setDirectory(const FilePath &directory)
{
m_directory->setFilePath(directory);
}
void FindInFiles::setBaseDirectory(const FilePath &directory)
{
m_directory->setBaseDirectory(directory);
}
FilePath FindInFiles::directory() const
{
return m_directory->filePath();
}
void FindInFiles::findOnFileSystem(const QString &path)
{
QTC_ASSERT(m_instance, return);
const QFileInfo fi(path);
const QString folder = fi.isDir() ? fi.absoluteFilePath() : fi.absolutePath();
m_instance->setDirectory(FilePath::fromString(folder));
m_instance->setSearchDir(FilePath::fromString(folder));
Find::openFindDialog(m_instance);
}