summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/coreplugin')
-rw-r--r--src/plugins/coreplugin/dialogs/externaltoolconfig.cpp7
-rw-r--r--src/plugins/coreplugin/find/findplugin.cpp15
-rw-r--r--src/plugins/coreplugin/find/findtoolbar.cpp3
-rw-r--r--src/plugins/coreplugin/iwizardfactory.cpp3
-rw-r--r--src/plugins/coreplugin/locator/filesystemfilter.cpp4
-rw-r--r--src/plugins/coreplugin/sidebarwidget.cpp6
6 files changed, 20 insertions, 18 deletions
diff --git a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
index 1b7619cba3..2cce88ec24 100644
--- a/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
+++ b/src/plugins/coreplugin/dialogs/externaltoolconfig.cpp
@@ -550,9 +550,10 @@ void ExternalToolConfig::showInfoForItem(const QModelIndex &index)
ui->modifiesDocumentCheckbox->setChecked(tool->modifiesCurrentDocument());
m_environment = tool->environment();
- bool blocked = ui->inputText->blockSignals(true);
- ui->inputText->setPlainText(tool->input());
- ui->inputText->blockSignals(blocked);
+ {
+ QSignalBlocker blocker(ui->inputText);
+ ui->inputText->setPlainText(tool->input());
+ }
ui->description->setCursorPosition(0);
ui->arguments->setCursorPosition(0);
diff --git a/src/plugins/coreplugin/find/findplugin.cpp b/src/plugins/coreplugin/find/findplugin.cpp
index 7509d5c0df..3ae5ce0e50 100644
--- a/src/plugins/coreplugin/find/findplugin.cpp
+++ b/src/plugins/coreplugin/find/findplugin.cpp
@@ -301,13 +301,14 @@ void FindPrivate::readSettings()
{
QSettings *settings = ICore::settings();
settings->beginGroup(QLatin1String("Find"));
- bool block = m_instance->blockSignals(true);
- Find::setBackward(settings->value(QLatin1String("Backward"), false).toBool());
- Find::setCaseSensitive(settings->value(QLatin1String("CaseSensitively"), false).toBool());
- Find::setWholeWord(settings->value(QLatin1String("WholeWords"), false).toBool());
- Find::setRegularExpression(settings->value(QLatin1String("RegularExpression"), false).toBool());
- Find::setPreserveCase(settings->value(QLatin1String("PreserveCase"), false).toBool());
- m_instance->blockSignals(block);
+ {
+ QSignalBlocker blocker(m_instance);
+ Find::setBackward(settings->value(QLatin1String("Backward"), false).toBool());
+ Find::setCaseSensitive(settings->value(QLatin1String("CaseSensitively"), false).toBool());
+ Find::setWholeWord(settings->value(QLatin1String("WholeWords"), false).toBool());
+ Find::setRegularExpression(settings->value(QLatin1String("RegularExpression"), false).toBool());
+ Find::setPreserveCase(settings->value(QLatin1String("PreserveCase"), false).toBool());
+ }
m_findCompletions = settings->value(QLatin1String("FindStrings")).toStringList();
m_replaceCompletions = settings->value(QLatin1String("ReplaceStrings")).toStringList();
m_findCompletionModel.setStringList(m_findCompletions);
diff --git a/src/plugins/coreplugin/find/findtoolbar.cpp b/src/plugins/coreplugin/find/findtoolbar.cpp
index 8b9016d8f2..ba619cfa30 100644
--- a/src/plugins/coreplugin/find/findtoolbar.cpp
+++ b/src/plugins/coreplugin/find/findtoolbar.cpp
@@ -637,9 +637,8 @@ void FindToolBar::putSelectionToFindClipboard()
void FindToolBar::updateFromFindClipboard()
{
if (QApplication::clipboard()->supportsFindBuffer()) {
- const bool blocks = m_ui.findEdit->blockSignals(true);
+ QSignalBlocker blocker(m_ui.findEdit);
setFindText(QApplication::clipboard()->text(QClipboard::FindBuffer));
- m_ui.findEdit->blockSignals(blocks);
}
}
diff --git a/src/plugins/coreplugin/iwizardfactory.cpp b/src/plugins/coreplugin/iwizardfactory.cpp
index 8e8afc304f..2b74a17118 100644
--- a/src/plugins/coreplugin/iwizardfactory.cpp
+++ b/src/plugins/coreplugin/iwizardfactory.cpp
@@ -280,7 +280,8 @@ Utils::Wizard *IWizardFactory::runWizard(const QString &path, QWidget *parent, I
if (wizard) {
s_currentWizard = wizard;
// Connect while wizard exists:
- connect(m_action, &QAction::triggered, wizard, [wizard]() { ICore::raiseWindow(wizard); });
+ if (m_action)
+ connect(m_action, &QAction::triggered, wizard, [wizard]() { ICore::raiseWindow(wizard); });
connect(s_inspectWizardAction, &QAction::triggered,
wizard, [wizard]() { wizard->showVariables(); });
connect(wizard, &Utils::Wizard::finished, this, [wizard](int result) {
diff --git a/src/plugins/coreplugin/locator/filesystemfilter.cpp b/src/plugins/coreplugin/locator/filesystemfilter.cpp
index 7a4be1eee9..60633022a8 100644
--- a/src/plugins/coreplugin/locator/filesystemfilter.cpp
+++ b/src/plugins/coreplugin/locator/filesystemfilter.cpp
@@ -87,7 +87,7 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF
directory.prepend(m_currentDocumentDirectory + "/");
}
QDir dirInfo(directory);
- QDir::Filters dirFilter = QDir::Dirs|QDir::Drives|QDir::NoDot;
+ QDir::Filters dirFilter = QDir::Dirs|QDir::Drives|QDir::NoDot|QDir::NoDotDot;
QDir::Filters fileFilter = QDir::Files;
if (m_includeHidden) {
dirFilter |= QDir::Hidden;
@@ -100,6 +100,8 @@ QList<LocatorFilterEntry> FileSystemFilter::matchesFor(QFutureInterface<LocatorF
QDir::Name|QDir::IgnoreCase|QDir::LocaleAware);
QStringList files = dirInfo.entryList(fileFilter,
QDir::Name|QDir::IgnoreCase|QDir::LocaleAware);
+ dirs.prepend("..");
+
foreach (const QString &dir, dirs) {
if (future.isCanceled())
break;
diff --git a/src/plugins/coreplugin/sidebarwidget.cpp b/src/plugins/coreplugin/sidebarwidget.cpp
index 82c2e9ff4a..7982214a37 100644
--- a/src/plugins/coreplugin/sidebarwidget.cpp
+++ b/src/plugins/coreplugin/sidebarwidget.cpp
@@ -128,9 +128,8 @@ void SideBarWidget::setCurrentItem(const QString &id)
if (idx < 0)
idx = 0;
- bool blocked = m_comboBox->blockSignals(true);
+ QSignalBlocker blocker(m_comboBox);
m_comboBox->setCurrentIndex(idx);
- m_comboBox->blockSignals(blocked);
}
SideBarItem *item = m_sideBar->item(id);
@@ -149,7 +148,7 @@ void SideBarWidget::setCurrentItem(const QString &id)
void SideBarWidget::updateAvailableItems()
{
- bool blocked = m_comboBox->blockSignals(true);
+ QSignalBlocker blocker(m_comboBox);
QString currentTitle = m_comboBox->currentText();
m_comboBox->clear();
QStringList titleList = m_sideBar->availableItemTitles();
@@ -167,7 +166,6 @@ void SideBarWidget::updateAvailableItems()
m_comboBox->setCurrentIndex(idx);
m_splitAction->setEnabled(titleList.count() > 1);
- m_comboBox->blockSignals(blocked);
}
void SideBarWidget::removeCurrentItem()
View Lorry Controller Status