From cc81d0a7b2099edc8b720e249533c88c6a2aca5c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 28 Mar 2016 22:18:07 +0300 Subject: [PATCH] VCS: Modernize VcsBaseEditorWidgetPrivate initialization Change-Id: Iff4f383ff7762994eb8ae77cea0f74044dfc73b9 Reviewed-by: Tobias Hunger --- src/plugins/vcsbase/vcsbaseeditor.cpp | 29 +++++++++------------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index 4c333e6b229..1508e66cefe 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -553,43 +553,34 @@ public: QComboBox *entriesComboBox(); TextEditorWidget *q; - const VcsBaseEditorParameters *m_parameters; + const VcsBaseEditorParameters *m_parameters = nullptr; QString m_workingDirectory; QRegExp m_diffFilePattern; QRegExp m_logEntryPattern; QList m_entrySections; // line number where this section starts - int m_cursorLine; + int m_cursorLine = -1; QString m_annotateRevisionTextFormat; QString m_annotatePreviousRevisionTextFormat; QString m_copyRevisionTextFormat; - bool m_fileLogAnnotateEnabled; - VcsBaseEditorParameterWidget *m_configurationWidget; - bool m_mouseDragging; + VcsBaseEditorParameterWidget *m_configurationWidget = nullptr; QList m_textCursorHandlers; QPointer m_command; - QObject *m_describeReceiver; - const char *m_describeSlot; - Utils::ProgressIndicator *m_progressIndicator; + QObject *m_describeReceiver = nullptr; + const char *m_describeSlot = nullptr; + Utils::ProgressIndicator *m_progressIndicator = nullptr; + bool m_fileLogAnnotateEnabled = false; + bool m_mouseDragging = false; private: - QComboBox *m_entriesComboBox; + QComboBox *m_entriesComboBox = nullptr; }; VcsBaseEditorWidgetPrivate::VcsBaseEditorWidgetPrivate(VcsBaseEditorWidget *editorWidget) : q(editorWidget), - m_parameters(0), - m_cursorLine(-1), m_annotateRevisionTextFormat(VcsBaseEditorWidget::tr("Annotate \"%1\"")), - m_copyRevisionTextFormat(VcsBaseEditorWidget::tr("Copy \"%1\"")), - m_fileLogAnnotateEnabled(false), - m_configurationWidget(0), - m_mouseDragging(false), - m_describeReceiver(0), - m_describeSlot(0), - m_progressIndicator(0), - m_entriesComboBox(0) + m_copyRevisionTextFormat(VcsBaseEditorWidget::tr("Copy \"%1\"")) { m_textCursorHandlers.append(new ChangeTextCursorHandler(editorWidget)); m_textCursorHandlers.append(new UrlTextCursorHandler(editorWidget));