Renamed private members

This commit is contained in:
fourtf
2018-07-06 19:23:47 +02:00
parent 6935619820
commit 280bb4cf8e
141 changed files with 1754 additions and 1861 deletions
+11 -11
View File
@@ -10,11 +10,11 @@ namespace chatterino {
SettingsDialogTab::SettingsDialogTab(SettingsDialog *_dialog, SettingsPage *_page,
QString imageFileName)
: BaseWidget(_dialog)
, dialog(_dialog)
, page(_page)
, dialog_(_dialog)
, page_(_page)
{
this->ui.labelText = page->getName();
this->ui.icon.addFile(imageFileName);
this->ui_.labelText = page_->getName();
this->ui_.icon.addFile(imageFileName);
this->setCursor(QCursor(Qt::PointingHandCursor));
@@ -23,19 +23,19 @@ SettingsDialogTab::SettingsDialogTab(SettingsDialog *_dialog, SettingsPage *_pag
void SettingsDialogTab::setSelected(bool _selected)
{
if (this->selected == _selected) {
if (this->selected_ == _selected) {
return;
}
// height: <checkbox-size>px;
this->selected = _selected;
emit selectedChanged(selected);
this->selected_ = _selected;
emit selectedChanged(selected_);
}
SettingsPage *SettingsDialogTab::getSettingsPage()
{
return this->page;
return this->page_;
}
void SettingsDialogTab::paintEvent(QPaintEvent *)
@@ -48,13 +48,13 @@ void SettingsDialogTab::paintEvent(QPaintEvent *)
this->style()->drawPrimitive(QStyle::PE_Widget, &opt, &painter, this);
int a = (this->height() - (20 * this->getScale())) / 2;
QPixmap pixmap = this->ui.icon.pixmap(QSize(this->height() - a * 2, this->height() - a * 2));
QPixmap pixmap = this->ui_.icon.pixmap(QSize(this->height() - a * 2, this->height() - a * 2));
painter.drawPixmap(a, a, pixmap);
a = a + a + 20 + a;
painter.drawText(QRect(a, 0, width() - a, height()), this->ui.labelText,
painter.drawText(QRect(a, 0, width() - a, height()), this->ui_.labelText,
QTextOption(Qt::AlignLeft | Qt::AlignVCenter));
}
@@ -64,7 +64,7 @@ void SettingsDialogTab::mousePressEvent(QMouseEvent *event)
return;
}
this->dialog->select(this);
this->dialog_->selectTab(this);
}
} // namespace chatterino