Vcs: Collapse VcsSubmitEditorFactory hierarchy

Same pattern as for VcsSubmitFactory.

Change-Id: I7adb8868a83842c1b6c642db372a3624dd2e879e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
This commit is contained in:
hjk
2014-08-28 22:23:29 +02:00
parent 8b5bca7223
commit 9c152fce7e
35 changed files with 78 additions and 125 deletions

View File

@@ -230,12 +230,8 @@ static const VcsBaseSubmitEditorParameters submitParameters = {
bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
{
Q_UNUSED(arguments);
typedef VcsSubmitEditorFactory<CvsSubmitEditor> CVSSubmitEditorFactory;
using namespace Constants;
using namespace Core::Constants;
using namespace ExtensionSystem;
using Core::Command;
initializeVcs(new CvsControl(this));
@@ -249,7 +245,8 @@ bool CvsPlugin::initialize(const QStringList &arguments, QString *errorMessage)
addAutoReleasedObject(new SettingsPage);
addAutoReleasedObject(new CVSSubmitEditorFactory(&submitParameters));
addAutoReleasedObject(new VcsSubmitEditorFactory(&submitParameters,
[]() { return new CvsSubmitEditor(&submitParameters); }));
static const char *describeSlotC = SLOT(slotDescribe(QString,QString));
const int editorCount = sizeof(editorParameters) / sizeof(editorParameters[0]);

View File

@@ -36,9 +36,8 @@
using namespace Cvs::Internal;
using namespace VcsBase;
CvsSubmitEditor::CvsSubmitEditor(const VcsBaseSubmitEditorParameters *parameters,
QWidget *parentWidget) :
VcsBaseSubmitEditor(parameters, new VcsBase::SubmitEditorWidget(parentWidget)),
CvsSubmitEditor::CvsSubmitEditor(const VcsBaseSubmitEditorParameters *parameters) :
VcsBaseSubmitEditor(parameters, new VcsBase::SubmitEditorWidget),
m_msgAdded(tr("Added")),
m_msgRemoved(tr("Removed")),
m_msgModified(tr("Modified"))

View File

@@ -48,8 +48,7 @@ public:
typedef QPair<State, QString> StateFilePair;
typedef QList<StateFilePair> StateFilePairs;
explicit CvsSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters,
QWidget *parentWidget = 0);
explicit CvsSubmitEditor(const VcsBase::VcsBaseSubmitEditorParameters *parameters);
void setStateList(const StateFilePairs &statusOutput);