From 38062cb3c5de9112e83903373e28d17df0900b8d Mon Sep 17 00:00:00 2001 From: Bur0k Date: Wed, 19 Apr 2017 15:24:19 +0200 Subject: [PATCH] Renamed User* to Account* (#41) --- forms/accountpopupform.ui | 6 +++--- widgets/accountpopup.cpp | 6 +++--- widgets/accountpopup.h | 8 ++++---- widgets/chatwidgetview.h | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/forms/accountpopupform.ui b/forms/accountpopupform.ui index 8b32b504d..8ce31e364 100644 --- a/forms/accountpopupform.ui +++ b/forms/accountpopupform.ui @@ -1,7 +1,7 @@ - UserPopup - + AccountPopup + 0 @@ -17,7 +17,7 @@ - UserPopup + AccountPopup diff --git a/widgets/accountpopup.cpp b/widgets/accountpopup.cpp index c63ab36bf..036d375da 100644 --- a/widgets/accountpopup.cpp +++ b/widgets/accountpopup.cpp @@ -7,9 +7,9 @@ namespace chatterino { namespace widgets { -UserPopupWidget::UserPopupWidget(std::shared_ptr &&channel) +AccountPopupWidget::AccountPopupWidget(std::shared_ptr &&channel) : QWidget(nullptr) - , _ui(new Ui::UserPopup) + , _ui(new Ui::AccountPopup) , _channel(std::move(channel)) { _ui->setupUi(this); @@ -32,7 +32,7 @@ UserPopupWidget::UserPopupWidget(std::shared_ptr &&channel) }); } -void UserPopupWidget::setName(const QString &name) +void AccountPopupWidget::setName(const QString &name) { _ui->lblUsername->setText(name); } diff --git a/widgets/accountpopup.h b/widgets/accountpopup.h index 7979ea997..cacf54bf8 100644 --- a/widgets/accountpopup.h +++ b/widgets/accountpopup.h @@ -6,7 +6,7 @@ #include namespace Ui { -class UserPopup; +class AccountPopup; } namespace chatterino { @@ -15,16 +15,16 @@ class Channel; namespace widgets { -class UserPopupWidget : public QWidget +class AccountPopupWidget : public QWidget { Q_OBJECT public: - UserPopupWidget(std::shared_ptr &&_channel); + AccountPopupWidget(std::shared_ptr &&_channel); void setName(const QString &name); private: - Ui::UserPopup *_ui; + Ui::AccountPopup *_ui; std::shared_ptr _channel; }; diff --git a/widgets/chatwidgetview.h b/widgets/chatwidgetview.h index ff047e765..423e50671 100644 --- a/widgets/chatwidgetview.h +++ b/widgets/chatwidgetview.h @@ -53,7 +53,7 @@ private: ScrollBar _scrollbar; - UserPopupWidget _userPopupWidget; + AccountPopupWidget _userPopupWidget; bool _onlyUpdateEmotes; // Mouse event variables