renamed Twitch to twitch
This commit is contained in:
@@ -39,8 +39,8 @@ AccountPopupWidget::AccountPopupWidget(ChannelPtr _channel)
|
||||
connect(this, &AccountPopupWidget::refreshButtons, this,
|
||||
&AccountPopupWidget::actuallyRefreshButtons, Qt::QueuedConnection);
|
||||
|
||||
app->accounts->Twitch.currentUserChanged.connect([this] {
|
||||
auto currentTwitchUser = getApp()->accounts->Twitch.getCurrent();
|
||||
app->accounts->twitch.currentUserChanged.connect([this] {
|
||||
auto currentTwitchUser = getApp()->accounts->twitch.getCurrent();
|
||||
if (!currentTwitchUser) {
|
||||
// No twitch user set (should never happen)
|
||||
return;
|
||||
@@ -112,7 +112,7 @@ AccountPopupWidget::AccountPopupWidget(ChannelPtr _channel)
|
||||
});
|
||||
|
||||
QObject::connect(this->ui->ignore, &QPushButton::clicked, this, [=]() {
|
||||
auto currentUser = getApp()->accounts->Twitch.getCurrent();
|
||||
auto currentUser = getApp()->accounts->twitch.getCurrent();
|
||||
|
||||
if (!this->relationship.isIgnoring()) {
|
||||
currentUser->ignoreByID(this->popupWidgetUser.userID, this->popupWidgetUser.username,
|
||||
@@ -224,7 +224,7 @@ void AccountPopupWidget::getUserData()
|
||||
});
|
||||
|
||||
auto app = getApp();
|
||||
auto currentUser = app->accounts->Twitch.getCurrent();
|
||||
auto currentUser = app->accounts->twitch.getCurrent();
|
||||
|
||||
currentUser->checkFollow(this->popupWidgetUser.userID, [=](auto result) {
|
||||
this->relationship.setFollowing(result == FollowResult_Following);
|
||||
@@ -301,7 +301,7 @@ void AccountPopupWidget::sendCommand(QPushButton *button, QString command)
|
||||
|
||||
void AccountPopupWidget::refreshLayouts()
|
||||
{
|
||||
auto currentTwitchUser = getApp()->accounts->Twitch.getCurrent();
|
||||
auto currentTwitchUser = getApp()->accounts->twitch.getCurrent();
|
||||
if (!currentTwitchUser) {
|
||||
// No twitch user set (should never happen)
|
||||
return;
|
||||
|
||||
@@ -14,18 +14,18 @@ AccountSwitchWidget::AccountSwitchWidget(QWidget *parent)
|
||||
|
||||
this->addItem(ANONYMOUS_USERNAME_LABEL);
|
||||
|
||||
for (const auto &userName : app->accounts->Twitch.getUsernames()) {
|
||||
for (const auto &userName : app->accounts->twitch.getUsernames()) {
|
||||
this->addItem(userName);
|
||||
}
|
||||
|
||||
app->accounts->Twitch.userListUpdated.connect([=]() {
|
||||
app->accounts->twitch.userListUpdated.connect([=]() {
|
||||
this->blockSignals(true);
|
||||
|
||||
this->clear();
|
||||
|
||||
this->addItem(ANONYMOUS_USERNAME_LABEL);
|
||||
|
||||
for (const auto &userName : app->accounts->Twitch.getUsernames()) {
|
||||
for (const auto &userName : app->accounts->twitch.getUsernames()) {
|
||||
this->addItem(userName);
|
||||
}
|
||||
|
||||
@@ -40,9 +40,9 @@ AccountSwitchWidget::AccountSwitchWidget(QWidget *parent)
|
||||
if (!this->selectedItems().isEmpty()) {
|
||||
QString newUsername = this->currentItem()->text();
|
||||
if (newUsername.compare(ANONYMOUS_USERNAME_LABEL, Qt::CaseInsensitive) == 0) {
|
||||
app->accounts->Twitch.currentUsername = "";
|
||||
app->accounts->twitch.currentUsername = "";
|
||||
} else {
|
||||
app->accounts->Twitch.currentUsername = newUsername.toStdString();
|
||||
app->accounts->twitch.currentUsername = newUsername.toStdString();
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -61,7 +61,7 @@ void AccountSwitchWidget::refreshSelection()
|
||||
if (this->count() > 0) {
|
||||
auto app = getApp();
|
||||
|
||||
auto currentUser = app->accounts->Twitch.getCurrent();
|
||||
auto currentUser = app->accounts->twitch.getCurrent();
|
||||
|
||||
if (currentUser->isAnon()) {
|
||||
this->setCurrentRow(0);
|
||||
|
||||
@@ -84,7 +84,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
|
||||
|
||||
auto app = getApp();
|
||||
|
||||
QString userID = app->accounts->Twitch.getCurrent()->getUserId();
|
||||
QString userID = app->accounts->twitch.getCurrent()->getUserId();
|
||||
|
||||
addEmotes(app->emotes->twitchAccountEmotes[userID.toStdString()].emotes,
|
||||
"Twitch Account Emotes", "Twitch Account Emote");
|
||||
|
||||
@@ -94,7 +94,7 @@ SplitHeader::SplitHeader(Split *_split)
|
||||
this->initializeChannelSignals(); //
|
||||
});
|
||||
|
||||
this->managedConnect(app->accounts->Twitch.currentUserChanged,
|
||||
this->managedConnect(app->accounts->twitch.currentUserChanged,
|
||||
[this] { this->updateModerationModeIcon(); });
|
||||
|
||||
this->setMouseTracking(true);
|
||||
|
||||
@@ -50,7 +50,7 @@ void LogInWithCredentials(const std::string &userID, const std::string &username
|
||||
pajlada::Settings::Setting<std::string>::set("/accounts/uid" + userID + "/oauthToken",
|
||||
oauthToken);
|
||||
|
||||
getApp()->accounts->Twitch.reloadUsers();
|
||||
getApp()->accounts->twitch.reloadUsers();
|
||||
|
||||
messageBox.exec();
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ void IgnoreUsersPage::onShow()
|
||||
{
|
||||
auto app = getApp();
|
||||
|
||||
auto user = app->accounts->Twitch.getCurrent();
|
||||
auto user = app->accounts->twitch.getCurrent();
|
||||
|
||||
if (user->isAnon()) {
|
||||
return;
|
||||
|
||||
@@ -31,12 +31,12 @@ Window::Window(WindowType _type)
|
||||
{
|
||||
auto app = getApp();
|
||||
|
||||
app->accounts->Twitch.currentUserChanged.connect([this] {
|
||||
app->accounts->twitch.currentUserChanged.connect([this] {
|
||||
if (this->userLabel == nullptr) {
|
||||
return;
|
||||
}
|
||||
|
||||
auto user = getApp()->accounts->Twitch.getCurrent();
|
||||
auto user = getApp()->accounts->twitch.getCurrent();
|
||||
|
||||
if (user->isAnon()) {
|
||||
this->refreshWindowTitle("Not logged in");
|
||||
|
||||
Reference in New Issue
Block a user