Renamed private members

src/widgets/settingspages/AboutPage.cpp

@@ -30,7 +30,7 @@ AboutPage::AboutPage()
         QPixmap pixmap;
         pixmap.load(":/images/aboutlogo.png");
 
-        auto logo = layout.emplace<QLabel>().assign(&this->logo);
+        auto logo = layout.emplace<QLabel>().assign(&this->logo_);
         logo->setPixmap(pixmap);
         logo->setFixedSize(PIXMAP_WIDTH, PIXMAP_WIDTH * pixmap.height() / pixmap.width());
         logo->setScaledContents(true);

src/widgets/settingspages/AboutPage.hpp

@@ -13,10 +13,10 @@ public:
     AboutPage();
 
 private:
-    QLabel *logo;
-
-    void addLicense(QFormLayout *form, const QString &name, const QString &website,
+    void addLicense(QFormLayout *form, const QString &name_, const QString &website,
                     const QString &licenseLink);
+
+    QLabel *logo_;
 };
 
 }  // namespace chatterino

src/widgets/settingspages/AccountsPage.hpp

@@ -13,9 +13,9 @@ public:
     AccountsPage();
 
 private:
-    QPushButton *addButton;
-    QPushButton *removeButton;
-    AccountSwitchWidget *accSwitchWidget;
+    QPushButton *addButton_;
+    QPushButton *removeButton_;
+    AccountSwitchWidget *accountSwitchWidget_;
 };
 
 }  // namespace chatterino

src/widgets/settingspages/CommandPage.cpp

@@ -51,7 +51,7 @@ CommandPage::CommandPage()
     text->setStyleSheet("color: #bbb");
 
     // ---- end of layout
-    this->commandsEditTimer.setSingleShot(true);
+    this->commandsEditTimer_.setSingleShot(true);
 }
 
 }  // namespace chatterino

src/widgets/settingspages/CommandPage.hpp

@@ -13,7 +13,7 @@ public:
     CommandPage();
 
 private:
-    QTimer commandsEditTimer;
+    QTimer commandsEditTimer_;
 };
 
 }  // namespace chatterino

src/widgets/settingspages/ExternalToolsPage.cpp

@@ -66,7 +66,7 @@ ExternalToolsPage::ExternalToolsPage()
             [=](const auto &value, auto) {
                 customPath->setEnabled(value);  //
             },
-            this->managedConnections);
+            this->managedConnections_);
     }
 
     layout->addStretch(1);

src/widgets/settingspages/HighlightingPage.cpp

@@ -131,7 +131,7 @@ HighlightingPage::HighlightingPage()
     }
 
     // ---- misc
-    this->disabledUsersChangedTimer.setSingleShot(true);
+    this->disabledUsersChangedTimer_.setSingleShot(true);
 }
 
 }  // namespace chatterino

src/widgets/settingspages/HighlightingPage.hpp

@@ -16,7 +16,7 @@ public:
     HighlightingPage();
 
 private:
-    QTimer disabledUsersChangedTimer;
+    QTimer disabledUsersChangedTimer_;
 };
 
 }  // namespace chatterino

src/widgets/settingspages/IgnoresPage.cpp

@@ -34,7 +34,7 @@ IgnoresPage::IgnoresPage()
     auto tabs = layout.emplace<QTabWidget>();
 
     addPhrasesTab(tabs.appendTab(new QVBoxLayout, "Phrases"));
-    addUsersTab(*this, tabs.appendTab(new QVBoxLayout, "Users"), this->userListModel);
+    addUsersTab(*this, tabs.appendTab(new QVBoxLayout, "Users"), this->userListModel_);
 
     auto label = layout.emplace<QLabel>(INFO);
     label->setWordWrap(true);
@@ -95,7 +95,7 @@ void IgnoresPage::onShow()
     for (const auto &ignoredUser : user->getIgnores()) {
         users << ignoredUser.name;
     }
-    this->userListModel.setStringList(users);
+    this->userListModel_.setStringList(users);
 }
 
 }  // namespace chatterino

src/widgets/settingspages/IgnoresPage.hpp

@@ -16,7 +16,7 @@ public:
     void onShow() final;
 
 private:
-    QStringListModel userListModel;
+    QStringListModel userListModel_;
 };
 
 }  // namespace chatterino

src/widgets/settingspages/LookPage.cpp

@@ -355,8 +355,8 @@ QLayout *LookPage::createFontChanger()
                        ", " + QString::number(app->fonts->chatFontSize) + "pt)");
     };
 
-    app->fonts->chatFontFamily.connectSimple(updateFontFamilyLabel, this->managedConnections);
-    app->fonts->chatFontSize.connectSimple(updateFontFamilyLabel, this->managedConnections);
+    app->fonts->chatFontFamily.connectSimple(updateFontFamilyLabel, this->managedConnections_);
+    app->fonts->chatFontSize.connectSimple(updateFontFamilyLabel, this->managedConnections_);
 
     // BUTTON
     QPushButton *button = new QPushButton("Select");

src/widgets/settingspages/ModerationPage.cpp

@@ -146,7 +146,7 @@ ModerationPage::ModerationPage()
     }
 
     // ---- misc
-    this->itemsChangedTimer.setSingleShot(true);
+    this->itemsChangedTimer_.setSingleShot(true);
 }
 
 }  // namespace chatterino

src/widgets/settingspages/ModerationPage.hpp

@@ -14,7 +14,7 @@ public:
     ModerationPage();
 
 private:
-    QTimer itemsChangedTimer;
+    QTimer itemsChangedTimer_;
 };
 
 }  // namespace chatterino

src/widgets/settingspages/SettingsPage.cpp

@@ -4,25 +4,25 @@
 
 namespace chatterino {
 
-SettingsPage::SettingsPage(const QString &_name, const QString &_iconResource)
-    : name(_name)
-    , iconResource(_iconResource)
+SettingsPage::SettingsPage(const QString &name, const QString &iconResource)
+    : name_(name)
+    , iconResource_(iconResource)
 {
 }
 
 const QString &SettingsPage::getName()
 {
-    return this->name;
+    return this->name_;
 }
 
 const QString &SettingsPage::getIconResource()
 {
-    return this->iconResource;
+    return this->iconResource_;
 }
 
 void SettingsPage::cancel()
 {
-    this->onCancel.invoke();
+    this->onCancel_.invoke();
 }
 
 QCheckBox *SettingsPage::createCheckBox(const QString &text,
@@ -35,7 +35,7 @@ QCheckBox *SettingsPage::createCheckBox(const QString &text,
         [checkbox](const bool &value, auto) {
             checkbox->setChecked(value);  //
         },
-        this->managedConnections);
+        this->managedConnections_);
 
     // update setting on toggle
     QObject::connect(checkbox, &QCheckBox::toggled, this, [&setting](bool state) {
@@ -56,7 +56,7 @@ QComboBox *SettingsPage::createComboBox(const QStringList &items,
 
     // update when setting changes
     setting.connect([combo](const QString &value, auto) { combo->setCurrentText(value); },
-                    this->managedConnections);
+                    this->managedConnections_);
 
     QObject::connect(combo, &QComboBox::currentTextChanged,
                      [&setting](const QString &newValue) { setting = newValue; });

src/widgets/settingspages/SettingsPage.hpp

@@ -31,11 +31,11 @@ public:
     }
 
 protected:
-    QString name;
-    QString iconResource;
+    QString name_;
+    QString iconResource_;
 
-    pajlada::Signals::NoArgSignal onCancel;
-    std::vector<pajlada::Signals::ScopedConnection> managedConnections;
+    pajlada::Signals::NoArgSignal onCancel_;
+    std::vector<pajlada::Signals::ScopedConnection> managedConnections_;
 };
 
 }  // namespace chatterino