noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Renamed User* to Account* (#41)

Browse source
This commit is contained in:
Bur0k 2017-04-19 15:24:19 +02:00 committed by fourtf
parent 780286582f
commit 38062cb3c5
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
forms/accountpopupform.ui
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>UserPopup</class>
<widget class="QWidget" name="UserPopup">
<class>AccountPopup</class>
<widget class="QWidget" name="AccountPopup">
<property name="geometry">
<rect>
<x>0</x>
@ -17,7 +17,7 @@
</sizepolicy>
</property>
<property name="windowTitle">
<string>UserPopup</string>
<string>AccountPopup</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="0">

6
widgets/accountpopup.cpp
View file

@ -7,9 +7,9 @@
namespace chatterino {
namespace widgets {
UserPopupWidget::UserPopupWidget(std::shared_ptr<Channel> &&channel)
AccountPopupWidget::AccountPopupWidget(std::shared_ptr<Channel> &&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> &&channel)
});
}
void UserPopupWidget::setName(const QString &name)
void AccountPopupWidget::setName(const QString &name)
{
_ui->lblUsername->setText(name);
}

8
widgets/accountpopup.h
View file

@ -6,7 +6,7 @@
#include <memory>
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> &&_channel);
AccountPopupWidget(std::shared_ptr<Channel> &&_channel);
void setName(const QString &name);
private:
Ui::UserPopup *_ui;
Ui::AccountPopup *_ui;
std::shared_ptr<Channel> _channel;
};

2
widgets/chatwidgetview.h
View file

@ -53,7 +53,7 @@ private:
ScrollBar _scrollbar;
UserPopupWidget _userPopupWidget;
AccountPopupWidget _userPopupWidget;
bool _onlyUpdateEmotes;
// Mouse event variables