diff --git a/src/common/SignalVectorModel.hpp b/src/common/SignalVectorModel.hpp index 187356de..d7926383 100644 --- a/src/common/SignalVectorModel.hpp +++ b/src/common/SignalVectorModel.hpp @@ -188,7 +188,7 @@ public: assert(row >= 0 && row < this->rows_.size() && column >= 0 && 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) diff --git a/src/messages/MessageElement.cpp b/src/messages/MessageElement.cpp index 8afe72a5..f480a747 100644 --- a/src/messages/MessageElement.cpp +++ b/src/messages/MessageElement.cpp @@ -291,7 +291,6 @@ void TimestampElement::addToContainer(MessageLayoutContainer &container, { if (flags.hasAny(this->getFlags())) { - auto app = getApp(); if (getSettings()->timestampFormat != this->format_) { this->format_ = getSettings()->timestampFormat.getValue(); diff --git a/src/providers/emoji/Emojis.cpp b/src/providers/emoji/Emojis.cpp index d42f619e..f835413d 100644 --- a/src/providers/emoji/Emojis.cpp +++ b/src/providers/emoji/Emojis.cpp @@ -240,8 +240,6 @@ void Emojis::sortEmojis() void Emojis::loadEmojiSet() { - auto app = getApp(); - getSettings()->emojiSet.connect([=](const auto &emojiSet) { this->emojis.each([=](const auto &name, std::shared_ptr &emoji) { diff --git a/src/providers/twitch/TwitchAccountManager.cpp b/src/providers/twitch/TwitchAccountManager.cpp index a42c344d..5b7a2c43 100644 --- a/src/providers/twitch/TwitchAccountManager.cpp +++ b/src/providers/twitch/TwitchAccountManager.cpp @@ -172,8 +172,6 @@ bool TwitchAccountManager::isLoggedIn() const bool TwitchAccountManager::removeUser(TwitchAccount *account) { - const auto &accs = this->accounts.getVector(); - auto userID(account->getUserId()); if (!userID.isEmpty()) { diff --git a/src/singletons/WindowManager.cpp b/src/singletons/WindowManager.cpp index 09201481..982484e6 100644 --- a/src/singletons/WindowManager.cpp +++ b/src/singletons/WindowManager.cpp @@ -387,10 +387,7 @@ void WindowManager::initialize(Settings &settings, Paths &paths) void WindowManager::save() { log("[WindowManager] Saving"); - assertInGuiThread(); - auto app = getApp(); - QJsonDocument document; // "serialize" diff --git a/src/singletons/helper/LoggingChannel.cpp b/src/singletons/helper/LoggingChannel.cpp index 74b4ebe3..c4f7f59c 100644 --- a/src/singletons/helper/LoggingChannel.cpp +++ b/src/singletons/helper/LoggingChannel.cpp @@ -33,20 +33,10 @@ LoggingChannel::LoggingChannel(const QString &_channelName) // FOURTF: change this when adding more providers this->subDirectory = "Twitch/" + this->subDirectory; - auto app = getApp(); - getSettings()->logPath.connect([this](const QString &logPath, auto) { - auto app = getApp(); - - if (logPath.isEmpty()) - { - this->baseDirectory = getPaths()->messageLogDirectory; - } - else - { - this->baseDirectory = logPath; - } - + this->baseDirectory = logPath.isEmpty() + ? getPaths()->messageLogDirectory + : logPath; this->openLogFile(); }); } diff --git a/src/util/StreamLink.cpp b/src/util/StreamLink.cpp index c213c83d..4c3634c2 100644 --- a/src/util/StreamLink.cpp +++ b/src/util/StreamLink.cpp @@ -36,8 +36,6 @@ namespace { QString getStreamlinkProgram() { - auto app = getApp(); - if (getSettings()->streamlinkUseCustomPath) { return getSettings()->streamlinkPath + "/" + getBinaryName(); @@ -66,7 +64,6 @@ namespace { { static QErrorMessage *msg = new QErrorMessage; - auto app = getApp(); if (getSettings()->streamlinkUseCustomPath) { msg->showMessage( @@ -172,8 +169,6 @@ void getStreamQualities(const QString &channelURL, void openStreamlink(const QString &channelURL, const QString &quality, QStringList extraArguments) { - auto app = getApp(); - QStringList arguments; QString additionalOptions = getSettings()->streamlinkOpts.getValue(); @@ -202,8 +197,6 @@ void openStreamlink(const QString &channelURL, const QString &quality, void openStreamlinkForChannel(const QString &channel) { - auto app = getApp(); - QString channelURL = "twitch.tv/" + channel; QString preferredQuality = getSettings()->preferredQuality; diff --git a/src/widgets/helper/NotebookTab.cpp b/src/widgets/helper/NotebookTab.cpp index 04d2fc4d..77d2f9e4 100644 --- a/src/widgets/helper/NotebookTab.cpp +++ b/src/widgets/helper/NotebookTab.cpp @@ -29,8 +29,6 @@ NotebookTab::NotebookTab(Notebook *notebook) , notebook_(notebook) , menu_(this) { - auto app = getApp(); - this->setAcceptDrops(true); this->positionChangedAnimation_.setEasingCurve( @@ -527,8 +525,6 @@ void NotebookTab::dragEnterEvent(QDragEnterEvent *event) void NotebookTab::mouseMoveEvent(QMouseEvent *event) { - auto app = getApp(); - if (getSettings()->showTabCloseButton && this->notebook_->getAllowUserTabManagement()) // { diff --git a/src/widgets/settingspages/AdvancedPage.cpp b/src/widgets/settingspages/AdvancedPage.cpp index 8aa56319..739abd68 100644 --- a/src/widgets/settingspages/AdvancedPage.cpp +++ b/src/widgets/settingspages/AdvancedPage.cpp @@ -26,7 +26,6 @@ namespace chatterino { AdvancedPage::AdvancedPage() : SettingsPage("Advanced", ":/settings/advanced.svg") { - auto app = getApp(); LayoutCreator layoutCreator(this); auto tabs = layoutCreator.emplace(); diff --git a/src/widgets/settingspages/ExternalToolsPage.cpp b/src/widgets/settingspages/ExternalToolsPage.cpp index ce93a755..a15fc464 100644 --- a/src/widgets/settingspages/ExternalToolsPage.cpp +++ b/src/widgets/settingspages/ExternalToolsPage.cpp @@ -14,8 +14,6 @@ namespace chatterino { ExternalToolsPage::ExternalToolsPage() : SettingsPage("External tools", ":/settings/externaltools.svg") { - auto app = getApp(); - LayoutCreator layoutCreator(this); auto layout = layoutCreator.setLayoutType();