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

VCSBase: Modernize

Browse Source 
override, auto, nullptr, member initializers.

Change-Id: Ie21b8f4a4d6673947d82619bc3de677fcea63d7f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Orgad Shaneh
2018-09-20 01:32:36 +03:00
committed by Orgad Shaneh
parent e0520794f5
commit 8f65486dfc
19 changed files with 144 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/plugins/vcsbase/submiteditorwidget.cpp
View File

@@ -114,7 +114,7 @@ public:
public slots:
void setText(const QString &t) {
if (QAction *action = qobject_cast<QAction *>(parent()))
if (auto action = qobject_cast<QAction *>(parent()))
action->setText(t);
}
};
@@ -128,42 +128,25 @@ struct SubmitEditorWidgetPrivate
// A pair of position/action to extend context menus
typedef QPair<int, QPointer<QAction> > AdditionalContextMenuAction;
SubmitEditorWidgetPrivate();
Ui::SubmitEditorWidget m_ui;
bool m_filesSelected;
int m_activatedRow;
bool m_emptyFileListEnabled;
QList<AdditionalContextMenuAction> descriptionEditContextMenuActions;
QVBoxLayout *m_fieldLayout;
QVBoxLayout *m_fieldLayout = nullptr;
QList<SubmitFieldWidget *> m_fieldWidgets;
QShortcut *m_submitShortcut;
int m_lineWidth;
bool m_commitEnabled;
bool m_ignoreChange;
bool m_descriptionMandatory;
bool m_updateInProgress;
QShortcut *m_submitShortcut = nullptr;
QActionPushButton *m_submitButton = nullptr;
QString m_description;
QActionPushButton *m_submitButton;
};
int m_lineWidth = defaultLineWidth;
int m_activatedRow = -1;
SubmitEditorWidgetPrivate::SubmitEditorWidgetPrivate() :
m_filesSelected(false),
m_activatedRow(-1),
m_emptyFileListEnabled(false),
m_fieldLayout(0),
m_submitShortcut(0),
m_lineWidth(defaultLineWidth),
m_commitEnabled(false),
m_ignoreChange(false),
m_descriptionMandatory(true),
m_updateInProgress(false),
m_submitButton(0)
{
}
bool m_filesSelected = false;
bool m_emptyFileListEnabled = false;
bool m_commitEnabled = false;
bool m_ignoreChange = false;
bool m_descriptionMandatory = true;
bool m_updateInProgress = false;
};
SubmitEditorWidget::SubmitEditorWidget() :
d(new SubmitEditorWidgetPrivate)
@@ -224,8 +207,7 @@ void SubmitEditorWidget::registerActions(QAction *editorUndoAction, QAction *edi
connect(this, &SubmitEditorWidget::submitActionEnabledChanged,
submitAction, &QAction::setEnabled);
// Wire setText via QActionSetTextSlotHelper.
QActionSetTextSlotHelper *actionSlotHelper
= submitAction->findChild<QActionSetTextSlotHelper *>();
auto actionSlotHelper = submitAction->findChild<QActionSetTextSlotHelper *>();
if (!actionSlotHelper)
actionSlotHelper = new QActionSetTextSlotHelper(submitAction);
connect(this, &SubmitEditorWidget::submitActionTextChanged,
@@ -463,7 +445,7 @@ void SubmitEditorWidget::updateSubmitAction()
// Update button text.
const int fileCount = d->m_ui.fileView->model()->rowCount();
const QString msg = checkedCount ?
tr("%1 %2/%n File(s)", 0, fileCount)
tr("%1 %2/%n File(s)", nullptr, fileCount)
.arg(commitName()).arg(checkedCount) :
commitName();
emit submitActionTextChanged(msg);