diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-03-18 23:40:19 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2017-03-20 11:39:01 +0000 |
| commit | 6031892f965e3ba1d3e095432a8d91e44c79fc9e (patch) | |
| tree | 17914d34eecae814b1bd27b2f4a2a49c9503180b | |
| parent | a18f405ba12c1b274713de4dda82c2cb7239a1af (diff) | |
VCS: De-slot
Change-Id: I805eb88dee7ec1243d59c32be23f2fb401f1f46e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
| -rw-r--r-- | src/plugins/mercurial/mercurialcontrol.h | 1 | ||||
| -rw-r--r-- | src/plugins/mercurial/mercurialplugin.cpp | 16 | ||||
| -rw-r--r-- | src/plugins/mercurial/mercurialplugin.h | 1 | ||||
| -rw-r--r-- | src/plugins/perforce/perforceplugin.cpp | 16 |
4 files changed, 13 insertions, 21 deletions
diff --git a/src/plugins/mercurial/mercurialcontrol.h b/src/plugins/mercurial/mercurialcontrol.h index 39917063ace..0c395fb059c 100644 --- a/src/plugins/mercurial/mercurialcontrol.h +++ b/src/plugins/mercurial/mercurialcontrol.h @@ -67,7 +67,6 @@ public: bool sccManaged(const QString &filename); -public slots: // To be connected to the HgTask's success signal to emit the repository/ // files changed signals according to the variant's type: // String -> repository, StringList -> files diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index 4acc63fa4c5..8254f91d677 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -126,7 +126,8 @@ bool MercurialPlugin::initialize(const QStringList & /* arguments */, QString * addAutoReleasedObject(new OptionsPage(versionControl())); - connect(m_client, SIGNAL(changed(QVariant)), versionControl(), SLOT(changed(QVariant))); + connect(m_client, &VcsBaseClient::changed, + static_cast<MercurialControl *>(versionControl()), &MercurialControl::changed); connect(m_client, &MercurialClient::needUpdate, this, &MercurialPlugin::update); const auto describeFunc = [this](const QString &source, const QString &id) { @@ -164,7 +165,6 @@ void MercurialPlugin::createMenu(const Core::Context &context) m_mercurialContainer->addSeparator(context); createRepositoryActions(context); m_mercurialContainer->addSeparator(context); - createRepositoryManagementActions(context); // Request the Tools menu and add the Mercurial menu to it Core::ActionContainer *toolsMenu = Core::ActionManager::actionContainer(Core::Id(Core::Constants::M_TOOLS)); @@ -603,18 +603,6 @@ bool MercurialPlugin::submitEditorAboutToClose() return true; } -void MercurialPlugin::createRepositoryManagementActions(const Core::Context &context) -{ - //TODO create menu for these options - Q_UNUSED(context); - return; - // auto action = new QAction(tr("Branch"), this); - // actionList.append(action); - // Core::Command *command = Core::ActionManager::registerAction(action, Constants::BRANCH, context); - // // connect(action, SIGNAL(triggered()), this, SLOT(branch())); - // m_mercurialContainer->addAction(command); -} - void MercurialPlugin::updateActions(VcsBasePlugin::ActionState as) { if (!enableMenuAction(as, m_menuAction)) { diff --git a/src/plugins/mercurial/mercurialplugin.h b/src/plugins/mercurial/mercurialplugin.h index 4a58bc58ceb..231f03effc4 100644 --- a/src/plugins/mercurial/mercurialplugin.h +++ b/src/plugins/mercurial/mercurialplugin.h @@ -127,7 +127,6 @@ private: void createFileActions(const Core::Context &context); void createDirectoryActions(const Core::Context &context); void createRepositoryActions(const Core::Context &context); - void createRepositoryManagementActions(const Core::Context &context); // Variables static MercurialPlugin *m_instance; diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index ab85764b851..f4b4004ee56 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -993,17 +993,23 @@ PerforceResponse PerforcePlugin::synchronousProcess(const QString &workingDir, // connect stderr to the output window if desired if (flags & StdErrToWindow) { process.setStdErrBufferedSignalsEnabled(true); - connect(&process, SIGNAL(stdErrBuffered(QString,bool)), outputWindow, SLOT(append(QString))); + connect(&process, &SynchronousProcess::stdErrBuffered, + outputWindow, [outputWindow](const QString &lines) { + outputWindow->append(lines); + }); } // connect stdout to the output window if desired if (flags & StdOutToWindow) { process.setStdOutBufferedSignalsEnabled(true); if (flags & SilentStdOut) { - connect(&process, &SynchronousProcess::stdOutBuffered, outputWindow, &VcsOutputWindow::appendSilently); - } - else { - connect(&process, SIGNAL(stdOutBuffered(QString,bool)), outputWindow, SLOT(append(QString))); + connect(&process, &SynchronousProcess::stdOutBuffered, + outputWindow, &VcsOutputWindow::appendSilently); + } else { + connect(&process, &SynchronousProcess::stdOutBuffered, + outputWindow, [outputWindow](const QString &lines) { + outputWindow->append(lines); + }); } } process.setTimeOutMessageBoxEnabled(true); |