diff options
author | Alessandro Portale <[email protected]> | 2019-01-16 18:06:21 +0100 |
---|---|---|
committer | Alessandro Portale <[email protected]> | 2019-01-17 15:54:56 +0000 |
commit | 616e19ff9e91a9ce8a1ee379553f9325beed035d (patch) | |
tree | 95ec85f7d1993fae787e2668434df8ea1f13deac /src | |
parent | 710e57a628c90259297150ab3a0ac28e315ca1af (diff) |
Fix warning: "Missing emit keyword on signal call"
[-Wclazy-incorrect-emit]
Change-Id: I93bdc6e23cdaccf35c9899ae16870ccc65a54f80
Reviewed-by: Tim Jenssen <[email protected]>
Diffstat (limited to 'src')
42 files changed, 97 insertions, 93 deletions
diff --git a/src/libs/qmldebug/qmldebugconnection.cpp b/src/libs/qmldebug/qmldebugconnection.cpp index 996896444e9..6664df2b99b 100644 --- a/src/libs/qmldebug/qmldebugconnection.cpp +++ b/src/libs/qmldebug/qmldebugconnection.cpp @@ -399,7 +399,7 @@ void QmlDebugConnection::newConnection() connect(socket, &QLocalSocket::stateChanged, this, [this](QLocalSocket::LocalSocketState state) { - logStateChange(socketStateToString(static_cast<QAbstractSocket::SocketState>(state))); + emit logStateChange(socketStateToString(static_cast<QAbstractSocket::SocketState>(state))); }); socketConnected(); diff --git a/src/libs/qmleditorwidgets/contextpanewidget.cpp b/src/libs/qmleditorwidgets/contextpanewidget.cpp index f1d1bccf9c0..d09902be1b5 100644 --- a/src/libs/qmleditorwidgets/contextpanewidget.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidget.cpp @@ -391,7 +391,7 @@ void ContextPaneWidget::onShowColorDialog(bool checked, const QPoint &p) void ContextPaneWidget::onDisable(bool b) { - enabledChanged(b); + emit enabledChanged(b); if (!b) { hide(); colorDialog()->hide(); @@ -491,7 +491,7 @@ void ContextPaneWidget::setPinButton() m_toolButton->setFixedSize(20, 20); m_toolButton->setToolTip(tr("Unpins the toolbar and moves it to the default position.")); - pinnedChanged(true); + emit pinnedChanged(true); if (m_resetAction) { QSignalBlocker blocker(m_resetAction); m_resetAction->setChecked(true); @@ -508,7 +508,7 @@ void ContextPaneWidget::setLineButton() m_toolButton->setToolTip(tr("Hides this toolbar. This toolbar can be" " permanently disabled in the options page or in the context menu.")); - pinnedChanged(false); + emit pinnedChanged(false); if (m_resetAction) { QSignalBlocker blocker(m_resetAction); m_resetAction->setChecked(false); diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp index 1490395412f..dcc3e9ecc66 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp @@ -380,7 +380,7 @@ void ContextPaneWidgetImage::onPixmapDoubleClicked() void ContextPaneWidgetImage::onLeftMarginsChanged() { if (previewDialog()->previewLabel()->leftMarging()) - propertyChanged(QLatin1String("border.left"), previewDialog()->previewLabel()->leftMarging()); + emit propertyChanged("border.left", previewDialog()->previewLabel()->leftMarging()); else emit removeProperty(QLatin1String("border.left")); } @@ -388,7 +388,7 @@ void ContextPaneWidgetImage::onLeftMarginsChanged() void ContextPaneWidgetImage::onRightMarginsChanged() { if (previewDialog()->previewLabel()->rightMarging()) - propertyChanged(QLatin1String("border.right"), previewDialog()->previewLabel()->rightMarging()); + emit propertyChanged("border.right", previewDialog()->previewLabel()->rightMarging()); else emit removeProperty(QLatin1String("border.right")); @@ -398,7 +398,7 @@ void ContextPaneWidgetImage::onRightMarginsChanged() void ContextPaneWidgetImage::onTopMarginsChanged() { if (previewDialog()->previewLabel()->topMarging()) - propertyChanged(QLatin1String("border.top"), previewDialog()->previewLabel()->topMarging()); + emit propertyChanged("border.top", previewDialog()->previewLabel()->topMarging()); else emit removeProperty(QLatin1String("border.top")); } @@ -406,7 +406,7 @@ void ContextPaneWidgetImage::onTopMarginsChanged() void ContextPaneWidgetImage::onBottomMarginsChanged() { if (previewDialog()->previewLabel()->bottomMarging()) - propertyChanged(QLatin1String("border.bottom"), previewDialog()->previewLabel()->bottomMarging()); + emit propertyChanged("border.bottom", previewDialog()->previewLabel()->bottomMarging()); else emit removeProperty(QLatin1String("border.bottom")); diff --git a/src/libs/utils/shellcommand.cpp b/src/libs/utils/shellcommand.cpp index 0d5be90996e..14f52d2539a 100644 --- a/src/libs/utils/shellcommand.cpp +++ b/src/libs/utils/shellcommand.cpp @@ -336,7 +336,7 @@ SynchronousProcessResponse ShellCommand::runCommand(const FileName &binary, QSharedPointer<OutputProxy> proxy(d->m_proxyFactory()); if (!(d->m_flags & SuppressCommandLogging)) - proxy->appendCommand(dir, binary, arguments); + emit proxy->appendCommand(dir, binary, arguments); if ((d->m_flags & FullySynchronously) || (!(d->m_flags & NoFullySync) @@ -350,9 +350,9 @@ SynchronousProcessResponse ShellCommand::runCommand(const FileName &binary, // Success/Fail message in appropriate window? if (response.result == SynchronousProcessResponse::Finished) { if (d->m_flags & ShowSuccessMessage) - proxy->appendMessage(response.exitMessage(binary.toUserOutput(), timeoutS)); + emit proxy->appendMessage(response.exitMessage(binary.toUserOutput(), timeoutS)); } else if (!(d->m_flags & SuppressFailMessage)) { - proxy->appendError(response.exitMessage(binary.toUserOutput(), timeoutS)); + emit proxy->appendError(response.exitMessage(binary.toUserOutput(), timeoutS)); } } @@ -385,14 +385,14 @@ SynchronousProcessResponse ShellCommand::runFullySynchronous(const FileName &bin if (!d->m_aborted) { const QString stdErr = resp.stdErr(); if (!stdErr.isEmpty() && !(d->m_flags & SuppressStdErr)) - proxy->append(stdErr); + emit proxy->append(stdErr); const QString stdOut = resp.stdOut(); if (!stdOut.isEmpty() && d->m_flags & ShowStdOut) { if (d->m_flags & SilentOutput) - proxy->appendSilently(stdOut); + emit proxy->appendSilently(stdOut); else - proxy->append(stdOut); + emit proxy->append(stdOut); } } @@ -430,7 +430,7 @@ SynchronousProcessResponse ShellCommand::runSynchronous(const FileName &binary, if (d->m_progressParser) d->m_progressParser->parseProgress(text); if (!(d->m_flags & SuppressStdErr)) - proxy->appendError(text); + emit proxy->appendError(text); if (d->m_progressiveOutput) emit stdErrText(text); }); @@ -445,7 +445,7 @@ SynchronousProcessResponse ShellCommand::runSynchronous(const FileName &binary, if (d->m_progressParser) d->m_progressParser->parseProgress(text); if (d->m_flags & ShowStdOut) - proxy->append(text); + emit proxy->append(text); if (d->m_progressiveOutput) { emit stdOutText(text); d->m_hadOutput = true; diff --git a/src/libs/utils/treemodel.cpp b/src/libs/utils/treemodel.cpp index 0d587dddbc7..1f8fbd57560 100644 --- a/src/libs/utils/treemodel.cpp +++ b/src/libs/utils/treemodel.cpp @@ -748,7 +748,8 @@ void TreeItem::update() { if (m_model) { QModelIndex idx = index(); - m_model->dataChanged(idx.sibling(idx.row(), 0), idx.sibling(idx.row(), m_model->m_columnCount - 1)); + emit m_model->dataChanged(idx.sibling(idx.row(), 0), + idx.sibling(idx.row(), m_model->m_columnCount - 1)); } } @@ -756,7 +757,7 @@ void TreeItem::updateAll() { if (m_model) { QModelIndex idx = index(); - m_model->dataChanged(idx, idx.sibling(idx.row(), m_model->m_columnCount - 1)); + emit m_model->dataChanged(idx, idx.sibling(idx.row(), m_model->m_columnCount - 1)); for (TreeItem *item : *this) item->updateAll(); } @@ -766,7 +767,7 @@ void TreeItem::updateColumn(int column) { if (m_model) { QModelIndex idx = index(); - m_model->dataChanged(idx.sibling(idx.row(), column), idx.sibling(idx.row(), column)); + emit m_model->dataChanged(idx.sibling(idx.row(), column), idx.sibling(idx.row(), column)); } } @@ -893,13 +894,13 @@ void TreeItem::removeItemAt(int pos) void TreeItem::expand() { QTC_ASSERT(m_model, return); - m_model->requestExpansion(index()); + emit m_model->requestExpansion(index()); } void TreeItem::collapse() { QTC_ASSERT(m_model, return); - m_model->requestCollapse(index()); + emit m_model->requestCollapse(index()); } void TreeItem::propagateModel(BaseTreeModel *m) diff --git a/src/plugins/android/androidbuildapkstep.cpp b/src/plugins/android/androidbuildapkstep.cpp index 5952e8a80e4..004484867d7 100644 --- a/src/plugins/android/androidbuildapkstep.cpp +++ b/src/plugins/android/androidbuildapkstep.cpp @@ -289,8 +289,8 @@ void AndroidBuildApkStep::processFinished(int exitCode, QProcess::ExitStatus sta bool AndroidBuildApkStep::verifyKeystorePassword() { if (!m_keystorePath.exists()) { - addOutput(tr("Cannot sign the package. Invalid keystore path (%1).") - .arg(m_keystorePath.toString()), OutputFormat::ErrorMessage); + emit addOutput(tr("Cannot sign the package. Invalid keystore path (%1).") + .arg(m_keystorePath.toString()), OutputFormat::ErrorMessage); return false; } @@ -309,8 +309,8 @@ bool AndroidBuildApkStep::verifyCertificatePassword() { if (!AndroidManager::checkCertificateExists(m_keystorePath.toString(), m_keystorePasswd, m_certificateAlias)) { - addOutput(tr("Cannot sign the package. Certificate alias %1 does not exist.") - .arg(m_certificateAlias), OutputFormat::ErrorMessage); + emit addOutput(tr("Cannot sign the package. Certificate alias %1 does not exist.") + .arg(m_certificateAlias), OutputFormat::ErrorMessage); return false; } diff --git a/src/plugins/android/androidsdkmanager.cpp b/src/plugins/android/androidsdkmanager.cpp index 85b72e2a278..e2c0453d6cc 100644 --- a/src/plugins/android/androidsdkmanager.cpp +++ b/src/plugins/android/androidsdkmanager.cpp @@ -793,14 +793,14 @@ const AndroidSdkPackageList &AndroidSdkManagerPrivate::allPackages(bool forceUpd void AndroidSdkManagerPrivate::reloadSdkPackages() { - m_sdkManager.packageReloadBegin(); + emit m_sdkManager.packageReloadBegin(); clearPackages(); lastSdkManagerPath = m_config.sdkManagerToolPath(); if (m_config.sdkToolsVersion().isNull()) { // Configuration has invalid sdk path or corrupt installation. - m_sdkManager.packageReloadFinished(); + emit m_sdkManager.packageReloadFinished(); return; } @@ -820,7 +820,7 @@ void AndroidSdkManagerPrivate::reloadSdkPackages() parser.parsePackageListing(packageListing); } } - m_sdkManager.packageReloadFinished(); + emit m_sdkManager.packageReloadFinished(); } void AndroidSdkManagerPrivate::refreshSdkPackages(bool forceReload) diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 81795057717..76e31efeefd 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -617,7 +617,7 @@ void BookmarkManager::updateActionStatus() IEditor *editor = EditorManager::currentEditor(); const bool enableToggle = editor && !editor->document()->isTemporary(); - updateActions(enableToggle, state()); + emit updateActions(enableToggle, state()); } void BookmarkManager::moveUp() diff --git a/src/plugins/classview/classviewmanager.cpp b/src/plugins/classview/classviewmanager.cpp index d00343ccb3b..06ab90783e1 100644 --- a/src/plugins/classview/classviewmanager.cpp +++ b/src/plugins/classview/classviewmanager.cpp @@ -354,7 +354,7 @@ void Manager::onProjectListChanged() return; // update to the latest state - requestTreeDataUpdate(); + emit requestTreeDataUpdate(); } /*! diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index decb0a1f767..16c5676e7e5 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -425,7 +425,7 @@ void ShortcutSettingsWidget::importAction() item->m_key = mapping.value(sid); item->m_item->setText(2, item->m_key.toString(QKeySequence::NativeText)); if (item->m_item == commandList()->currentItem()) - currentCommandChanged(item->m_item); + emit currentCommandChanged(item->m_item); if (item->m_cmd->defaultKeySequence() != item->m_key) setModified(item->m_item, true); @@ -446,7 +446,7 @@ void ShortcutSettingsWidget::defaultAction() item->m_item->setText(2, item->m_key.toString(QKeySequence::NativeText)); setModified(item->m_item, false); if (item->m_item == commandList()->currentItem()) - currentCommandChanged(item->m_item); + emit currentCommandChanged(item->m_item); } foreach (ShortcutItem *item, m_scitems) diff --git a/src/plugins/coreplugin/find/searchresulttreemodel.cpp b/src/plugins/coreplugin/find/searchresulttreemodel.cpp index bd9f482d20d..150e9dcc09e 100644 --- a/src/plugins/coreplugin/find/searchresulttreemodel.cpp +++ b/src/plugins/coreplugin/find/searchresulttreemodel.cpp @@ -71,10 +71,10 @@ void SearchResultTreeModel::setShowReplaceUI(bool show) void SearchResultTreeModel::setTextEditorFont(const QFont &font, const SearchResultColor &color) { - layoutAboutToBeChanged(); + emit layoutAboutToBeChanged(); m_textEditorFont = font; m_color = color; - layoutChanged(); + emit layoutChanged(); } Qt::ItemFlags SearchResultTreeModel::flags(const QModelIndex &idx) const @@ -355,7 +355,7 @@ void SearchResultTreeModel::addResultsToCurrentParent(const QList<SearchResultIt existingItem->setGenerated(false); existingItem->item = item; QModelIndex itemIndex = index(insertionIndex, 0, m_currentIndex); - dataChanged(itemIndex, itemIndex); + emit dataChanged(itemIndex, itemIndex); } else { beginInsertRows(m_currentIndex, insertionIndex, insertionIndex); m_currentParent->insertChild(insertionIndex, item); @@ -363,7 +363,7 @@ void SearchResultTreeModel::addResultsToCurrentParent(const QList<SearchResultIt } } } - dataChanged(m_currentIndex, m_currentIndex); // Make sure that the number after the file name gets updated + emit dataChanged(m_currentIndex, m_currentIndex); // Make sure that the number after the file name gets updated } static bool lessThanByPath(const SearchResultItem &a, const SearchResultItem &b) diff --git a/src/plugins/debugger/debuggertooltipmanager.cpp b/src/plugins/debugger/debuggertooltipmanager.cpp index aefa93e6889..9aba76fa88f 100644 --- a/src/plugins/debugger/debuggertooltipmanager.cpp +++ b/src/plugins/debugger/debuggertooltipmanager.cpp @@ -895,7 +895,7 @@ void DebuggerToolTipHolder::releaseEngine() setState(Released); widget->model.m_enabled = false; - widget->model.layoutChanged(); + emit widget->model.layoutChanged(); widget->titleLabel->setText(DebuggerToolTipManager::tr("%1 (Previous)").arg(context.expression)); } diff --git a/src/plugins/debugger/watchhandler.cpp b/src/plugins/debugger/watchhandler.cpp index b48acc8360a..ac0e573ba2f 100644 --- a/src/plugins/debugger/watchhandler.cpp +++ b/src/plugins/debugger/watchhandler.cpp @@ -1856,7 +1856,7 @@ QMenu *WatchModel::createFormatMenu(WatchItem *item, QWidget *parent) auto addBaseChangeAction = [this, menu](const QString &text, int base) { addCheckableAction(menu, text, true, theUnprintableBase == base, [this, base] { theUnprintableBase = base; - layoutChanged(); // FIXME + emit layoutChanged(); // FIXME }); }; diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index 7fabc33771a..537e47b18a8 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -796,7 +796,7 @@ void FakeVimExCommandsWidget::defaultAction() setModified(item, false); item->setText(2, regex); if (item == commandList()->currentItem()) - currentCommandChanged(item); + emit currentCommandChanged(item); } } } @@ -1933,7 +1933,7 @@ void FakeVimPluginPrivate::handleExCommand(FakeVimHandler *handler, bool *handle handler->showMessage(MessageInfo, Tr::tr("\"%1\" %2 %3L, %4C written") .arg(fileName).arg(' ').arg(ba.count('\n')).arg(ba.size())); if (cmd.cmd == "wq") - delayedQuitRequested(cmd.hasBang, m_editorToHandler.key(handler)); + emit delayedQuitRequested(cmd.hasBang, m_editorToHandler.key(handler)); } } } diff --git a/src/plugins/ios/iostoolhandler.cpp b/src/plugins/ios/iostoolhandler.cpp index 974792e851d..2526ecfdc3c 100644 --- a/src/plugins/ios/iostoolhandler.cpp +++ b/src/plugins/ios/iostoolhandler.cpp @@ -910,7 +910,7 @@ void IosSimulatorToolHandlerPrivate::stop(int errorCode) } toolExited(errorCode); - q->finished(q); + emit q->finished(q); } void IosSimulatorToolHandlerPrivate::installAppOnSimulator() @@ -991,7 +991,7 @@ void IosSimulatorToolHandlerPrivate::launchAppOnSimulator(const QStringList &ext .arg(response.commandOutput)); didStartApp(m_bundlePath, m_deviceId, Ios::IosToolHandler::Failure); stop(-1); - q->finished(q); + emit q->finished(q); } }; diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index e531d1fa286..36ec211b851 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -201,7 +201,7 @@ void LanguageClientSettingsPageWidget::applyCurrentSettings() m_currentSettings.setting->applyFromSettingsWidget(m_currentSettings.widget); auto index = m_settings.indexForSetting(m_currentSettings.setting); - m_settings.dataChanged(index, index); + emit m_settings.dataChanged(index, index); } void LanguageClientSettingsPageWidget::addItem() diff --git a/src/plugins/projectexplorer/appoutputpane.cpp b/src/plugins/projectexplorer/appoutputpane.cpp index e0b09d0c6e8..d5afad9ad31 100644 --- a/src/plugins/projectexplorer/appoutputpane.cpp +++ b/src/plugins/projectexplorer/appoutputpane.cpp @@ -736,7 +736,7 @@ void AppOutputPane::slotRunControlFinished2(RunControl *sender) if (current && current == sender) enableButtons(current); - ProjectExplorerPlugin::instance()->updateRunActions(); + emit ProjectExplorerPlugin::instance()->updateRunActions(); #ifdef Q_OS_WIN const bool isRunning = Utils::anyOf(m_runControlTabs, [](const RunControlTab &rt) { diff --git a/src/plugins/projectexplorer/buildstep.cpp b/src/plugins/projectexplorer/buildstep.cpp index b5dfc86bb2e..a494162b105 100644 --- a/src/plugins/projectexplorer/buildstep.cpp +++ b/src/plugins/projectexplorer/buildstep.cpp @@ -405,7 +405,7 @@ void BuildStepConfigWidget::setSummaryText(const QString &summaryText) { if (summaryText != m_summaryText) { m_summaryText = summaryText; - updateSummary(); + emit updateSummary(); } } diff --git a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp index e1daab17d19..d99f5fe0ec1 100644 --- a/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp +++ b/src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp @@ -693,7 +693,7 @@ void PathChooserField::setup(JsonFieldPage *page, const QString &name) QTC_ASSERT(w, return); page->registerFieldWithName(name, w, "path", SIGNAL(rawPathChanged(QString))); QObject::connect(w, &PathChooser::rawPathChanged, - page, [page](QString) { page->completeChanged(); }); + page, [page](QString) { emit page->completeChanged(); }); } bool PathChooserField::validate(MacroExpander *expander, QString *message) @@ -1061,7 +1061,7 @@ void IconListField::setup(JsonFieldPage *page, const QString &name) return QString(); }); QObject::connect(selectionModel(), &QItemSelectionModel::selectionChanged, page, [page]() { - page->completeChanged(); + emit page->completeChanged(); }); } diff --git a/src/plugins/projectexplorer/kitmodel.cpp b/src/plugins/projectexplorer/kitmodel.cpp index cc35e243ef4..dbc04d559fa 100644 --- a/src/plugins/projectexplorer/kitmodel.cpp +++ b/src/plugins/projectexplorer/kitmodel.cpp @@ -224,7 +224,7 @@ void KitModel::apply() foreach (KitNode *n, m_toRemoveList) n->widget->removeKit(); - layoutChanged(); // Force update. + emit layoutChanged(); // Force update. } void KitModel::markForRemoval(Kit *k) diff --git a/src/plugins/projectexplorer/osparser.cpp b/src/plugins/projectexplorer/osparser.cpp index d492d72f801..9190f45d739 100644 --- a/src/plugins/projectexplorer/osparser.cpp +++ b/src/plugins/projectexplorer/osparser.cpp @@ -41,7 +41,8 @@ void OsParser::stdError(const QString &line) if (Utils::HostOsInfo::isLinuxHost()) { const QString trimmed = line.trimmed(); if (trimmed.contains(QLatin1String(": error while loading shared libraries:"))) { - addTask(Task(Task::Error, trimmed, Utils::FileName(), -1, Constants::TASK_CATEGORY_COMPILE)); + emit addTask(Task(Task::Error, trimmed, Utils::FileName(), -1, + Constants::TASK_CATEGORY_COMPILE)); } } IOutputParser::stdError(line); @@ -52,9 +53,9 @@ void OsParser::stdOutput(const QString &line) if (Utils::HostOsInfo::isWindowsHost()) { const QString trimmed = line.trimmed(); if (trimmed == QLatin1String("The process cannot access the file because it is being used by another process.")) { - addTask(Task(Task::Error, tr("The process cannot access the file because it is being used by another process.\n" - "Please close all running instances of your application before starting a build."), - Utils::FileName(), -1, Constants::TASK_CATEGORY_COMPILE)); + emit addTask(Task(Task::Error, tr("The process cannot access the file because it is being used by another process.\n" + "Please close all running instances of your application before starting a build."), + Utils::FileName(), -1, Constants::TASK_CATEGORY_COMPILE)); m_hasFatalError = true; } } diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index 568675786e8..36b5e0ee838 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -2120,7 +2120,7 @@ void ProjectExplorerPluginPrivate::restoreSession() // delay opening projects from the command line even more QTimer::singleShot(0, m_instance, []() { ICore::openFiles(dd->m_arguments, ICore::OpenFilesFlags(ICore::CanContainLineAndColumnNumbers | ICore::SwitchMode)); - m_instance->finishedInitialization(); + emit m_instance->finishedInitialization(); }); updateActions(); } @@ -2197,13 +2197,13 @@ void ProjectExplorerPluginPrivate::checkForShutdown() --m_activeRunControlCount; QTC_ASSERT(m_activeRunControlCount >= 0, m_activeRunControlCount = 0); if (m_shuttingDown && m_activeRunControlCount == 0) - m_instance->asynchronousShutdownFinished(); + emit m_instance->asynchronousShutdownFinished(); } void ProjectExplorerPluginPrivate::timerEvent(QTimerEvent *ev) { if (m_shutdownWatchDogId == ev->timerId()) - m_instance->asynchronousShutdownFinished(); + emit m_instance->asynchronousShutdownFinished(); } void ProjectExplorerPlugin::initiateInlineRenaming() diff --git a/src/plugins/projectexplorer/projectmodels.cpp b/src/plugins/projectexplorer/projectmodels.cpp index ab09068e3b9..ad79e82975d 100644 --- a/src/plugins/projectexplorer/projectmodels.cpp +++ b/src/plugins/projectexplorer/projectmodels.cpp @@ -86,7 +86,7 @@ FlatModel::FlatModel(QObject *parent) connect(sm, &SessionManager::aboutToLoadSession, this, &FlatModel::loadExpandData); connect(sm, &SessionManager::aboutToSaveSession, this, &FlatModel::saveExpandData); connect(sm, &SessionManager::projectAdded, this, &FlatModel::handleProjectAdded); - connect(sm, &SessionManager::startupProjectChanged, this, [this] { layoutChanged(); }); + connect(sm, &SessionManager::startupProjectChanged, this, [this] { emit layoutChanged(); }); for (Project *project : SessionManager::projects()) handleProjectAdded(project); diff --git a/src/plugins/projectexplorer/projectwelcomepage.cpp b/src/plugins/projectexplorer/projectwelcomepage.cpp index 08842aabeaa..2cbb9a9b9dd 100644 --- a/src/plugins/projectexplorer/projectwelcomepage.cpp +++ b/src/plugins/projectexplorer/projectwelcomepage.cpp @@ -385,7 +385,7 @@ public: m_expandedSessions.removeOne(sessionName); else m_expandedSessions.append(sessionName); - model->layoutChanged({QPersistentModelIndex(idx)}); + emit model->layoutChanged({QPersistentModelIndex(idx)}); return true; } if (button == Qt::LeftButton) { @@ -404,7 +404,7 @@ public: } } if (ev->type() == QEvent::MouseMove) { - model->layoutChanged({QPersistentModelIndex(idx)}); // Somewhat brutish. + emit model->layoutChanged({QPersistentModelIndex(idx)}); // Somewhat brutish. //update(option.rect); return true; } diff --git a/src/plugins/projectexplorer/session.cpp b/src/plugins/projectexplorer/session.cpp index 29d5e2f945b..26a70669d44 100644 --- a/src/plugins/projectexplorer/session.cpp +++ b/src/plugins/projectexplorer/session.cpp @@ -381,7 +381,7 @@ void SessionManager::addProject(Project *pro) d->m_projects.append(pro); connect(pro, &Project::displayNameChanged, - m_instance, [pro]() { m_instance->projectDisplayNameChanged(pro); }); + m_instance, [pro]() { emit m_instance->projectDisplayNameChanged(pro); }); emit m_instance->projectAdded(pro); const auto updateFolderNavigation = [pro] { diff --git a/src/plugins/qmakeprojectmanager/qmakestep.cpp b/src/plugins/qmakeprojectmanager/qmakestep.cpp index fae87fc37ee..7ad52850a21 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakestep.cpp @@ -242,7 +242,7 @@ bool QMakeStep::init(QList<const BuildStep *> &earlierSteps) if (!tasks.isEmpty()) { bool canContinue = true; foreach (const ProjectExplorer::Task &t, tasks) { - addTask(t); + emit addTask(t); if (t.type == Task::Error) canContinue = false; } diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index 0a8f5bf0a58..72ee60fd925 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -126,7 +126,7 @@ void ItemLibraryModel::setSearchText(const QString &searchText) bool changed = false; updateVisibility(&changed); if (changed) - dataChanged(QModelIndex(), QModelIndex()); + emit dataChanged(QModelIndex(), QModelIndex()); } } diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp index f91ed9a733e..e98e7c3379b 100644 --- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp +++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp @@ -602,7 +602,7 @@ void NavigatorTreeModel::notifyDataChanged(const ModelNode &modelNode) const QModelIndex index = indexForModelNode(modelNode); const QAbstractItemModel *model = index.model(); const QModelIndex sibling = model ? model->sibling(index.row(), 2, index) : QModelIndex(); - dataChanged(index, sibling); + emit dataChanged(index, sibling); } static QList<ModelNode> collectParents(const QList<ModelNode> &modelNodes) @@ -628,22 +628,22 @@ QList<QPersistentModelIndex> NavigatorTreeModel::nodesToPersistentIndex(const QL void NavigatorTreeModel::notifyModelNodesRemoved(const QList<ModelNode> &modelNodes) { QList<QPersistentModelIndex> indexes = nodesToPersistentIndex(collectParents(modelNodes)); - layoutAboutToBeChanged(indexes); - layoutChanged(indexes); + emit layoutAboutToBeChanged(indexes); + emit layoutChanged(indexes); } void NavigatorTreeModel::notifyModelNodesInserted(const QList<ModelNode> &modelNodes) { QList<QPersistentModelIndex> indexes = nodesToPersistentIndex(collectParents(modelNodes)); - layoutAboutToBeChanged(indexes); - layoutChanged(indexes); + emit layoutAboutToBeChanged(indexes); + emit layoutChanged(indexes); } void NavigatorTreeModel::notifyModelNodesMoved(const QList<ModelNode> &modelNodes) { QList<QPersistentModelIndex> indexes = nodesToPersistentIndex(collectParents(modelNodes)); - layoutAboutToBeChanged(indexes); - layoutChanged(indexes); + emit layoutAboutToBeChanged(indexes); + emit layoutChanged(indexes); } void NavigatorTreeModel::setFilter(bool showOnlyVisibleItems) diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp index bd3bae9c625..6f56b055c88 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlmodelnodeproxy.cpp @@ -53,7 +53,7 @@ void QmlModelNodeProxy::emitSelectionToBeChanged() void QmlModelNodeProxy::emitSelectionChanged() { - selectionChanged(); + emit selectionChanged(); } QmlItemNode QmlModelNodeProxy::qmlItemNode() const diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.cpp index 2c3d5fb5347..9aef01259e9 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionview.cpp @@ -149,7 +149,7 @@ void ConnectionView::selectedNodesChanged(const QList<ModelNode> & selectedNodeL if (connectionViewWidget()->currentTab() == ConnectionViewWidget::BindingTab || connectionViewWidget()->currentTab() == ConnectionViewWidget::DynamicPropertiesTab) - connectionViewWidget()->setEnabledAddButton(selectedNodeList.count() == 1); + emit connectionViewWidget()->setEnabledAddButton(selectedNodeList.count() == 1); } void ConnectionView::importsChanged(const QList<Import> & /*addedImports*/, const QList<Import> & /*removedImports*/) diff --git a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp index 1c62cec81bd..c9b1277ce41 100644 --- a/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp +++ b/src/plugins/qmldesigner/qmldesignerextension/connectioneditor/connectionviewwidget.cpp @@ -193,20 +193,20 @@ void ConnectionViewWidget::invalidateButtonStatus() { if (currentTab() == ConnectionTab) { emit setEnabledRemoveButton(ui->connectionView->selectionModel()->hasSelection()); - setEnabledAddButton(true); + emit setEnabledAddButton(true); } else if (currentTab() == BindingTab) { emit setEnabledRemoveButton(ui->bindingView->selectionModel()->hasSelection()); auto bindingModel = qobject_cast<BindingModel*>(ui->bindingView->model()); - setEnabledAddButton(bindingModel->connectionView()->model() && - bindingModel->connectionView()->selectedModelNodes().count() == 1); + emit setEnabledAddButton(bindingModel->connectionView()->model() && + bindingModel->connectionView()->selectedModelNodes().count() == 1); } else if (currentTab() == DynamicPropertiesTab) { emit setEnabledRemoveButton(ui->dynamicPropertiesView->selectionModel()->hasSelection()); auto dynamicPropertiesModel = qobject_cast<DynamicPropertiesModel*>(ui->dynamicPropertiesView->model()); - setEnabledAddButton(dynamicPropertiesModel->connectionView()->model() && - dynamicPropertiesModel->connectionView()->selectedModelNodes().count() == 1); + emit setEnabledAddButton(dynamicPropertiesModel->connectionView()->model() && + dynamicPropertiesModel->connectionView()->selectedModelNodes().count() == 1); } else if (currentTab() == BackendTab) { - setEnabledAddButton(true); + emit setEnabledAddButton(true); emit setEnabledRemoveButton(ui->backendView->selectionModel()->hasSelection()); } } diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 9ab39cce379..abb432ec74f 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -474,7 +474,7 @@ void QmlDesignerPlugin::switchToTextModeDeferred() void QmlDesignerPlugin::emitCurrentTextEditorChanged(Core::IEditor *editor) { d->blockEditorChange = true; - Core::EditorManager::instance()->currentEditorChanged(editor); + emit Core::EditorManager::instance()->currentEditorChanged(editor); d->blockEditorChange = false; } diff --git a/src/plugins/qmlprofiler/qmlprofilertextmark.cpp b/src/plugins/qmlprofiler/qmlprofilertextmark.cpp index 83a49514397..c590df0d50c 100644 --- a/src/plugins/qmlprofiler/qmlprofilertextmark.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertextmark.cpp @@ -65,7 +65,7 @@ void QmlProfilerTextMark::clicked() { int typeId = m_typeIds.takeFirst(); m_typeIds.append(typeId); - m_viewManager->typeSelected(typeId); + emit m_viewManager->typeSelected(typeId); } QmlProfilerTextMarkModel::QmlProfilerTextMarkModel(QObject *parent) : QObject(parent) diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index c8208b45fb1..406c80040be 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -307,9 +307,11 @@ public: m_sourceModel = newModel; if (newModel) { connect(newModel, &QAbstractItemModel::layoutAboutToBeChanged, this, [this] { - layoutAboutToBeChanged(); + emit layoutAboutToBeChanged(); + }); + connect(newModel, &QAbstractItemModel::layoutChanged, this, [this] { + emit layoutChanged(); }); - connect(newModel, &QAbstractItemModel::layoutChanged, this, [this] { layoutChanged(); }); connect(newModel, &QAbstractItemModel::modelAboutToBeReset, this, [this] { beginResetModel(); }); @@ -360,7 +362,7 @@ public: return; QTC_ASSERT(columnCount >= 1, columnCount = 1); m_columnCount = columnCount; - layoutChanged(); + emit layoutChanged(); } int rowCount(const QModelIndex &parent) const final diff --git a/src/plugins/resourceeditor/qrceditor/resourceview.cpp b/src/plugins/resourceeditor/qrceditor/resourceview.cpp index 3b5b49c1059..081bf4bf5dd 100644 --- a/src/plugins/resourceeditor/qrceditor/resourceview.cpp +++ b/src/plugins/resourceeditor/qrceditor/resourceview.cpp @@ -176,7 +176,7 @@ void ResourceView::removeFiles(int prefixIndex, int firstFileIndex, int lastFile void ResourceView::keyPressEvent(QKeyEvent *e) { if (e->key() == Qt::Key_Delete) - removeItem(); + emit removeItem(); else Utils::TreeView::keyPressEvent(e); } diff --git a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp index c9b36ceda47..c7f7ad68648 100644 --- a/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp +++ b/src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp @@ -902,7 +902,7 @@ void GraphicsScene::addChild(BaseItem *item) if (!m_baseItems.contains(item)) { connect(item, &BaseItem::selectedStateChanged, this, &GraphicsScene::selectionChanged); connect(item, &BaseItem::openToDifferentView, this, [=](BaseItem *item){ - openStateView(item); + emit openStateView(item); }, Qt::QueuedConnection); m_baseItems << item; } diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp index 7f1c63e2f7c..e2d46141fb3 100644 --- a/src/plugins/texteditor/texteditor.cpp +++ b/src/plugins/texteditor/texteditor.cpp @@ -8038,10 +8038,10 @@ RefactorMarkers TextEditorWidget::refactorMarkers() const void TextEditorWidget::setRefactorMarkers(const RefactorMarkers &markers) { foreach (const RefactorMarker &marker, d->m_refactorOverlay->markers()) - requestBlockUpdate(marker.cursor.block()); + emit requestBlockUpdate(marker.cursor.block()); d->m_refactorOverlay->setMarkers(markers); foreach (const RefactorMarker &marker, markers) - requestBlockUpdate(marker.cursor.block()); + emit requestBlockUpdate(marker.cursor.block()); } TextBlockSelection::TextBlockSelection(const TextBlockSelection &other) diff --git a/src/plugins/todo/todooutputpane.cpp b/src/plugins/todo/todooutputpane.cpp index 2b1a06ab258..0becced031b 100644 --- a/src/plugins/todo/todooutputpane.cpp +++ b/src/plugins/todo/todooutputpane.cpp @@ -165,7 +165,7 @@ void TodoOutputPane::scopeButtonClicked(QAbstractButton *button) emit scanningScopeChanged(ScanningScopeSubProject); else if (button == m_wholeProjectButton) emit scanningScopeChanged(ScanningScopeProject); - setBadgeNumber(m_todoTreeView->model()->rowCount()); + emit setBadgeNumber(m_todoTreeView->model()->rowCount()); } void TodoOutputPane::todoTreeViewClicked(const QModelIndex &index) @@ -187,7 +187,7 @@ void TodoOutputPane::todoTreeViewClicked(const QModelIndex &index) void TodoOutputPane::updateTodoCount() { - setBadgeNumber(m_todoTreeView->model()->rowCount()); + emit setBadgeNumber(m_todoTreeView->model()->rowCount()); } void TodoOutputPane::updateFilter() diff --git a/src/plugins/valgrind/callgrind/callgrindparser.cpp b/src/plugins/valgrind/callgrind/callgrindparser.cpp index 384da898c5f..153fa866db0 100644 --- a/src/plugins/valgrind/callgrind/callgrindparser.cpp +++ b/src/plugins/valgrind/callgrind/callgrindparser.cpp @@ -264,7 +264,7 @@ void Parser::Private::parse(QIODevice *device) foreach (Function *func, pendingFunctions) func->finalize(); - q->parserDataReady(); // emit + emit q->parserDataReady(); } inline QString getValue(const QByteArray &line, const int prefixLength) diff --git a/src/plugins/valgrind/callgrindtool.cpp b/src/plugins/valgrind/callgrindtool.cpp index 909451f20ee..0883e76cfc0 100644 --- a/src/plugins/valgrind/callgrindtool.cpp +++ b/src/plugins/valgrind/callgrindtool.cpp @@ -897,7 +897,7 @@ void CallgrindTool::slotRequestDump() { //setBusy(true); m_visualization->setText(tr("Populating...")); - dumpRequested(); + emit dumpRequested(); } void CallgrindTool::loadExternalLogFile() diff --git a/src/plugins/valgrind/callgrindvisualisation.cpp b/src/plugins/valgrind/callgrindvisualisation.cpp index e9fc366a7ed..1f25206377a 100644 --- a/src/plugins/valgrind/callgrindvisualisation.cpp +++ b/src/plugins/valgrind/callgrindvisualisation.cpp @@ -250,11 +250,11 @@ void Visualization::Private::handleMousePressEvent(QMouseEvent *event, const Function *func = q->functionForItem(itemAtPos); if (doubleClicked) { - q->functionActivated(func); + emit q->functionActivated(func); } else { q->scene()->clearSelection(); itemAtPos->setSelected(true); - q->functionSelected(func); + emit q->functionSelected(func); } } diff --git a/src/plugins/valgrind/valgrindrunner.cpp b/src/plugins/valgrind/valgrindrunner.cpp index 04fec49f390..c5fdc115c67 100644 --- a/src/plugins/valgrind/valgrindrunner.cpp +++ b/src/plugins/valgrind/valgrindrunner.cpp @@ -125,13 +125,13 @@ void ValgrindRunner::Private::run() void ValgrindRunner::Private::handleRemoteStderr(const QString &b) { if (!b.isEmpty()) - q->processOutputReceived(b, Utils::StdErrFormat); + emit q->processOutputReceived(b, Utils::StdErrFormat); } void ValgrindRunner::Private::handleRemoteStdout(const QString &b) { if (!b.isEmpty()) - q->processOutputReceived(b, Utils::StdOutFormat); + emit q->processOutputReceived(b, Utils::StdOutFormat); } void ValgrindRunner::Private::localProcessStarted() |