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

Bazaar: Sprinkle with auto

Browse Source 
Change-Id: Ie87de7eeeba6988870c8c35eab67be576f4e60a5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-01-22 13:51:54 +01:00
parent a6e1e38858
commit d2da1a94ff
3 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -250,10 +250,8 @@ void BazaarPlugin::createMenu(const Context &context)
void BazaarPlugin::createFileActions(const Context &context) void BazaarPlugin::createFileActions(const Context &context)
{ {
Core::Command *command;
m_annotateFile = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this); m_annotateFile = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this);
command = ActionManager::registerAction(m_annotateFile, ANNOTATE, context); Core::Command *command = ActionManager::registerAction(m_annotateFile, ANNOTATE, context);
command->setAttribute(Core::Command::CA_UpdateText); command->setAttribute(Core::Command::CA_UpdateText);
connect(m_annotateFile, SIGNAL(triggered()), this, SLOT(annotateCurrentFile())); connect(m_annotateFile, SIGNAL(triggered()), this, SLOT(annotateCurrentFile()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
@@ -360,12 +358,9 @@ void BazaarPlugin::statusCurrentFile()
void BazaarPlugin::createDirectoryActions(const Context &context) void BazaarPlugin::createDirectoryActions(const Context &context)
{ {
QAction *action; auto action = new QAction(tr("Diff"), this);
Core::Command *command;
action = new QAction(tr("Diff"), this);
m_repositoryActionList.append(action); m_repositoryActionList.append(action);
command = ActionManager::registerAction(action, DIFFMULTI, context); Core::Command *command = ActionManager::registerAction(action, DIFFMULTI, context);
connect(action, SIGNAL(triggered()), this, SLOT(diffRepository())); connect(action, SIGNAL(triggered()), this, SLOT(diffRepository()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
@@ -431,12 +426,9 @@ void BazaarPlugin::statusMulti()
void BazaarPlugin::createRepositoryActions(const Context &context) void BazaarPlugin::createRepositoryActions(const Context &context)
{ {
QAction *action = 0; auto action = new QAction(tr("Pull..."), this);
Core::Command *command = 0;
action = new QAction(tr("Pull..."), this);
m_repositoryActionList.append(action); m_repositoryActionList.append(action);
command = ActionManager::registerAction(action, PULL, context); Core::Command *command = ActionManager::registerAction(action, PULL, context);
connect(action, SIGNAL(triggered()), this, SLOT(pull())); connect(action, SIGNAL(triggered()), this, SLOT(pull()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
@@ -470,7 +462,7 @@ void BazaarPlugin::createRepositoryActions(const Context &context)
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);
m_commandLocator->appendCommand(command); m_commandLocator->appendCommand(command);
QAction *createRepositoryAction = new QAction(tr("Create Repository..."), this); auto createRepositoryAction = new QAction(tr("Create Repository..."), this);
command = ActionManager::registerAction(createRepositoryAction, CREATE_REPOSITORY, context); command = ActionManager::registerAction(createRepositoryAction, CREATE_REPOSITORY, context);
connect(createRepositoryAction, SIGNAL(triggered()), this, SLOT(createRepository())); connect(createRepositoryAction, SIGNAL(triggered()), this, SLOT(createRepository()));
m_bazaarContainer->addAction(command); m_bazaarContainer->addAction(command);

8
src/plugins/bazaar/clonewizard.cpp
View File

@@ -59,11 +59,11 @@ CloneWizard::CloneWizard(const Utils::FileName &path, QWidget *parent) :
const Core::IVersionControl *vc = BazaarPlugin::instance()->versionControl(); const Core::IVersionControl *vc = BazaarPlugin::instance()->versionControl();
if (!vc->isConfigured()) { if (!vc->isConfigured()) {
VcsConfigurationPage *configPage = new VcsConfigurationPage; auto configPage = new VcsConfigurationPage;
configPage->setVersionControl(vc); configPage->setVersionControl(vc);
addPage(configPage); addPage(configPage);
} }
CloneWizardPage *page = new CloneWizardPage; auto page = new CloneWizardPage;
page->setPath(path.toString()); page->setPath(path.toString());
addPage(page); addPage(page);
} }
@@ -105,8 +105,8 @@ VcsCommand *CloneWizard::createCommand(Utils::FileName *checkoutDir)
args << client->vcsCommandString(BazaarClient::CloneCommand) args << client->vcsCommandString(BazaarClient::CloneCommand)
<< extraOptions << cwp->repository() << cwp->directory(); << extraOptions << cwp->repository() << cwp->directory();
VcsCommand *command = new VcsCommand(settings.binaryPath(), cwp->path(), auto command = new VcsCommand(settings.binaryPath(), cwp->path(),
client->processEnvironment()); client->processEnvironment());
command->addJob(args, -1); command->addJob(args, -1);
return command; return command;
} }

2
src/plugins/bazaar/uncommitdialog.cpp
View File

@@ -45,7 +45,7 @@ UnCommitDialog::UnCommitDialog(QWidget *parent)
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
QPushButton* dryRunBtn = new QPushButton(tr("Dry Run")); auto dryRunBtn = new QPushButton(tr("Dry Run"));
dryRunBtn->setToolTip(tr("Test the outcome of removing the last committed revision, without actually removing anything.")); dryRunBtn->setToolTip(tr("Test the outcome of removing the last committed revision, without actually removing anything."));
m_ui->buttonBox->addButton(dryRunBtn, QDialogButtonBox::ApplyRole); m_ui->buttonBox->addButton(dryRunBtn, QDialogButtonBox::ApplyRole);
connect(dryRunBtn, SIGNAL(clicked()), this, SLOT(dryRun())); connect(dryRunBtn, SIGNAL(clicked()), this, SLOT(dryRun()));