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

Gerrit: Some more cleanup

Browse Source 
* Remove qualification for types in Gerrit::Internal
* Remove action/command pair. Action is stored in Command.

Change-Id: I946bedd3909e217279e9d7a538e8460e0a61de0f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-04-04 14:07:39 +03:00
committed by Tobias Hunger
parent 5506919233
commit d24e509662
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gerrit/gerritdialog.cpp
View File

@@ -305,7 +305,7 @@ void GerritDialog::slotCurrentChanged()
updateButtons();
}
void GerritDialog::fetchStarted(const QSharedPointer<Gerrit::Internal::GerritChange> &change)
void GerritDialog::fetchStarted(const QSharedPointer<GerritChange> &change)
{
// Disable buttons to prevent parallel gerrit operations which can cause mix-ups.
m_fetchRunning = true;

21
src/plugins/git/gerrit/gerritplugin.cpp
View File

@@ -287,13 +287,11 @@ bool GerritPlugin::initialize(ActionContainer *ac)
QAction *pushAction = new QAction(tr("Push to Gerrit..."), this);
Command *pushCommand =
m_pushToGerritCommand =
ActionManager::registerAction(pushAction, Constants::GERRIT_PUSH,
Context(Core::Constants::C_GLOBAL));
connect(pushAction, SIGNAL(triggered()), this, SLOT(push()));
ac->addAction(pushCommand);
m_pushToGerritPair = ActionCommandPair(pushAction, pushCommand);
ac->addAction(m_pushToGerritCommand);
GitPlugin::instance()->addAutoReleasedObject(new GerritOptionsPage(m_parameters));
return true;
@@ -302,13 +300,13 @@ bool GerritPlugin::initialize(ActionContainer *ac)
void GerritPlugin::updateActions(bool hasTopLevel)
{
m_gerritCommand->action()->setEnabled(hasTopLevel);
m_pushToGerritPair.first->setEnabled(hasTopLevel);
m_pushToGerritCommand->action()->setEnabled(hasTopLevel);
}
void GerritPlugin::addToLocator(Core::CommandLocator *locator)
{
locator->appendCommand(m_gerritCommand);
locator->appendCommand(m_pushToGerritPair.second);
locator->appendCommand(m_pushToGerritCommand);
}
void GerritPlugin::push(const QString &topLevel)
@@ -328,8 +326,7 @@ void GerritPlugin::push(const QString &topLevel)
QStringList args;
m_reviewers = dialog.reviewers();
const QStringList reviewers = m_reviewers.split(QLatin1Char(','),
QString::SkipEmptyParts);
const QStringList reviewers = m_reviewers.split(QLatin1Char(','), QString::SkipEmptyParts);
if (!reviewers.isEmpty()) {
QString reviewersFlag(QLatin1String("--receive-pack=git receive-pack"));
foreach (const QString &reviewer, reviewers) {
@@ -409,22 +406,22 @@ QString GerritPlugin::branch(const QString &repository)
return gitClient()->synchronousCurrentLocalBranch(repository);
}
void GerritPlugin::fetchDisplay(const QSharedPointer<Gerrit::Internal::GerritChange> &change)
void GerritPlugin::fetchDisplay(const QSharedPointer<GerritChange> &change)
{
fetch(change, FetchDisplay);
}
void GerritPlugin::fetchCherryPick(const QSharedPointer<Gerrit::Internal::GerritChange> &change)
void GerritPlugin::fetchCherryPick(const QSharedPointer<GerritChange> &change)
{
fetch(change, FetchCherryPick);
}
void GerritPlugin::fetchCheckout(const QSharedPointer<Gerrit::Internal::GerritChange> &change)
void GerritPlugin::fetchCheckout(const QSharedPointer<GerritChange> &change)
{
fetch(change, FetchCheckout);
}
void GerritPlugin::fetch(const QSharedPointer<Gerrit::Internal::GerritChange> &change, int mode)
void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode)
{
// Locate git.
const QString git = gitBinary();

6
src/plugins/git/gerrit/gerritplugin.h
View File

@@ -52,8 +52,6 @@ class GerritChange;
class GerritParameters;
class GerritDialog;
typedef QPair<QAction *, Core::Command *> ActionCommandPair;
class GerritPlugin : public QObject
{
Q_OBJECT
@@ -84,12 +82,12 @@ private slots:
private:
QString findLocalRepository(QString project, const QString &branch) const;
void fetch(const QSharedPointer<Gerrit::Internal::GerritChange> &change, int mode);
void fetch(const QSharedPointer<GerritChange> &change, int mode);
QSharedPointer<GerritParameters> m_parameters;
QPointer<GerritDialog> m_dialog;
Core::Command *m_gerritCommand;
ActionCommandPair m_pushToGerritPair;
Core::Command *m_pushToGerritCommand;
QString m_reviewers;
};