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

Git: Rename widget member to m_widget

Browse Source 
Follow coding style

Change-Id: I9583cdfc7ec32140614beb8684d3f15344fa7135
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
This commit is contained in:
Orgad Shaneh
2013-10-16 06:10:44 +03:00
committed by Orgad Shaneh
parent a918b47869
commit a5c970bea2
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/git/logchangedialog.cpp
View File

@@ -166,13 +166,13 @@ const QStandardItem *LogChangeWidget::currentItem(int column) const
LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) : LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) :
QDialog(parent) QDialog(parent)
, widget(new LogChangeWidget) , m_widget(new LogChangeWidget)
, m_dialogButtonBox(new QDialogButtonBox(this)) , m_dialogButtonBox(new QDialogButtonBox(this))
, m_resetTypeComboBox(0) , m_resetTypeComboBox(0)
{ {
QVBoxLayout *layout = new QVBoxLayout(this); QVBoxLayout *layout = new QVBoxLayout(this);
layout->addWidget(new QLabel(isReset ? tr("Reset to:") : tr("Select change:"), this)); layout->addWidget(new QLabel(isReset ? tr("Reset to:") : tr("Select change:"), this));
layout->addWidget(widget); layout->addWidget(m_widget);
QHBoxLayout *popUpLayout = new QHBoxLayout; QHBoxLayout *popUpLayout = new QHBoxLayout;
if (isReset) { if (isReset) {
popUpLayout->addWidget(new QLabel(tr("Reset type:"), this)); 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(accepted()), this, SLOT(accept()));
connect(m_dialogButtonBox, SIGNAL(rejected()), this, SLOT(reject())); 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); setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
resize(600, 400); resize(600, 400);
@@ -203,7 +203,7 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) :
bool LogChangeDialog::runDialog(const QString &repository, const QString &commit, bool includeRemote) 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; return false;
if (QDialog::exec() == QDialog::Accepted) { if (QDialog::exec() == QDialog::Accepted) {
@@ -219,12 +219,12 @@ bool LogChangeDialog::runDialog(const QString &repository, const QString &commit
QString LogChangeDialog::commit() const QString LogChangeDialog::commit() const
{ {
return widget->commit(); return m_widget->commit();
} }
int LogChangeDialog::commitIndex() const int LogChangeDialog::commitIndex() const
{ {
return widget->commitIndex(); return m_widget->commitIndex();
} }
QString LogChangeDialog::resetFlag() const QString LogChangeDialog::resetFlag() const

2
src/plugins/git/logchangedialog.h
View File

@@ -85,7 +85,7 @@ public:
QString resetFlag() const; QString resetFlag() const;
private: private:
LogChangeWidget *widget; LogChangeWidget *m_widget;
QDialogButtonBox *m_dialogButtonBox; QDialogButtonBox *m_dialogButtonBox;
QComboBox *m_resetTypeComboBox; QComboBox *m_resetTypeComboBox;
}; };