diff options
author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-06-28 23:55:16 +0200 |
---|---|---|
committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2023-07-06 18:45:26 +0000 |
commit | 7a28ed76b83f66e0b08290ac10bd40ebe92d1972 (patch) | |
tree | ca5e64198551af930b85bacd4ce9665975bdc8f3 /src/plugins/texteditor/findinfiles.cpp | |
parent | bf09d179928c29983b4d18d1eef506615ac24234 (diff) |
BaseFileFind: Make searchDir() non-virtual
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>
Diffstat (limited to 'src/plugins/texteditor/findinfiles.cpp')
-rw-r--r-- | src/plugins/texteditor/findinfiles.cpp | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/src/plugins/texteditor/findinfiles.cpp b/src/plugins/texteditor/findinfiles.cpp index 89a4c0763b..29c769d2d3 100644 --- a/src/plugins/texteditor/findinfiles.cpp +++ b/src/plugins/texteditor/findinfiles.cpp @@ -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); } |