View cleanup.
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user