chore: mini refactorings and dead code removal (#5512)

This commit is contained in:
nerix
2024-07-20 11:35:59 +02:00
committed by GitHub
parent deb4401036
commit b3c09b65d8
28 changed files with 65 additions and 506 deletions
+3 -4
View File
@@ -274,17 +274,16 @@ ModerationPage::ModerationPage()
});
}
this->addModerationButtonSettings(tabs);
this->addModerationButtonSettings(tabs.getElement());
// ---- misc
this->itemsChangedTimer_.setSingleShot(true);
}
void ModerationPage::addModerationButtonSettings(
LayoutCreator<QTabWidget> &tabs)
void ModerationPage::addModerationButtonSettings(QTabWidget *tabs)
{
auto timeoutLayout =
tabs.appendTab(new QVBoxLayout, "User Timeout Buttons");
LayoutCreator{tabs}.appendTab(new QVBoxLayout, "User Timeout Buttons");
auto texts = timeoutLayout.emplace<QVBoxLayout>().withoutMargin();
{
auto infoLabel = texts.emplace<QLabel>();
+1 -4
View File
@@ -9,9 +9,6 @@ class QPushButton;
namespace chatterino {
template <typename X>
class LayoutCreator;
class ModerationPage : public SettingsPage
{
public:
@@ -20,7 +17,7 @@ public:
void selectModerationActions();
private:
void addModerationButtonSettings(LayoutCreator<QTabWidget> &);
void addModerationButtonSettings(QTabWidget *);
QTimer itemsChangedTimer_;
QTabWidget *tabWidget_{};
+2 -3
View File
@@ -12,7 +12,6 @@
#include "providers/twitch/TwitchIrcServer.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "util/Clamp.hpp"
#include "util/Helpers.hpp"
#include "util/LayoutCreator.hpp"
#include "widgets/dialogs/EmotePopup.hpp"
@@ -811,7 +810,7 @@ void SplitInput::updateCompletionPopup()
return;
}
for (int i = clamp(position, 0, (int)text.length() - 1); i >= 0; i--)
for (int i = std::clamp(position, 0, (int)text.length() - 1); i >= 0; i--)
{
if (text[i] == ' ')
{
@@ -894,7 +893,7 @@ void SplitInput::insertCompletionText(const QString &input_) const
auto text = edit.toPlainText();
auto position = edit.textCursor().position() - 1;
for (int i = clamp(position, 0, (int)text.length() - 1); i >= 0; i--)
for (int i = std::clamp(position, 0, (int)text.length() - 1); i >= 0; i--)
{
bool done = false;
if (text[i] == ':')