diff options
17 files changed, 6 insertions, 154 deletions
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp index 59d28279d4..8ca11df47b 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp @@ -66,20 +66,6 @@ ArtisticStyleOptionsPageWidget::~ArtisticStyleOptionsPageWidget() delete ui; } -QString ArtisticStyleOptionsPageWidget::searchKeywords() const -{ - QString keywords; - const QLatin1Char sep(' '); - QTextStream(&keywords) << sep << ui->configuration->title() - << sep << ui->commandLabel->text() - << sep << ui->options->title() - << sep << ui->useOtherFiles->text() - << sep << ui->useHomeFile->text() - << sep << ui->useCustomStyle->text(); - keywords.remove(QLatin1Char('&')); - return keywords; -} - void ArtisticStyleOptionsPageWidget::restore() { ui->command->setPath(m_settings->command()); @@ -104,8 +90,7 @@ void ArtisticStyleOptionsPageWidget::apply() ArtisticStyleOptionsPage::ArtisticStyleOptionsPage(ArtisticStyleSettings *settings, QObject *parent) : IOptionsPage(parent), m_widget(0), - m_settings(settings), - m_searchKeywords() + m_settings(settings) { setId(Constants::ArtisticStyle::OPTION_ID); setDisplayName(tr("Artistic Style")); @@ -118,11 +103,8 @@ QWidget *ArtisticStyleOptionsPage::widget() { m_settings->read(); - if (!m_widget) { + if (!m_widget) m_widget = new ArtisticStyleOptionsPageWidget(m_settings); - if (m_searchKeywords.isEmpty()) - m_searchKeywords = m_widget->searchKeywords(); - } m_widget->restore(); return m_widget; @@ -138,11 +120,6 @@ void ArtisticStyleOptionsPage::finish() { } -bool ArtisticStyleOptionsPage::matches(const QString &searchKeyWord) const -{ - return m_searchKeywords.contains(searchKeyWord, Qt::CaseInsensitive); -} - } // namespace ArtisticStyle } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h index 1ac90ad369..95ee9be84d 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h +++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.h @@ -51,7 +51,6 @@ class ArtisticStyleOptionsPageWidget : public QWidget public: explicit ArtisticStyleOptionsPageWidget(ArtisticStyleSettings *settings, QWidget *parent = 0); virtual ~ArtisticStyleOptionsPageWidget(); - QString searchKeywords() const; void restore(); void apply(); @@ -69,12 +68,10 @@ public: QWidget *widget() QTC_OVERRIDE; void apply() QTC_OVERRIDE; void finish() QTC_OVERRIDE; - bool matches(const QString &searchKeywords) const QTC_OVERRIDE; private: QPointer<ArtisticStyleOptionsPageWidget> m_widget; ArtisticStyleSettings *m_settings; - QString m_searchKeywords; }; } // namespace ArtisticStyle diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp index 6dbc167435..6834e2a742 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp @@ -65,20 +65,6 @@ ClangFormatOptionsPageWidget::~ClangFormatOptionsPageWidget() delete ui; } -QString ClangFormatOptionsPageWidget::searchKeywords() const -{ - QString keywords; - const QLatin1Char sep(' '); - QTextStream(&keywords) << sep << ui->configuration->title() - << sep << ui->commandLabel->text() - << sep << ui->options->title() - << sep << ui->usePredefinedStyle->text() - << sep << ui->useCustomizedStyle->text() - << sep << ui->formatEntireFileFallback->text(); - keywords.remove(QLatin1Char('&')); - return keywords; -} - void ClangFormatOptionsPageWidget::restore() { ui->command->setPath(m_settings->command()); @@ -110,8 +96,7 @@ void ClangFormatOptionsPageWidget::apply() ClangFormatOptionsPage::ClangFormatOptionsPage(ClangFormatSettings *settings, QObject *parent) : IOptionsPage(parent), m_widget(0), - m_settings(settings), - m_searchKeywords() + m_settings(settings) { setId(Constants::ClangFormat::OPTION_ID); setDisplayName(tr("Clang Format")); @@ -124,11 +109,8 @@ QWidget *ClangFormatOptionsPage::widget() { m_settings->read(); - if (!m_widget) { + if (!m_widget) m_widget = new ClangFormatOptionsPageWidget(m_settings); - if (m_searchKeywords.isEmpty()) - m_searchKeywords = m_widget->searchKeywords(); - } m_widget->restore(); return m_widget; @@ -144,11 +126,6 @@ void ClangFormatOptionsPage::finish() { } -bool ClangFormatOptionsPage::matches(const QString &searchKeyWord) const -{ - return m_searchKeywords.contains(searchKeyWord, Qt::CaseInsensitive); -} - } // namespace ClangFormat } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.h b/src/plugins/beautifier/clangformat/clangformatoptionspage.h index 777037a14a..25c0001d76 100644 --- a/src/plugins/beautifier/clangformat/clangformatoptionspage.h +++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.h @@ -51,7 +51,6 @@ class ClangFormatOptionsPageWidget : public QWidget public: explicit ClangFormatOptionsPageWidget(ClangFormatSettings *settings, QWidget *parent = 0); virtual ~ClangFormatOptionsPageWidget(); - QString searchKeywords() const; void restore(); void apply(); @@ -69,12 +68,10 @@ public: QWidget *widget() QTC_OVERRIDE; void apply() QTC_OVERRIDE; void finish() QTC_OVERRIDE; - bool matches(const QString &searchKeywords) const QTC_OVERRIDE; private: QPointer<ClangFormatOptionsPageWidget> m_widget; ClangFormatSettings *m_settings; - QString m_searchKeywords; }; } // namespace ClangFormat diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp index 8bc8833189..f76b3507c9 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp @@ -66,20 +66,6 @@ UncrustifyOptionsPageWidget::~UncrustifyOptionsPageWidget() delete ui; } -QString UncrustifyOptionsPageWidget::searchKeywords() const -{ - QString keywords; - const QLatin1Char sep(' '); - QTextStream(&keywords) << sep << ui->configuration->title() - << sep << ui->commandLabel->text() - << sep << ui->options->title() - << sep << ui->useOtherFiles->text() - << sep << ui->useHomeFile->text() - << sep << ui->useCustomStyle->text(); - keywords.remove(QLatin1Char('&')); - return keywords; -} - void UncrustifyOptionsPageWidget::restore() { ui->command->setPath(m_settings->command()); @@ -104,8 +90,7 @@ void UncrustifyOptionsPageWidget::apply() UncrustifyOptionsPage::UncrustifyOptionsPage(UncrustifySettings *settings, QObject *parent) : IOptionsPage(parent), m_widget(0), - m_settings(settings), - m_searchKeywords() + m_settings(settings) { setId(Constants::Uncrustify::OPTION_ID); setDisplayName(tr("Uncrustify")); @@ -118,11 +103,8 @@ QWidget *UncrustifyOptionsPage::widget() { m_settings->read(); - if (!m_widget) { + if (!m_widget) m_widget = new UncrustifyOptionsPageWidget(m_settings); - if (m_searchKeywords.isEmpty()) - m_searchKeywords = m_widget->searchKeywords(); - } m_widget->restore(); return m_widget; @@ -138,11 +120,6 @@ void UncrustifyOptionsPage::finish() { } -bool UncrustifyOptionsPage::matches(const QString &searchKeyWord) const -{ - return m_searchKeywords.contains(searchKeyWord, Qt::CaseInsensitive); -} - } // namespace Uncrustify } // namespace Internal } // namespace Beautifier diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h index 125862c0e9..e552ce9a72 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h +++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.h @@ -51,7 +51,6 @@ class UncrustifyOptionsPageWidget : public QWidget public: explicit UncrustifyOptionsPageWidget(UncrustifySettings *settings, QWidget *parent = 0); virtual ~UncrustifyOptionsPageWidget(); - QString searchKeywords() const; void restore(); void apply(); @@ -69,12 +68,10 @@ public: QWidget *widget() QTC_OVERRIDE; void apply() QTC_OVERRIDE; void finish() QTC_OVERRIDE; - bool matches(const QString &searchKeywords) const QTC_OVERRIDE; private: QPointer<UncrustifyOptionsPageWidget> m_widget; UncrustifySettings *m_settings; - QString m_searchKeywords; }; } // namespace Uncrustify diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp index 8e51d5dbd8..156cdb720b 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp @@ -448,21 +448,6 @@ ExternalToolConfig::~ExternalToolConfig() delete ui; } -QString ExternalToolConfig::searchKeywords() const -{ - QString keywords; - QTextStream(&keywords) - << ui->descriptionLabel->text() - << ui->executableLabel->text() - << ui->argumentsLabel->text() - << ui->workingDirectoryLabel->text() - << ui->outputLabel->text() - << ui->errorOutputLabel->text() - << ui->modifiesDocumentCheckbox->text() - << ui->inputLabel->text(); - return keywords; -} - void ExternalToolConfig::setTools(const QMap<QString, QList<ExternalTool *> > &tools) { QMap<QString, QList<ExternalTool *> > toolsCopy; diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.h b/src/plugins/coreplugin/dialogs/externaltoolconfig.h index 04951535df..33609e5c24 100644 --- a/src/plugins/coreplugin/dialogs/externaltoolconfig.h +++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.h @@ -94,8 +94,6 @@ public: QMap<QString, QList<ExternalTool *> > tools() const; void apply(); - QString searchKeywords() const; - private slots: void handleCurrentChanged(const QModelIndex &now, const QModelIndex &previous); void showInfoForItem(const QModelIndex &index); diff --git a/src/plugins/cpaster/settingspage.cpp b/src/plugins/cpaster/settingspage.cpp index f1df7d4bf9..f135227312 100644 --- a/src/plugins/cpaster/settingspage.cpp +++ b/src/plugins/cpaster/settingspage.cpp @@ -45,15 +45,6 @@ SettingsWidget::SettingsWidget(const QStringList &protocols, QWidget *parent) : m_ui.defaultProtocol->addItems(protocols); } -QString SettingsWidget::searchKeywords() const -{ - QString rc; - QTextStream(&rc) << m_ui.protocolLabel->text() << ' ' - << m_ui.userNameLabel->text(); - rc.remove(QLatin1Char('&')); - return rc; -} - void SettingsWidget::setSettings(const Settings &settings) { m_ui.userEdit->setText(settings.username); diff --git a/src/plugins/cpaster/settingspage.h b/src/plugins/cpaster/settingspage.h index 98f19a19db..d841b2c94c 100644 --- a/src/plugins/cpaster/settingspage.h +++ b/src/plugins/cpaster/settingspage.h @@ -52,8 +52,6 @@ public: void setSettings(const Settings &); Settings settings(); - QString searchKeywords() const; - private: Internal::Ui::SettingsPage m_ui; }; diff --git a/src/plugins/git/settingspage.h b/src/plugins/git/settingspage.h index f2ca8dc396..4e9f5b54dd 100644 --- a/src/plugins/git/settingspage.h +++ b/src/plugins/git/settingspage.h @@ -70,7 +70,6 @@ public: void finish(); private: - QString m_searchKeywords; QPointer<SettingsPageWidget> m_widget; }; diff --git a/src/plugins/perforce/settingspage.cpp b/src/plugins/perforce/settingspage.cpp index 2391d5bd5d..babcb96a75 100644 --- a/src/plugins/perforce/settingspage.cpp +++ b/src/plugins/perforce/settingspage.cpp @@ -116,27 +116,6 @@ void SettingsPageWidget::setStatusError(const QString &t) m_ui.errorLabel->setText(t); } -QString SettingsPageWidget::searchKeywords() const -{ - QString rc; - QLatin1Char sep(' '); - QTextStream(&rc) - << sep << m_ui.configGroupBox->title() - << sep << m_ui.commandLabel->text() - << sep << m_ui.environmentGroupBox->title() - << sep << m_ui.portLabel->text() - << sep << m_ui.clientLabel->text() - << sep << m_ui.userLabel->text() - << sep << m_ui.miscGroupBox->title() - << sep << m_ui.logCountLabel->text() - << sep << m_ui.timeOutLabel->text() - << sep << m_ui.promptToSubmitCheckBox->text() - << sep << m_ui.autoOpenCheckBox->text() - ; - rc.remove(QLatin1Char('&')); - return rc; -} - SettingsPage::SettingsPage() { setId(VcsBase::Constants::VCS_ID_PERFORCE); diff --git a/src/plugins/perforce/settingspage.h b/src/plugins/perforce/settingspage.h index 75e68e5642..e454dd84c3 100644 --- a/src/plugins/perforce/settingspage.h +++ b/src/plugins/perforce/settingspage.h @@ -54,8 +54,6 @@ public: void setSettings(const PerforceSettings &); Settings settings() const; - QString searchKeywords() const; - private slots: void slotTest(); void setStatusText(const QString &); diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp index 5c35fb149e..eb79641f08 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.cpp @@ -109,16 +109,6 @@ DeviceSettingsWidget::~DeviceSettingsWidget() delete m_ui; } -QString DeviceSettingsWidget::searchKeywords() const -{ - QString rc; - QTextStream(&rc) << m_ui->configurationLabel->text() - << ' ' << m_ui->deviceNameLabel->text() - << ' ' << m_ui->nameLineEdit->text() - << ' ' << m_ui->autoDetectionKeyLabel->text(); - return rc.remove(QLatin1Char('&')); -} - void DeviceSettingsWidget::initGui() { m_ui->setupUi(this); diff --git a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h index 1d25a6e4c0..1dabc1e8ab 100644 --- a/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h +++ b/src/plugins/projectexplorer/devicesupport/devicesettingswidget.h @@ -59,7 +59,6 @@ public: ~DeviceSettingsWidget(); void saveSettings(); - QString searchKeywords() const; private slots: void handleDeviceUpdated(Core::Id id); diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp index 65c17aa236..c656fd909c 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.cpp +++ b/src/plugins/texteditor/codestyleselectorwidget.cpp @@ -432,10 +432,4 @@ QString CodeStyleSelectorWidget::displayName(ICodeStylePreferences *codeStyle) c return name; } -QString CodeStyleSelectorWidget::searchKeywords() const -{ - // no useful keywords here - return QString(); -} - #include "codestyleselectorwidget.moc" diff --git a/src/plugins/texteditor/codestyleselectorwidget.h b/src/plugins/texteditor/codestyleselectorwidget.h index f9ba7ce236..37f08cae00 100644 --- a/src/plugins/texteditor/codestyleselectorwidget.h +++ b/src/plugins/texteditor/codestyleselectorwidget.h @@ -57,7 +57,6 @@ public: ~CodeStyleSelectorWidget(); void setCodeStyle(TextEditor::ICodeStylePreferences *codeStyle); - QString searchKeywords() const; private slots: void slotComboBoxActivated(int index); |