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

VCS: De-slot

Browse Source 
Change-Id: I805eb88dee7ec1243d59c32be23f2fb401f1f46e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-03-18 23:40:19 +02:00
committed by Orgad Shaneh
parent a18f405ba1
commit 6031892f96
4 changed files with 13 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/mercurial/mercurialcontrol.h
View File

@@ -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

16
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -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)) {

1
src/plugins/mercurial/mercurialplugin.h
View File

@@ -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;

16
src/plugins/perforce/perforceplugin.cpp
View File

@@ -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);