Removed unused local vars. Slightly refactored code.

This commit is contained in:
23rd
2019-05-04 20:39:58 +03:00
committed by pajlada
parent 2d21bb0695
commit efec76df5b
10 changed files with 4 additions and 36 deletions
+1 -1
View File
@@ -188,7 +188,7 @@ public:
assert(row >= 0 && row < this->rows_.size() && column >= 0 && assert(row >= 0 && row < this->rows_.size() && column >= 0 &&
column < this->columnCount_); column < this->columnCount_);
return this->rows_[index.row()].items[index.column()]->flags(); return this->rows_[row].items[column]->flags();
} }
QStandardItem *getItem(int row, int column) QStandardItem *getItem(int row, int column)
-1
View File
@@ -291,7 +291,6 @@ void TimestampElement::addToContainer(MessageLayoutContainer &container,
{ {
if (flags.hasAny(this->getFlags())) if (flags.hasAny(this->getFlags()))
{ {
auto app = getApp();
if (getSettings()->timestampFormat != this->format_) if (getSettings()->timestampFormat != this->format_)
{ {
this->format_ = getSettings()->timestampFormat.getValue(); this->format_ = getSettings()->timestampFormat.getValue();
-2
View File
@@ -240,8 +240,6 @@ void Emojis::sortEmojis()
void Emojis::loadEmojiSet() void Emojis::loadEmojiSet()
{ {
auto app = getApp();
getSettings()->emojiSet.connect([=](const auto &emojiSet) { getSettings()->emojiSet.connect([=](const auto &emojiSet) {
this->emojis.each([=](const auto &name, this->emojis.each([=](const auto &name,
std::shared_ptr<EmojiData> &emoji) { std::shared_ptr<EmojiData> &emoji) {
@@ -172,8 +172,6 @@ bool TwitchAccountManager::isLoggedIn() const
bool TwitchAccountManager::removeUser(TwitchAccount *account) bool TwitchAccountManager::removeUser(TwitchAccount *account)
{ {
const auto &accs = this->accounts.getVector();
auto userID(account->getUserId()); auto userID(account->getUserId());
if (!userID.isEmpty()) if (!userID.isEmpty())
{ {
-3
View File
@@ -387,10 +387,7 @@ void WindowManager::initialize(Settings &settings, Paths &paths)
void WindowManager::save() void WindowManager::save()
{ {
log("[WindowManager] Saving"); log("[WindowManager] Saving");
assertInGuiThread(); assertInGuiThread();
auto app = getApp();
QJsonDocument document; QJsonDocument document;
// "serialize" // "serialize"
+3 -13
View File
@@ -33,20 +33,10 @@ LoggingChannel::LoggingChannel(const QString &_channelName)
// FOURTF: change this when adding more providers // FOURTF: change this when adding more providers
this->subDirectory = "Twitch/" + this->subDirectory; this->subDirectory = "Twitch/" + this->subDirectory;
auto app = getApp();
getSettings()->logPath.connect([this](const QString &logPath, auto) { getSettings()->logPath.connect([this](const QString &logPath, auto) {
auto app = getApp(); this->baseDirectory = logPath.isEmpty()
? getPaths()->messageLogDirectory
if (logPath.isEmpty()) : logPath;
{
this->baseDirectory = getPaths()->messageLogDirectory;
}
else
{
this->baseDirectory = logPath;
}
this->openLogFile(); this->openLogFile();
}); });
} }
-7
View File
@@ -36,8 +36,6 @@ namespace {
QString getStreamlinkProgram() QString getStreamlinkProgram()
{ {
auto app = getApp();
if (getSettings()->streamlinkUseCustomPath) if (getSettings()->streamlinkUseCustomPath)
{ {
return getSettings()->streamlinkPath + "/" + getBinaryName(); return getSettings()->streamlinkPath + "/" + getBinaryName();
@@ -66,7 +64,6 @@ namespace {
{ {
static QErrorMessage *msg = new QErrorMessage; static QErrorMessage *msg = new QErrorMessage;
auto app = getApp();
if (getSettings()->streamlinkUseCustomPath) if (getSettings()->streamlinkUseCustomPath)
{ {
msg->showMessage( msg->showMessage(
@@ -172,8 +169,6 @@ void getStreamQualities(const QString &channelURL,
void openStreamlink(const QString &channelURL, const QString &quality, void openStreamlink(const QString &channelURL, const QString &quality,
QStringList extraArguments) QStringList extraArguments)
{ {
auto app = getApp();
QStringList arguments; QStringList arguments;
QString additionalOptions = getSettings()->streamlinkOpts.getValue(); QString additionalOptions = getSettings()->streamlinkOpts.getValue();
@@ -202,8 +197,6 @@ void openStreamlink(const QString &channelURL, const QString &quality,
void openStreamlinkForChannel(const QString &channel) void openStreamlinkForChannel(const QString &channel)
{ {
auto app = getApp();
QString channelURL = "twitch.tv/" + channel; QString channelURL = "twitch.tv/" + channel;
QString preferredQuality = getSettings()->preferredQuality; QString preferredQuality = getSettings()->preferredQuality;
-4
View File
@@ -29,8 +29,6 @@ NotebookTab::NotebookTab(Notebook *notebook)
, notebook_(notebook) , notebook_(notebook)
, menu_(this) , menu_(this)
{ {
auto app = getApp();
this->setAcceptDrops(true); this->setAcceptDrops(true);
this->positionChangedAnimation_.setEasingCurve( this->positionChangedAnimation_.setEasingCurve(
@@ -527,8 +525,6 @@ void NotebookTab::dragEnterEvent(QDragEnterEvent *event)
void NotebookTab::mouseMoveEvent(QMouseEvent *event) void NotebookTab::mouseMoveEvent(QMouseEvent *event)
{ {
auto app = getApp();
if (getSettings()->showTabCloseButton && if (getSettings()->showTabCloseButton &&
this->notebook_->getAllowUserTabManagement()) // this->notebook_->getAllowUserTabManagement()) //
{ {
@@ -26,7 +26,6 @@ namespace chatterino {
AdvancedPage::AdvancedPage() AdvancedPage::AdvancedPage()
: SettingsPage("Advanced", ":/settings/advanced.svg") : SettingsPage("Advanced", ":/settings/advanced.svg")
{ {
auto app = getApp();
LayoutCreator<AdvancedPage> layoutCreator(this); LayoutCreator<AdvancedPage> layoutCreator(this);
auto tabs = layoutCreator.emplace<QTabWidget>(); auto tabs = layoutCreator.emplace<QTabWidget>();
@@ -14,8 +14,6 @@ namespace chatterino {
ExternalToolsPage::ExternalToolsPage() ExternalToolsPage::ExternalToolsPage()
: SettingsPage("External tools", ":/settings/externaltools.svg") : SettingsPage("External tools", ":/settings/externaltools.svg")
{ {
auto app = getApp();
LayoutCreator<ExternalToolsPage> layoutCreator(this); LayoutCreator<ExternalToolsPage> layoutCreator(this);
auto layout = layoutCreator.setLayoutType<QVBoxLayout>(); auto layout = layoutCreator.setLayoutType<QVBoxLayout>();