From 0d417dfa2d169b03dfb5960b82036e20aefff3bf Mon Sep 17 00:00:00 2001 From: fourtf Date: Mon, 29 Jan 2018 13:22:22 +0100 Subject: [PATCH] minor style changes --- chatterino.pro | 1 - src/widgets/split.cpp | 6 +----- src/widgets/split.hpp | 1 - src/widgets/titlebar.cpp | 13 ------------- src/widgets/window.cpp | 9 +-------- 5 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 src/widgets/titlebar.cpp diff --git a/chatterino.pro b/chatterino.pro index 201361ff..2754b545 100644 --- a/chatterino.pro +++ b/chatterino.pro @@ -115,7 +115,6 @@ SOURCES += \ src/singletons/emotemanager.cpp \ src/messages/messagebuilder.cpp \ src/twitch/twitchmessagebuilder.cpp \ - src/widgets/titlebar.cpp \ src/singletons/accountmanager.cpp \ src/twitch/twitchuser.cpp \ src/ircaccount.cpp \ diff --git a/src/widgets/split.cpp b/src/widgets/split.cpp index 22dcdd67..e75ededd 100644 --- a/src/widgets/split.cpp +++ b/src/widgets/split.cpp @@ -1,4 +1,5 @@ #include "widgets/split.hpp" + #include "singletons/channelmanager.hpp" #include "singletons/settingsmanager.hpp" #include "singletons/thememanager.hpp" @@ -137,11 +138,6 @@ ChannelPtr Split::getChannel() const return this->channel; } -ChannelPtr &Split::getChannelRef() -{ - return this->channel; -} - void Split::setChannel(ChannelPtr _newChannel) { this->view.setChannel(_newChannel); diff --git a/src/widgets/split.hpp b/src/widgets/split.hpp index 42ec4c69..43f1e048 100644 --- a/src/widgets/split.hpp +++ b/src/widgets/split.hpp @@ -56,7 +56,6 @@ public: const std::string &getUUID() const; ChannelPtr getChannel() const; - ChannelPtr &getChannelRef(); void setFlexSizeX(double x); double getFlexSizeX(); void setFlexSizeY(double y); diff --git a/src/widgets/titlebar.cpp b/src/widgets/titlebar.cpp deleted file mode 100644 index ee3ac742..00000000 --- a/src/widgets/titlebar.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "titlebar.hpp" - -namespace chatterino { -namespace widgets { - -TitleBar::TitleBar(QWidget *parent) - : QWidget(parent) -{ - setFixedHeight(32); -} - -} // namespace widgets -} // namespace chatterino diff --git a/src/widgets/window.cpp b/src/widgets/window.cpp index 0b5f58bc..ed8834c6 100644 --- a/src/widgets/window.cpp +++ b/src/widgets/window.cpp @@ -47,11 +47,6 @@ Window::Window(const QString &windowName, singletons::ThemeManager &_themeManage QVBoxLayout *layout = new QVBoxLayout(this); - // add titlebar - // if (SettingsManager::getInstance().useCustomWindowFrame.get()) { - // layout->addWidget(&_titleBar); - // } - layout->addWidget(&this->notebook); this->getLayoutContainer()->setLayout(layout); @@ -64,9 +59,7 @@ Window::Window(const QString &windowName, singletons::ThemeManager &_themeManage /// Initialize program-wide hotkeys // CTRL+P: Open Settings Dialog - CreateWindowShortcut(this, "CTRL+P", [] { - SettingsDialog::showDialog(); // - }); + CreateWindowShortcut(this, "CTRL+P", [] { SettingsDialog::showDialog(); }); // CTRL+Number: Switch to n'th tab CreateWindowShortcut(this, "CTRL+1", [this] { this->notebook.selectIndex(0); });