From a5c970bea27638b69d118a241439fbf31a003e91 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 16 Oct 2013 06:10:44 +0300 Subject: [PATCH] Git: Rename widget member to m_widget Follow coding style Change-Id: I9583cdfc7ec32140614beb8684d3f15344fa7135 Reviewed-by: Petar Perisin --- src/plugins/git/logchangedialog.cpp | 12 ++++++------ src/plugins/git/logchangedialog.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp index f96cb5b137e..e09e5267f72 100644 --- a/src/plugins/git/logchangedialog.cpp +++ b/src/plugins/git/logchangedialog.cpp @@ -166,13 +166,13 @@ const QStandardItem *LogChangeWidget::currentItem(int column) const LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) : QDialog(parent) - , widget(new LogChangeWidget) + , m_widget(new LogChangeWidget) , m_dialogButtonBox(new QDialogButtonBox(this)) , m_resetTypeComboBox(0) { QVBoxLayout *layout = new QVBoxLayout(this); layout->addWidget(new QLabel(isReset ? tr("Reset to:") : tr("Select change:"), this)); - layout->addWidget(widget); + layout->addWidget(m_widget); QHBoxLayout *popUpLayout = new QHBoxLayout; if (isReset) { popUpLayout->addWidget(new QLabel(tr("Reset type:"), this)); @@ -195,7 +195,7 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) : connect(m_dialogButtonBox, SIGNAL(accepted()), this, SLOT(accept())); connect(m_dialogButtonBox, SIGNAL(rejected()), this, SLOT(reject())); - connect(widget, SIGNAL(doubleClicked(QModelIndex)), okButton, SLOT(animateClick())); + connect(m_widget, SIGNAL(doubleClicked(QModelIndex)), okButton, SLOT(animateClick())); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); resize(600, 400); @@ -203,7 +203,7 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) : bool LogChangeDialog::runDialog(const QString &repository, const QString &commit, bool includeRemote) { - if (!widget->init(repository, commit, includeRemote)) + if (!m_widget->init(repository, commit, includeRemote)) return false; if (QDialog::exec() == QDialog::Accepted) { @@ -219,12 +219,12 @@ bool LogChangeDialog::runDialog(const QString &repository, const QString &commit QString LogChangeDialog::commit() const { - return widget->commit(); + return m_widget->commit(); } int LogChangeDialog::commitIndex() const { - return widget->commitIndex(); + return m_widget->commitIndex(); } QString LogChangeDialog::resetFlag() const diff --git a/src/plugins/git/logchangedialog.h b/src/plugins/git/logchangedialog.h index a4790701b48..e24636ff44f 100644 --- a/src/plugins/git/logchangedialog.h +++ b/src/plugins/git/logchangedialog.h @@ -85,7 +85,7 @@ public: QString resetFlag() const; private: - LogChangeWidget *widget; + LogChangeWidget *m_widget; QDialogButtonBox *m_dialogButtonBox; QComboBox *m_resetTypeComboBox; };