From 40983db71ca4ac9b2da9d454fd4024a4541b4d61 Mon Sep 17 00:00:00 2001
From: Leonardo Zide <leozide@gmail.com>
Date: Sun, 28 Feb 2021 10:57:14 -0800
Subject: [PATCH] View cleanup.

---
 common/lc_viewwidget.cpp | 18 ++----------------
 common/lc_viewwidget.h   |  7 +++----
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/common/lc_viewwidget.cpp b/common/lc_viewwidget.cpp
index bcfe06ff..22b83f92 100644
--- a/common/lc_viewwidget.cpp
+++ b/common/lc_viewwidget.cpp
@@ -12,17 +12,11 @@
 #include "lc_profile.h"
 #include "lc_previewwidget.h"
 
-static QList<lcViewWidget*> gWidgetList;
-
 lcViewWidget::lcViewWidget(QWidget* Parent, lcView* View)
-	: QOpenGLWidget(Parent)
+	: QOpenGLWidget(Parent), mView(View)
 {
-	mWheelAccumulator = 0;
-	mView = View;
 	mView->SetWidget(this);
 
-	gWidgetList.append(this);
-
 	setMouseTracking(true);
 
 	if (View->GetViewType() == lcViewType::View)
@@ -32,13 +26,6 @@ lcViewWidget::lcViewWidget(QWidget* Parent, lcView* View)
 	}
 }
 
-lcViewWidget::~lcViewWidget()
-{
-	gWidgetList.removeOne(this);
-
-	delete mView;
-}
-
 QSize lcViewWidget::sizeHint() const
 {
 	return mPreferredSize.isEmpty() ? QOpenGLWidget::sizeHint() : mPreferredSize;
@@ -62,8 +49,7 @@ void lcViewWidget::SetView(lcView* View)
 			View->SetFocus(true);
 	}
 
-	delete mView;
-	mView = View;
+	mView = std::unique_ptr<lcView>(View);
 }
 
 void lcViewWidget::initializeGL()
diff --git a/common/lc_viewwidget.h b/common/lc_viewwidget.h
index 15748323..45e3b866 100644
--- a/common/lc_viewwidget.h
+++ b/common/lc_viewwidget.h
@@ -6,11 +6,10 @@ class lcViewWidget : public QOpenGLWidget
 
 public:
 	lcViewWidget(QWidget* Parent, lcView* View);
-	~lcViewWidget();
 
 	lcView* GetView() const
 	{
-		return mView;
+		return mView.get();
 	}
 
 	void SetView(lcView* View);
@@ -44,7 +43,7 @@ protected:
 	void dragMoveEvent(QDragMoveEvent* DragMoveEvent) override;
 	void dropEvent(QDropEvent* DropEvent) override;
 
-	lcView* mView;
+	std::unique_ptr<lcView> mView;
 	QSize mPreferredSize;
-	int mWheelAccumulator;
+	int mWheelAccumulator = 0;
 };