chatterino2
Code Issues

removed namespaces

Browse Source
This commit is contained in:
fourtf
2018-06-26 17:06:17 +02:00
parent 2df0566492
commit 54eb07e116
132 changed files with 805 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/settingspages/AboutPage.cpp
+2 -2
View File
@@ -17,11 +17,11 @@ namespace chatterino {
AboutPage::AboutPage()
: SettingsPage("About", ":/images/about.svg")
{
util::LayoutCreator<AboutPage> layoutCreator(this);
LayoutCreator<AboutPage> layoutCreator(this);
auto scroll = layoutCreator.emplace<QScrollArea>();
auto widget = scroll.emplaceScrollAreaWidget();
util::removeScrollAreaBackground(scroll.getElement(), widget.getElement());
removeScrollAreaBackground(scroll.getElement(), widget.getElement());
auto layout = widget.setLayoutType<QVBoxLayout>();
{
src/widgets/settingspages/AccountsPage.cpp
+3 -3
View File
@@ -21,11 +21,11 @@ AccountsPage::AccountsPage()
{
auto *app = getApp();
util::LayoutCreator<AccountsPage> layoutCreator(this);
LayoutCreator<AccountsPage> layoutCreator(this);
auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin();
helper::EditableModelView *view =
layout.emplace<helper::EditableModelView>(app->accounts->createModel(nullptr)).getElement();
EditableModelView *view =
layout.emplace<EditableModelView>(app->accounts->createModel(nullptr)).getElement();
view->getTableView()->horizontalHeader()->setVisible(false);
view->getTableView()->horizontalHeader()->setStretchLastSection(true);
src/widgets/settingspages/AppearancePage.cpp
+7 -7
View File
@@ -35,11 +35,11 @@ AppearancePage::AppearancePage()
: SettingsPage("Look", ":/images/theme.svg")
{
auto app = getApp();
util::LayoutCreator<AppearancePage> layoutCreator(this);
LayoutCreator<AppearancePage> layoutCreator(this);
auto scroll = layoutCreator.emplace<QScrollArea>();
auto widget = scroll.emplaceScrollAreaWidget();
util::removeScrollAreaBackground(scroll.getElement(), widget.getElement());
removeScrollAreaBackground(scroll.getElement(), widget.getElement());
auto layout = widget.setLayoutType<QVBoxLayout>();
@@ -226,7 +226,7 @@ QLayout *AppearancePage::createFontChanger()
button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Policy::Fixed);
QObject::connect(button, &QPushButton::clicked, [=]() {
QFontDialog dialog(app->fonts->getFont(singletons::FontManager::ChatMedium, 1.));
QFontDialog dialog(app->fonts->getFont(chatterino::FontManager::ChatMedium, 1.));
dialog.setWindowFlag(Qt::WindowStaysOnTopHint);
@@ -250,10 +250,10 @@ QLayout *AppearancePage::createUiScaleSlider()
layout->addWidget(slider);
layout->addWidget(label);
slider->setMinimum(singletons::WindowManager::uiScaleMin);
slider->setMaximum(singletons::WindowManager::uiScaleMax);
slider->setMinimum(chatterino::WindowManager::uiScaleMin);
slider->setMaximum(chatterino::WindowManager::uiScaleMax);
slider->setValue(
singletons::WindowManager::clampUiScale(getApp()->settings->uiScale.getValue()));
chatterino::WindowManager::clampUiScale(getApp()->settings->uiScale.getValue()));
label->setMinimumWidth(100);
@@ -262,7 +262,7 @@ QLayout *AppearancePage::createUiScaleSlider()
getApp()->settings->uiScale.connect(
[label](auto, auto) {
label->setText(QString::number(singletons::WindowManager::getUiScaleValue()));
label->setText(QString::number(chatterino::WindowManager::getUiScaleValue()));
},
this->connections_);
src/widgets/settingspages/BehaviourPage.cpp
+1 -1
View File
@@ -24,7 +24,7 @@ BehaviourPage::BehaviourPage()
: SettingsPage("Feel", ":/images/behave.svg")
{
auto app = getApp();
util::LayoutCreator<BehaviourPage> layoutCreator(this);
LayoutCreator<BehaviourPage> layoutCreator(this);
auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
src/widgets/settingspages/BrowserextensionPage.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ namespace chatterino {
BrowserExtensionPage::BrowserExtensionPage()
: SettingsPage("Browser Extension", "")
{
auto layout = util::LayoutCreator<BrowserExtensionPage>(this).setLayoutType<QVBoxLayout>();
auto layout = LayoutCreator<BrowserExtensionPage>(this).setLayoutType<QVBoxLayout>();
auto label =
layout.emplace<QLabel>("The browser extension will replace the default Twitch.tv chat with "
src/widgets/settingspages/CommandPage.cpp
+4 -4
View File
@@ -31,17 +31,17 @@ CommandPage::CommandPage()
{
auto app = getApp();
util::LayoutCreator<CommandPage> layoutCreator(this);
LayoutCreator<CommandPage> layoutCreator(this);
auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin();
helper::EditableModelView *view =
layout.emplace<helper::EditableModelView>(app->commands->createModel(nullptr)).getElement();
EditableModelView *view =
layout.emplace<EditableModelView>(app->commands->createModel(nullptr)).getElement();
view->setTitles({"Trigger", "Command"});
view->getTableView()->horizontalHeader()->setStretchLastSection(true);
view->addButtonPressed.connect([] {
getApp()->commands->items.appendItem(
controllers::commands::Command{"/command", "I made a new command HeyGuys"});
Command{"/command", "I made a new command HeyGuys"});
});
layout.append(this->createCheckBox("Also match the trigger at the end of the message",
src/widgets/settingspages/EmotesPage.cpp
+2 -2
View File
@@ -7,8 +7,8 @@ namespace chatterino {
EmotesPage::EmotesPage()
: SettingsPage("Emotes", ":/images/emote.svg")
{
// singletons::SettingManager &settings = singletons::SettingManager::getInstance();
// util::LayoutCreator<EmotesPage> layoutCreator(this);
// chatterino::SettingManager &settings = chatterino::SettingManager::getInstance();
// LayoutCreator<EmotesPage> layoutCreator(this);
// auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin();
// // clang-format off
src/widgets/settingspages/ExternaltoolsPage.cpp
+1 -1
View File
@@ -23,7 +23,7 @@ ExternalToolsPage::ExternalToolsPage()
{
auto app = getApp();
util::LayoutCreator<ExternalToolsPage> layoutCreator(this);
LayoutCreator<ExternalToolsPage> layoutCreator(this);
auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
{
src/widgets/settingspages/HighlightingPage.cpp
+4 -4
View File
@@ -30,7 +30,7 @@ HighlightingPage::HighlightingPage()
: SettingsPage("Highlights", ":/images/notifications.svg")
{
auto app = getApp();
util::LayoutCreator<HighlightingPage> layoutCreator(this);
LayoutCreator<HighlightingPage> layoutCreator(this);
auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin();
{
@@ -43,9 +43,9 @@ HighlightingPage::HighlightingPage()
// HIGHLIGHTS
auto highlights = tabs.appendTab(new QVBoxLayout, "Highlights");
{
helper::EditableModelView *view =
EditableModelView *view =
highlights
.emplace<helper::EditableModelView>(app->highlights->createModel(nullptr))
.emplace<EditableModelView>(app->highlights->createModel(nullptr))
.getElement();
view->setTitles({"Pattern", "Flash taskbar", "Play sound", "Regex"});
@@ -61,7 +61,7 @@ HighlightingPage::HighlightingPage()
view->addButtonPressed.connect([] {
getApp()->highlights->phrases.appendItem(
controllers::highlights::HighlightPhrase{"my phrase", true, false, false});
HighlightPhrase{"my phrase", true, false, false});
});
}
auto disabledUsers = tabs.appendTab(new QVBoxLayout, "Disabled Users");
src/widgets/settingspages/IgnoreusersPage.cpp
+4 -4
View File
@@ -28,7 +28,7 @@ IgnoreUsersPage::IgnoreUsersPage()
{
auto app = getApp();
util::LayoutCreator<IgnoreUsersPage> layoutCreator(this);
LayoutCreator<IgnoreUsersPage> layoutCreator(this);
auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
// auto group = layout.emplace<QGroupBox>("Ignored users").setLayoutType<QVBoxLayout>();
@@ -63,8 +63,8 @@ IgnoreUsersPage::IgnoreUsersPage()
// messages
auto messages = tabs.appendTab(new QVBoxLayout, "Messages");
{
helper::EditableModelView *view =
messages.emplace<helper::EditableModelView>(app->ignores->createModel(nullptr))
EditableModelView *view =
messages.emplace<EditableModelView>(app->ignores->createModel(nullptr))
.getElement();
view->setTitles({"Pattern", "Regex"});
view->getTableView()->horizontalHeader()->setSectionResizeMode(QHeaderView::Fixed);
@@ -78,7 +78,7 @@ IgnoreUsersPage::IgnoreUsersPage()
view->addButtonPressed.connect([] {
getApp()->ignores->phrases.appendItem(
controllers::ignores::IgnorePhrase{"my phrase", false});
IgnorePhrase{"my phrase", false});
});
}
src/widgets/settingspages/KeyboardsettingsPage.cpp
+1 -1
View File
@@ -10,7 +10,7 @@ namespace chatterino {
KeyboardSettingsPage::KeyboardSettingsPage()
: SettingsPage("Keybindings", "")
{
auto layout = util::LayoutCreator<KeyboardSettingsPage>(this).setLayoutType<QVBoxLayout>();
auto layout = LayoutCreator<KeyboardSettingsPage>(this).setLayoutType<QVBoxLayout>();
auto form = layout.emplace<QFormLayout>();
src/widgets/settingspages/LogsPage.cpp
+1 -1
View File
@@ -28,7 +28,7 @@
//{
// auto app = getApp();
// util::LayoutCreator<LogsPage> layoutCreator(this);
// LayoutCreator<LogsPage> layoutCreator(this);
// auto layout = layoutCreator.emplace<QVBoxLayout>().withoutMargin();
// auto logPath = app->paths->logsFolderPath;
src/widgets/settingspages/ModerationPage.cpp
+3 -3
View File
@@ -35,7 +35,7 @@ ModerationPage::ModerationPage()
: SettingsPage("Moderation", "")
{
auto app = getApp();
util::LayoutCreator<ModerationPage> layoutCreator(this);
LayoutCreator<ModerationPage> layoutCreator(this);
auto tabs = layoutCreator.emplace<QTabWidget>();
@@ -119,7 +119,7 @@ ModerationPage::ModerationPage()
/*auto taggedUsers = tabs.appendTab(new QVBoxLayout, "Tagged users");
{
helper::EditableModelView *view = *taggedUsers.emplace<helper::EditableModelView>(
EditableModelView *view = *taggedUsers.emplace<EditableModelView>(
app->taggedUsers->createModel(nullptr));
view->setTitles({"Name"});
@@ -127,7 +127,7 @@ ModerationPage::ModerationPage()
view->addButtonPressed.connect([] {
getApp()->taggedUsers->users.appendItem(
controllers::taggedusers::TaggedUser(ProviderId::Twitch, "example", "xD"));
TaggedUser(ProviderId::Twitch, "example", "xD"));
});
}*/
}
src/widgets/settingspages/SpecialChannelsPage.cpp
+1 -1
View File
@@ -15,7 +15,7 @@ SpecialChannelsPage::SpecialChannelsPage()
{
auto app = getApp();
util::LayoutCreator<SpecialChannelsPage> layoutCreator(this);
LayoutCreator<SpecialChannelsPage> layoutCreator(this);
auto layout = layoutCreator.setLayoutType<QVBoxLayout>();
auto mentions = layout.emplace<QGroupBox>("Mentions channel").setLayoutType<QVBoxLayout>();