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

BaseFileFind: Make some methods static

Browse Source 
Change-Id: I2cf75aabec2f44278c52e2bcff8a5278678517f3
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2016-11-29 12:03:46 +01:00
parent a016c7f4f4
commit 6d08973ced
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/texteditor/basefilefind.cpp
View File

@@ -125,6 +125,29 @@ public:
} // namespace Internal } // namespace Internal
static void syncComboWithSettings(QComboBox *combo, const QString &setting)
{
if (!combo)
return;
int index = combo->findText(setting);
if (index < 0)
combo->setEditText(setting);
else
combo->setCurrentIndex(index);
}
static void updateComboEntries(QComboBox *combo, bool onTop)
{
int index = combo->findText(combo->currentText());
if (index < 0) {
if (onTop)
combo->insertItem(0, combo->currentText());
else
combo->addItem(combo->currentText());
combo->setCurrentIndex(combo->findText(combo->currentText()));
}
}
using namespace Internal; using namespace Internal;
SearchEngine::SearchEngine() SearchEngine::SearchEngine()
@@ -390,29 +413,6 @@ void BaseFileFind::readCommonSettings(QSettings *settings, const QString &defaul
syncSearchEngineCombo(currentSearchEngineIndex); syncSearchEngineCombo(currentSearchEngineIndex);
} }
void BaseFileFind::syncComboWithSettings(QComboBox *combo, const QString &setting)
{
if (!combo)
return;
int index = combo->findText(setting);
if (index < 0)
combo->setEditText(setting);
else
combo->setCurrentIndex(index);
}
void BaseFileFind::updateComboEntries(QComboBox *combo, bool onTop)
{
int index = combo->findText(combo->currentText());
if (index < 0) {
if (onTop)
combo->insertItem(0, combo->currentText());
else
combo->addItem(combo->currentText());
combo->setCurrentIndex(combo->findText(combo->currentText()));
}
}
void BaseFileFind::openEditor(const SearchResultItem &item) void BaseFileFind::openEditor(const SearchResultItem &item)
{ {
SearchResult *result = qobject_cast<SearchResult *>(sender()); SearchResult *result = qobject_cast<SearchResult *>(sender());
@@ -540,7 +540,7 @@ QVariant BaseFileFind::getAdditionalParameters(SearchResult *search)
QFuture<FileSearchResultList> BaseFileFind::executeSearch(const FileFindParameters &parameters) QFuture<FileSearchResultList> BaseFileFind::executeSearch(const FileFindParameters &parameters)
{ {
return d->m_searchEngines[parameters.searchEngineIndex]->executeSearch(parameters,this); return d->m_searchEngines[parameters.searchEngineIndex]->executeSearch(parameters, this);
} }
namespace Internal { namespace Internal {

4
src/plugins/texteditor/basefilefind.h
View File

@@ -115,7 +115,7 @@ public:
protected: protected:
virtual QVariant additionalParameters() const = 0; virtual QVariant additionalParameters() const = 0;
QVariant getAdditionalParameters(Core::SearchResult *search); static QVariant getAdditionalParameters(Core::SearchResult *search);
virtual QString label() const = 0; // see Core::SearchResultWindow::startNewSearch virtual QString label() const = 0; // see Core::SearchResultWindow::startNewSearch
virtual QString toolTip() const = 0; // see Core::SearchResultWindow::startNewSearch, virtual QString toolTip() const = 0; // see Core::SearchResultWindow::startNewSearch,
// add %1 placeholder where the find flags should be put // add %1 placeholder where the find flags should be put
@@ -124,8 +124,6 @@ protected:
void writeCommonSettings(QSettings *settings); void writeCommonSettings(QSettings *settings);
void readCommonSettings(QSettings *settings, const QString &defaultFilter); void readCommonSettings(QSettings *settings, const QString &defaultFilter);
QWidget *createPatternWidget(); QWidget *createPatternWidget();
void syncComboWithSettings(QComboBox *combo, const QString &setting);
void updateComboEntries(QComboBox *combo, bool onTop);
QStringList fileNameFilters() const; QStringList fileNameFilters() const;
SearchEngine *currentSearchEngine() const; SearchEngine *currentSearchEngine() const;