chatterino2
Code Issues

Move some variables into const.hpp

Browse Source 
Clean up some code in the AccountManager
This commit is contained in:
Rasmus Karlsson
2017-12-19 16:13:02 +01:00
parent 324dfc9ee9
commit be3c85d72d
7 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/accountswitchwidget.cpp
+4 -5
View File
@@ -1,5 +1,6 @@
#include "accountswitchwidget.hpp"
#include "accountmanager.hpp"
#include "const.hpp"
namespace chatterino {
namespace widgets {
@@ -7,9 +8,7 @@ namespace widgets {
AccountSwitchWidget::AccountSwitchWidget(QWidget *parent)
: QListWidget(parent)
{
static QString anonUsername(" - anonymous - ");
this->addItem(anonUsername);
this->addItem(ANONYMOUS_USERNAME_LABEL);
for (const auto &userName : AccountManager::getInstance().Twitch.getUsernames()) {
this->addItem(userName);
@@ -20,7 +19,7 @@ AccountSwitchWidget::AccountSwitchWidget(QWidget *parent)
this->clear();
this->addItem(anonUsername);
this->addItem(ANONYMOUS_USERNAME_LABEL);
for (const auto &userName : AccountManager::getInstance().Twitch.getUsernames()) {
this->addItem(userName);
@@ -36,7 +35,7 @@ AccountSwitchWidget::AccountSwitchWidget(QWidget *parent)
QObject::connect(this, &QListWidget::clicked, [this] {
if (!this->selectedItems().isEmpty()) {
QString newUsername = this->currentItem()->text();
if (newUsername.compare(anonUsername, Qt::CaseInsensitive) == 0) {
if (newUsername.compare(ANONYMOUS_USERNAME_LABEL, Qt::CaseInsensitive) == 0) {
AccountManager::getInstance().Twitch.currentUsername = "";
} else {
AccountManager::getInstance().Twitch.currentUsername = newUsername.toStdString();
src/widgets/settingsdialog.cpp
+2 -1
View File
@@ -1,5 +1,6 @@
#include "widgets/settingsdialog.hpp"
#include "accountmanager.hpp"
#include "const.hpp"
#include "debug/log.hpp"
#include "twitch/twitchmessagebuilder.hpp"
#include "twitch/twitchuser.hpp"
@@ -130,7 +131,7 @@ QVBoxLayout *SettingsDialog::createAccountsTab()
connect(removeButton, &QPushButton::clicked, [this]() {
qDebug() << "TODO: Implement"; //
auto selectedUser = this->ui.accountSwitchWidget->currentItem()->text();
if (selectedUser == " - anonymous - ") {
if (selectedUser == ANONYMOUS_USERNAME_LABEL) {
// Do nothing
return;
}