From f0e6f9a5f9594dfef5961631370978019351b60e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Sat, 14 Mar 2020 00:45:50 +1100
Subject: [PATCH] various: created derived class for widget derivations of
 TimelineScaledObject

Minor code cleanup, faster than deriving both QWidget and
TimelineScaledObject each time.
---
 app/widget/timebased/timebased.cpp                 | 2 +-
 app/widget/timebased/timebased.h                   | 2 +-
 app/widget/timelinewidget/timelinescaledobject.cpp | 5 +++++
 app/widget/timelinewidget/timelinescaledobject.h   | 8 ++++++++
 app/widget/timeruler/timeruler.cpp                 | 2 +-
 app/widget/timeruler/timeruler.h                   | 2 +-
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/widget/timebased/timebased.cpp b/app/widget/timebased/timebased.cpp
index a23b1701f..ded2687ec 100644
--- a/app/widget/timebased/timebased.cpp
+++ b/app/widget/timebased/timebased.cpp
@@ -8,7 +8,7 @@
 #include "widget/timelinewidget/undo/undo.h"
 
 TimeBasedWidget::TimeBasedWidget(bool ruler_text_visible, bool ruler_cache_status_visible, QWidget *parent) :
-  QWidget(parent),
+  TimelineScaledWidget(parent),
   viewer_node_(nullptr),
   auto_max_scrollbar_(false),
   points_(nullptr)
diff --git a/app/widget/timebased/timebased.h b/app/widget/timebased/timebased.h
index 4f24556e2..24ea72299 100644
--- a/app/widget/timebased/timebased.h
+++ b/app/widget/timebased/timebased.h
@@ -9,7 +9,7 @@
 #include "widget/timelinewidget/timelinescaledobject.h"
 #include "widget/timeruler/timeruler.h"
 
-class TimeBasedWidget : public QWidget, public TimelineScaledObject
+class TimeBasedWidget : public TimelineScaledWidget
 {
   Q_OBJECT
 public:
diff --git a/app/widget/timelinewidget/timelinescaledobject.cpp b/app/widget/timelinewidget/timelinescaledobject.cpp
index d010c5129..278efb07e 100644
--- a/app/widget/timelinewidget/timelinescaledobject.cpp
+++ b/app/widget/timelinewidget/timelinescaledobject.cpp
@@ -77,3 +77,8 @@ void TimelineScaledObject::SetScale(const double& scale)
 
   ScaleChangedEvent(scale_);
 }
+
+TimelineScaledWidget::TimelineScaledWidget(QWidget *parent) :
+  QWidget(parent)
+{
+}
diff --git a/app/widget/timelinewidget/timelinescaledobject.h b/app/widget/timelinewidget/timelinescaledobject.h
index ed6a6bcb7..26a151a6f 100644
--- a/app/widget/timelinewidget/timelinescaledobject.h
+++ b/app/widget/timelinewidget/timelinescaledobject.h
@@ -1,6 +1,8 @@
 #ifndef TIMELINESCALEDOBJECT_H
 #define TIMELINESCALEDOBJECT_H
 
+#include <QWidget>
+
 #include "common/rational.h"
 
 class TimelineScaledObject
@@ -41,4 +43,10 @@ private:
 
 };
 
+class TimelineScaledWidget : public QWidget, public TimelineScaledObject
+{
+public:
+  TimelineScaledWidget(QWidget* parent = nullptr);
+};
+
 #endif // TIMELINESCALEDOBJECT_H
diff --git a/app/widget/timeruler/timeruler.cpp b/app/widget/timeruler/timeruler.cpp
index 56670d420..beb0daf5c 100644
--- a/app/widget/timeruler/timeruler.cpp
+++ b/app/widget/timeruler/timeruler.cpp
@@ -31,7 +31,7 @@
 #include "core.h"
 
 TimeRuler::TimeRuler(bool text_visible, bool cache_status_visible, QWidget* parent) :
-  QWidget(parent),
+  TimelineScaledWidget(parent),
   scroll_(0),
   text_visible_(text_visible),
   centered_text_(true),
diff --git a/app/widget/timeruler/timeruler.h b/app/widget/timeruler/timeruler.h
index b0752d656..471d1b752 100644
--- a/app/widget/timeruler/timeruler.h
+++ b/app/widget/timeruler/timeruler.h
@@ -30,7 +30,7 @@
 #include "widget/timelinewidget/timelinescaledobject.h"
 #include "widget/timelinewidget/view/timelineplayhead.h"
 
-class TimeRuler : public QWidget, public TimelineScaledObject
+class TimeRuler : public TimelineScaledWidget
 {
   Q_OBJECT
 public: