From f4df26217913bcb3be52409358e9e644b8b3ffc2 Mon Sep 17 00:00:00 2001 From: Rasmus Karlsson Date: Sun, 13 Aug 2017 16:10:53 +0200 Subject: [PATCH] Turn NotebookTab into a BaseWidget --- src/widgets/notebooktab.cpp | 3 +-- src/widgets/notebooktab.hpp | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/widgets/notebooktab.cpp b/src/widgets/notebooktab.cpp index 353e694b..af17173c 100644 --- a/src/widgets/notebooktab.cpp +++ b/src/widgets/notebooktab.cpp @@ -9,8 +9,7 @@ namespace chatterino { namespace widgets { NotebookTab::NotebookTab(Notebook *_notebook) - : QWidget(_notebook) - , colorScheme(_notebook->colorScheme) + : BaseWidget(_notebook) , positionChangedAnimation(this, "pos") , notebook(_notebook) { diff --git a/src/widgets/notebooktab.hpp b/src/widgets/notebooktab.hpp index 1856509e..36b06b49 100644 --- a/src/widgets/notebooktab.hpp +++ b/src/widgets/notebooktab.hpp @@ -1,7 +1,8 @@ #pragma once +#include "widgets/basewidget.hpp" + #include -#include #include #include #include @@ -15,7 +16,7 @@ namespace widgets { class Notebook; class NotebookPage; -class NotebookTab : public QWidget +class NotebookTab : public BaseWidget { Q_OBJECT @@ -25,8 +26,6 @@ public: explicit NotebookTab(Notebook *_notebook); ~NotebookTab(); - ColorScheme &colorScheme; - void calcSize(); NotebookPage *page;