ui: Refactored View initialization

* moved initView() implementation where used into constructor
* specify methods as override instead of virtual where applicable
* use default destructors where applicable

src/lib/component/view/View.cpp

@@ -9,13 +9,6 @@ View::View(ViewLayout* viewLayout)
 {
 }
 
-void View::init()
-{
-	createWidgetWrapper();
-
-	initView();
-}
-
 void View::addToLayout()
 {
 	m_viewLayout->addView(this);

src/lib/component/view/View.h

@@ -15,11 +15,11 @@ class ControllerProxy;
 class View
 {
 public:
-	template<typename T>
-	static std::shared_ptr<T> createInitAndAddToLayout(ViewLayout* viewLayout);
+	template<typename T, typename... Args>
+	static std::shared_ptr<T> create(ViewLayout* viewLayout, const Args... args);
 
-	template<typename T>
-	static std::shared_ptr<T> createAndInit(ViewLayout* viewLayout);
+	template<typename T, typename... Args>
+	static std::shared_ptr<T> createAndAddToLayout(ViewLayout* viewLayout, const Args... args);
 
 	View(ViewLayout* viewLayout);
 	virtual ~View() = default;
@@ -27,10 +27,8 @@ public:
 	virtual std::string getName() const = 0;
 
 	virtual void createWidgetWrapper() = 0;
-	virtual void initView() = 0;
 	virtual void refreshView() = 0;
 
-	void init();
 	void addToLayout();
 	void showDockWidget();
 
@@ -56,22 +54,22 @@ private:
 	std::shared_ptr<ViewWidgetWrapper> m_widgetWrapper;
 };
 
-template<typename T>
-std::shared_ptr<T> View::createInitAndAddToLayout(ViewLayout* viewLayout)
+template<typename T, typename... Args>
+std::shared_ptr<T> View::create(ViewLayout* viewLayout, const Args... args)
 {
-	std::shared_ptr<T> ptr = View::createAndInit<T>(viewLayout);
+	std::shared_ptr<T> ptr = std::make_shared<T>(viewLayout, args...);
 
-	ptr->addToLayout();
+	ptr->createWidgetWrapper();
 
 	return ptr;
 }
 
-template<typename T>
-std::shared_ptr<T> View::createAndInit(ViewLayout* viewLayout)
+template<typename T, typename... Args>
+std::shared_ptr<T> View::createAndAddToLayout(ViewLayout* viewLayout, const Args... args)
 {
-	std::shared_ptr<T> ptr = std::make_shared<T>(viewLayout);
+	std::shared_ptr<T> ptr = View::create<T, Args...>(viewLayout, args...);
 
-	ptr->init();
+	ptr->addToLayout();
 
 	return ptr;
 }

src/lib_gui/qt/view/QtBookmarkButtonsView.cpp

@@ -19,15 +19,6 @@ QtBookmarkButtonsView::QtBookmarkButtonsView(ViewLayout* viewLayout)
 	, m_createButtonState(MessageBookmarkButtonState::CANNOT_CREATE)
 {
 	m_widget = new QFrame();
-}
-
-void QtBookmarkButtonsView::createWidgetWrapper()
-{
-	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
-}
-
-void QtBookmarkButtonsView::initView()
-{
 	m_widget->setObjectName("bookmark_bar");
 
 	QBoxLayout* layout = new QHBoxLayout();
@@ -54,6 +45,11 @@ void QtBookmarkButtonsView::initView()
 	connect(m_showBookmarksButton, &QPushButton::clicked, this, &QtBookmarkButtonsView::showBookmarksClicked);
 }
 
+void QtBookmarkButtonsView::createWidgetWrapper()
+{
+	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
+}
+
 void QtBookmarkButtonsView::refreshView()
 {
 	m_onQtThread(

src/lib_gui/qt/view/QtBookmarkButtonsView.h

@@ -16,11 +16,10 @@ class QtBookmarkButtonsView
 
 public:
 	QtBookmarkButtonsView(ViewLayout* viewLayout);
-	virtual ~QtBookmarkButtonsView() = default;
+	~QtBookmarkButtonsView() = default;
 
 	// View implementation
 	void createWidgetWrapper() override;
-	void initView() override;
 	void refreshView() override;
 
 	// BookmarkView implementation

src/lib_gui/qt/view/QtBookmarkView.cpp

@@ -17,10 +17,6 @@ void QtBookmarkView::createWidgetWrapper()
 {
 }
 
-void QtBookmarkView::initView()
-{
-}
-
 void QtBookmarkView::refreshView()
 {
 }

src/lib_gui/qt/view/QtBookmarkView.h

@@ -14,21 +14,20 @@ class QtBookmarkView
 {
 public:
 	QtBookmarkView(ViewLayout* viewLayout);
-	virtual ~QtBookmarkView() = default;
+	~QtBookmarkView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// BookmarkView implementation
-	virtual void displayBookmarkCreator(
-		const std::vector<std::wstring>& names, const std::vector<BookmarkCategory>& categories, Id nodeId);
-	virtual void displayBookmarkEditor(
-		std::shared_ptr<Bookmark> bookmark, const std::vector<BookmarkCategory>& categories);
+	void displayBookmarkCreator(
+		const std::vector<std::wstring>& names, const std::vector<BookmarkCategory>& categories, Id nodeId) override;
+	void displayBookmarkEditor(
+		std::shared_ptr<Bookmark> bookmark, const std::vector<BookmarkCategory>& categories) override;
 
-	virtual void displayBookmarks(const std::vector<std::shared_ptr<Bookmark>>& bookmarks);
-	virtual bool bookmarkBrowserIsVisible() const;
+	void displayBookmarks(const std::vector<std::shared_ptr<Bookmark>>& bookmarks) override;
+	bool bookmarkBrowserIsVisible() const override;
 
 private:
 	ControllerProxy<BookmarkController> m_controllerProxy;

src/lib_gui/qt/view/QtCodeView.cpp

@@ -17,19 +17,11 @@ QtCodeView::QtCodeView(ViewLayout* viewLayout)
 	m_widget = new QtCodeNavigator();
 }
 
-QtCodeView::~QtCodeView()
-{
-}
-
 void QtCodeView::createWidgetWrapper()
 {
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
 }
 
-void QtCodeView::initView()
-{
-}
-
 void QtCodeView::refreshView()
 {
 	if (getController())

src/lib_gui/qt/view/QtCodeView.h

@@ -11,45 +11,44 @@ class QtCodeView
 {
 public:
 	QtCodeView(ViewLayout* viewLayout);
-	~QtCodeView();
+	~QtCodeView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// ScreenSearchResponder implementation
-	virtual bool isVisible() const;
-	virtual void findMatches(ScreenSearchSender* sender, const std::wstring& query);
-	virtual void activateMatch(size_t matchIndex);
-	virtual void deactivateMatch(size_t matchIndex);
-	virtual void clearMatches();
+	bool isVisible() const override;
+	void findMatches(ScreenSearchSender* sender, const std::wstring& query) override;
+	void activateMatch(size_t matchIndex) override;
+	void deactivateMatch(size_t matchIndex) override;
+	void clearMatches() override;
 
 	// CodeView implementation
-	virtual void clear();
+	void clear() override;
 
-	virtual void showCodeSnippets(const std::vector<CodeSnippetParams>& snippets, const CodeParams params);
-	virtual void updateCodeSnippets(const std::vector<CodeSnippetParams>& snippets);
-	virtual void scrollTo(const ScrollParams params);
+	void showCodeSnippets(const std::vector<CodeSnippetParams>& snippets, const CodeParams params) override;
+	void updateCodeSnippets(const std::vector<CodeSnippetParams>& snippets) override;
+	void scrollTo(const ScrollParams params) override;
 
-	virtual bool showsErrors() const;
+	bool showsErrors() const override;
 
-	virtual void setFileState(const FilePath filePath, FileState state);
+	void setFileState(const FilePath filePath, FileState state) override;
 
-	virtual void showActiveSnippet(
-		const std::vector<Id>& activeTokenIds, std::shared_ptr<SourceLocationCollection> collection, bool scrollTo);
-	virtual void showActiveTokenIds(const std::vector<Id>& activeTokenIds);
-	virtual void showActiveLocalSymbolIds(const std::vector<Id>& activeLocalSymbolIds);
+	void showActiveSnippet(
+		const std::vector<Id>& activeTokenIds, std::shared_ptr<SourceLocationCollection> collection, bool scrollTo) override;
+	void showActiveTokenIds(const std::vector<Id>& activeTokenIds) override;
+	void showActiveLocalSymbolIds(const std::vector<Id>& activeLocalSymbolIds) override;
 
-	virtual void focusTokenIds(const std::vector<Id>& focusedTokenIds);
-	virtual void defocusTokenIds();
+	void focusTokenIds(const std::vector<Id>& focusedTokenIds) override;
+	void defocusTokenIds() override;
 
-	virtual void showContents();
+	void showContents() override;
 
-	virtual bool isInListMode() const;
-	virtual void setMode(bool listMode);
+	bool isInListMode() const override;
+	void setMode(bool listMode) override;
 
-	virtual bool hasSingleFileCached(const FilePath& filePath) const;
+	bool hasSingleFileCached(const FilePath& filePath) const override;
 
 private:
 	void performScroll();

src/lib_gui/qt/view/QtCompositeView.cpp

@@ -29,19 +29,11 @@ QtCompositeView::QtCompositeView(ViewLayout* viewLayout, CompositeDirection dire
 	refreshView();
 }
 
-QtCompositeView::~QtCompositeView()
-{
-}
-
 void QtCompositeView::createWidgetWrapper()
 {
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
 }
 
-void QtCompositeView::initView()
-{
-}
-
 void QtCompositeView::refreshView()
 {
 	m_onQtThread([=]()

src/lib_gui/qt/view/QtCompositeView.h

@@ -11,15 +11,14 @@ class QtCompositeView
 {
 public:
 	QtCompositeView(ViewLayout* viewLayout, CompositeDirection direction, const std::string& name);
-	~QtCompositeView();
+	~QtCompositeView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// CompositeView implementation
-	virtual void addViewWidget(View* view);
+	void addViewWidget(View* view) override;
 
 private:
 	QtThreadedLambdaFunctor m_onQtThread;

src/lib_gui/qt/view/QtErrorView.cpp

@@ -30,19 +30,9 @@ QtErrorView::QtErrorView(ViewLayout* viewLayout)
 	, m_controllerProxy(this, TabId::app())
 {
 	s_errorIcon = QIcon(QString::fromStdWString(ResourcePaths::getGuiPath().concatenate(L"indexing_dialog/error.png").wstr()));
-}
 
-QtErrorView::~QtErrorView()
-{
-}
-
-void QtErrorView::createWidgetWrapper()
-{
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(new QFrame()));
-}
 
-void QtErrorView::initView()
-{
 	QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
 
 	QBoxLayout* layout = new QVBoxLayout();
@@ -173,6 +163,10 @@ void QtErrorView::initView()
 	layout->addLayout(checkboxes);
 }
 
+void QtErrorView::createWidgetWrapper()
+{
+}
+
 void QtErrorView::refreshView()
 {
 	m_onQtThread([=]()

src/lib_gui/qt/view/QtErrorView.h

@@ -26,23 +26,22 @@ class QtErrorView
 
 public:
 	QtErrorView(ViewLayout* viewLayout);
-	virtual ~QtErrorView();
+	~QtErrorView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// ErrorView implementation
-	virtual void clear();
+	void clear() override;
 
-	virtual void addErrors(const std::vector<ErrorInfo>& errors, const ErrorCountInfo& errorCount, bool scrollTo);
-	virtual void setErrorId(Id errorId);
+	void addErrors(const std::vector<ErrorInfo>& errors, const ErrorCountInfo& errorCount, bool scrollTo) override;
+	void setErrorId(Id errorId) override;
 
-	virtual void showErrorHelpMessage();
+	void showErrorHelpMessage() override;
 
-	virtual ErrorFilter getErrorFilter() const;
-	virtual void setErrorFilter(const ErrorFilter& filter);
+	ErrorFilter getErrorFilter() const override;
+	void setErrorFilter(const ErrorFilter& filter) override;
 
 private slots:
 	void errorFilterChanged(int i = 0);

src/lib_gui/qt/view/QtGraphView.cpp

@@ -44,20 +44,9 @@ QtGraphView::QtGraphView(ViewLayout* viewLayout)
 	, m_scrollToTop(false)
 	, m_restoreScroll(false)
 	, m_isIndexedList(false)
-{
-}
-
-QtGraphView::~QtGraphView()
-{
-}
-
-void QtGraphView::createWidgetWrapper()
 {
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(new QFrame()));
-}
 
-void QtGraphView::initView()
-{
 	QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
 
 	QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom);
@@ -206,6 +195,10 @@ void QtGraphView::initView()
 	}
 }
 
+void QtGraphView::createWidgetWrapper()
+{
+}
+
 void QtGraphView::refreshView()
 {
 	m_onQtThread([this]()

src/lib_gui/qt/view/QtGraphView.h

@@ -33,39 +33,38 @@ class QtGraphView
 
 public:
 	QtGraphView(ViewLayout* viewLayout);
-	virtual ~QtGraphView();
+	~QtGraphView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// ScreenSearchResponder implementation
-	virtual bool isVisible() const;
-	virtual void findMatches(ScreenSearchSender* sender, const std::wstring& query);
-	virtual void activateMatch(size_t matchIndex);
-	virtual void deactivateMatch(size_t matchIndex);
-	virtual void clearMatches();
+	bool isVisible() const override;
+	void findMatches(ScreenSearchSender* sender, const std::wstring& query) override;
+	void activateMatch(size_t matchIndex) override;
+	void deactivateMatch(size_t matchIndex) override;
+	void clearMatches() override;
 
 	// GraphView implementation
-	virtual void rebuildGraph(
+	void rebuildGraph(
 		std::shared_ptr<Graph> graph,
 		const std::vector<std::shared_ptr<DummyNode>>& nodes,
 		const std::vector<std::shared_ptr<DummyEdge>>& edges,
-		const GraphParams params);
-	virtual void clear();
+		const GraphParams params) override;
+	void clear() override;
 
-	virtual void focusTokenIds(const std::vector<Id>& focusedTokenIds);
-	virtual void defocusTokenIds(const std::vector<Id>& defocusedTokenIds);
+	void focusTokenIds(const std::vector<Id>& focusedTokenIds) override;
+	void defocusTokenIds(const std::vector<Id>& defocusedTokenIds) override;
 
-	virtual void resizeView();
+	void resizeView() override;
 
-	virtual Vec2i getViewSize() const;
-	virtual GroupType getGrouping() const;
+	Vec2i getViewSize() const override;
+	GroupType getGrouping() const override;
 
-	virtual void scrollToValues(int xValue, int yValue);
+	void scrollToValues(int xValue, int yValue) override;
 
-	virtual void activateEdge(Id edgeId);
+	void activateEdge(Id edgeId) override;
 
 private slots:
 	void updateScrollBars();

src/lib_gui/qt/view/QtGraphViewStyleImpl.h

@@ -9,7 +9,7 @@ class QtGraphViewStyleImpl
 	: public GraphViewStyleImpl
 {
 public:
-	virtual ~QtGraphViewStyleImpl() = default;
+	~QtGraphViewStyleImpl() = default;
 
 	float getCharWidth(const std::string& fontName, size_t fontSize) override;
 	float getCharHeight(const std::string& fontName, size_t fontSize) override;

src/lib_gui/qt/view/QtMainView.h

@@ -23,7 +23,7 @@ class QtMainView
 {
 public:
 	QtMainView(const ViewFactory* viewFactory, StorageAccess* storageAccess);
-	virtual ~QtMainView();
+	~QtMainView();
 
 	QtMainWindow* getMainWindow() const;
 

src/lib_gui/qt/view/QtRefreshView.cpp

@@ -43,10 +43,6 @@ void QtRefreshView::createWidgetWrapper()
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
 }
 
-void QtRefreshView::initView()
-{
-}
-
 void QtRefreshView::refreshView()
 {
 	m_onQtThread([this]()

src/lib_gui/qt/view/QtRefreshView.h

@@ -15,7 +15,6 @@ public:
 
 	// View implementation
 	void createWidgetWrapper() override;
-	void initView() override;
 	void refreshView() override;
 
 private:

src/lib_gui/qt/view/QtScreenSearchView.cpp

@@ -28,19 +28,11 @@ QtScreenSearchView::QtScreenSearchView(ViewLayout* viewLayout)
 	QObject::connect(mainWindow, &QtMainWindow::hideScreenSearch, this, &QtScreenSearchView::hide);
 }
 
-QtScreenSearchView::~QtScreenSearchView()
-{
-}
-
 void QtScreenSearchView::createWidgetWrapper()
 {
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
 }
 
-void QtScreenSearchView::initView()
-{
-}
-
 void QtScreenSearchView::refreshView()
 {
 	m_onQtThread([=]()

src/lib_gui/qt/view/QtScreenSearchView.h

@@ -17,18 +17,17 @@ class QtScreenSearchView
 
 public:
 	QtScreenSearchView(ViewLayout* viewLayout);
-	~QtScreenSearchView();
+	~QtScreenSearchView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper() override;
-	virtual void initView() override;
-	virtual void refreshView() override;
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// ScreenSearchView implementation
-	virtual void setMatchCount(size_t matchCount) override;
-	virtual void setMatchIndex(size_t matchIndex) override;
+	void setMatchCount(size_t matchCount) override;
+	void setMatchIndex(size_t matchIndex) override;
 
-	virtual void addResponder(const std::string& name) override;
+	void addResponder(const std::string& name) override;
 
 public slots:
 	void show();

src/lib_gui/qt/view/QtSearchView.cpp

@@ -12,19 +12,11 @@ QtSearchView::QtSearchView(ViewLayout* viewLayout)
 	m_widget = new QtSearchBar();
 }
 
-QtSearchView::~QtSearchView()
-{
-}
-
 void QtSearchView::createWidgetWrapper()
 {
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
 }
 
-void QtSearchView::initView()
-{
-}
-
 void QtSearchView::refreshView()
 {
 	m_onQtThread([this]()

src/lib_gui/qt/view/QtSearchView.h

@@ -13,19 +13,18 @@ class QtSearchView
 {
 public:
 	QtSearchView(ViewLayout* viewLayout);
-	~QtSearchView();
+	~QtSearchView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// SearchView implementation
-	virtual std::wstring getQuery() const;
-	virtual void setMatches(const std::vector<SearchMatch>& matches);
-	virtual void setFocus();
-	virtual void findFulltext();
-	virtual void setAutocompletionList(const std::vector<SearchMatch>& autocompletionList);
+	std::wstring getQuery() const override;
+	void setMatches(const std::vector<SearchMatch>& matches) override;
+	void setFocus() override;
+	void findFulltext() override;
+	void setAutocompletionList(const std::vector<SearchMatch>& autocompletionList) override;
 
 private:
 	void setStyleSheet();

src/lib_gui/qt/view/QtStatusBarView.cpp

@@ -17,10 +17,6 @@ void QtStatusBarView::createWidgetWrapper()
 {
 }
 
-void QtStatusBarView::initView()
-{
-}
-
 void QtStatusBarView::refreshView()
 {
 }

src/lib_gui/qt/view/QtStatusBarView.h

@@ -14,21 +14,20 @@ class QtStatusBarView
 {
 public:
 	QtStatusBarView(ViewLayout* viewLayout);
-	virtual ~QtStatusBarView() = default;
+	~QtStatusBarView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// StatusBar view implementation
-	virtual void showMessage(const std::wstring& message, bool isError, bool showLoader);
-	virtual void setErrorCount(ErrorCountInfo errorCount);
+	void showMessage(const std::wstring& message, bool isError, bool showLoader) override;
+	void setErrorCount(ErrorCountInfo errorCount) override;
 
-	virtual void showIdeStatus(const std::wstring& message);
+	void showIdeStatus(const std::wstring& message) override;
 
-	virtual void showIndexingProgress(size_t progressPercent);
-	virtual void hideIndexingProgress();
+	void showIndexingProgress(size_t progressPercent) override;
+	void hideIndexingProgress() override;
 
 private:
 	QtThreadedLambdaFunctor m_onQtThread;

src/lib_gui/qt/view/QtStatusView.cpp

@@ -16,20 +16,9 @@
 
 QtStatusView::QtStatusView(ViewLayout* viewLayout)
 	: StatusView(viewLayout)
-{
-}
-
-QtStatusView::~QtStatusView()
-{
-}
-
-void QtStatusView::createWidgetWrapper()
 {
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(new QFrame()));
-}
 
-void QtStatusView::initView()
-{
 	QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
 
 	QBoxLayout* layout = new QVBoxLayout();
@@ -77,6 +66,10 @@ void QtStatusView::initView()
 	layout->addLayout(filters);
 }
 
+void QtStatusView::createWidgetWrapper()
+{
+}
+
 void QtStatusView::refreshView()
 {
 	m_onQtThread([this]()

src/lib_gui/qt/view/QtStatusView.h

@@ -19,16 +19,15 @@ class QtStatusView
 
 public:
 	QtStatusView(ViewLayout* viewLayout);
-	virtual ~QtStatusView();
+	~QtStatusView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// Status View Implementation
-	virtual void clear();
-	virtual void addStatus(const std::vector<Status>& status);
+	void clear() override;
+	void addStatus(const std::vector<Status>& status) override;
 
 private:
 	enum STATUSVIEW_COLUMN

src/lib_gui/qt/view/QtTabbedView.cpp

@@ -14,20 +14,8 @@
 
 QtTabbedView::QtTabbedView(ViewLayout* viewLayout, const std::string& name)
 	: TabbedView(viewLayout, name)
-{
-}
-
-QtTabbedView::~QtTabbedView()
-{
-}
-
-void QtTabbedView::createWidgetWrapper()
 {
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(new QFrame()));
-}
-
-void QtTabbedView::initView()
-{
 	QWidget* widget = QtViewWidgetWrapper::getWidgetOfView(this);
 
 	QVBoxLayout* layout = new QVBoxLayout();
@@ -48,6 +36,10 @@ void QtTabbedView::initView()
 	widget->installEventFilter(this);
 }
 
+void QtTabbedView::createWidgetWrapper()
+{
+}
+
 void QtTabbedView::refreshView()
 {
 	m_onQtThread([=]()

src/lib_gui/qt/view/QtTabbedView.h

@@ -15,20 +15,19 @@ class QtTabbedView
 {
 public:
 	QtTabbedView(ViewLayout* viewLayout, const std::string& name);
-	~QtTabbedView();
+	~QtTabbedView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// TabbedView implementation
-	virtual void addViewWidget(View* view);
-	virtual void showView(View* view);
+	void addViewWidget(View* view) override;
+	void showView(View* view) override;
 
 private:
 	void setStyleSheet();
-	bool eventFilter(QObject* obj, QEvent* event);
+	bool eventFilter(QObject* obj, QEvent* event) override;
 
 	QtThreadedLambdaFunctor m_onQtThread;
 	QTabWidget* m_widget;

src/lib_gui/qt/view/QtTabsView.cpp

@@ -20,17 +20,9 @@ QtTabsView::QtTabsView(ViewLayout* viewLayout)
 	: TabsView(viewLayout)
 	, m_widget(nullptr)
 	, m_insertedTabCount(0)
-{
-}
-
-void QtTabsView::createWidgetWrapper()
 {
 	m_widget = new QWidget();
-	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
-}
 
-void QtTabsView::initView()
-{
 	QHBoxLayout* layout = new QHBoxLayout(m_widget);
 	layout->setContentsMargins(0, 0, 0, 0);
 	layout->setSpacing(0);
@@ -66,6 +58,11 @@ void QtTabsView::initView()
 	connect(addButton, &QPushButton::clicked, this, &QtTabsView::addTab);
 }
 
+void QtTabsView::createWidgetWrapper()
+{
+	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
+}
+
 void QtTabsView::refreshView()
 {
 	m_onQtThread([=]()

src/lib_gui/qt/view/QtTabsView.h

@@ -21,7 +21,6 @@ public:
 
 	// View implementation
 	void createWidgetWrapper() override;
-	void initView() override;
 	void refreshView() override;
 
 	// TabsView implementation

src/lib_gui/qt/view/QtTooltipView.cpp

@@ -13,19 +13,11 @@ QtTooltipView::QtTooltipView(ViewLayout* viewLayout)
 	m_widget = new QtTooltip(dynamic_cast<QtMainView*>(viewLayout)->getMainWindow());
 }
 
-QtTooltipView::~QtTooltipView()
-{
-}
-
 void QtTooltipView::createWidgetWrapper()
 {
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
 }
 
-void QtTooltipView::initView()
-{
-}
-
 void QtTooltipView::refreshView()
 {
 	m_onQtThread([=]()

src/lib_gui/qt/view/QtTooltipView.h

@@ -12,17 +12,17 @@ class QtTooltipView
 {
 public:
 	QtTooltipView(ViewLayout* viewLayout);
-	~QtTooltipView();
+	~QtTooltipView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
-	virtual void showTooltip(TooltipInfo info, const View* parent);
-	virtual void hideTooltip(bool force);
+	// TooltipView implementation
+	void showTooltip(TooltipInfo info, const View* parent) override;
+	void hideTooltip(bool force) override;
 
-	virtual bool tooltipVisible() const;
+	bool tooltipVisible() const override;
 
 private:
 	QtThreadedLambdaFunctor m_onQtThread;

src/lib_gui/qt/view/QtUndoRedoView.cpp

@@ -11,19 +11,11 @@ QtUndoRedoView::QtUndoRedoView(ViewLayout* viewLayout)
 	m_widget = new QtUndoRedo();
 }
 
-QtUndoRedoView::~QtUndoRedoView()
-{
-}
-
 void QtUndoRedoView::createWidgetWrapper()
 {
 	setWidgetWrapper(std::make_shared<QtViewWidgetWrapper>(m_widget));
 }
 
-void QtUndoRedoView::initView()
-{
-}
-
 void QtUndoRedoView::refreshView()
 {
 	m_onQtThread(

src/lib_gui/qt/view/QtUndoRedoView.h

@@ -8,22 +8,22 @@
 #include "QtUndoRedo.h"
 #include "QtThreadedFunctor.h"
 
-class QtUndoRedoView : public UndoRedoView
+class QtUndoRedoView
+	: public UndoRedoView
 {
 public:
 	QtUndoRedoView(ViewLayout* viewLayout);
-	~QtUndoRedoView();
+	~QtUndoRedoView() = default;
 
 	// View implementation
-	virtual void createWidgetWrapper();
-	virtual void initView();
-	virtual void refreshView();
+	void createWidgetWrapper() override;
+	void refreshView() override;
 
 	// UndoRedo view implementation
-	virtual void setRedoButtonEnabled(bool enabled);
-	virtual void setUndoButtonEnabled(bool enabled);
+	void setRedoButtonEnabled(bool enabled) override;
+	void setUndoButtonEnabled(bool enabled) override;
 
-	virtual void updateHistory(const std::vector<SearchMatch>& searchMatches, size_t currentIndex);
+	void updateHistory(const std::vector<SearchMatch>& searchMatches, size_t currentIndex) override;
 
 private:
 	QtThreadedLambdaFunctor m_onQtThread;

src/lib_gui/qt/view/QtViewFactory.cpp

@@ -20,10 +20,6 @@
 #include "QtTooltipView.h"
 #include "QtUndoRedoView.h"
 
-QtViewFactory::QtViewFactory()
-{
-}
-
 std::shared_ptr<MainView> QtViewFactory::createMainView(StorageAccess* storageAccess) const
 {
 	return std::make_shared<QtMainView>(this, storageAccess);
@@ -32,83 +28,77 @@ std::shared_ptr<MainView> QtViewFactory::createMainView(StorageAccess* storageAc
 std::shared_ptr<CompositeView> QtViewFactory::createCompositeView(
 	ViewLayout* viewLayout, CompositeView::CompositeDirection direction, const std::string& name
 ) const {
-	std::shared_ptr<CompositeView> ptr = std::make_shared<QtCompositeView>(viewLayout, direction, name);
-	ptr->init();
-	ptr->addToLayout();
-	return ptr;
+	return View::createAndAddToLayout<QtCompositeView>(viewLayout, direction, name);
 }
 
 std::shared_ptr<TabbedView> QtViewFactory::createTabbedView(ViewLayout* viewLayout, const std::string& name) const
 {
-	std::shared_ptr<TabbedView> ptr = std::make_shared<QtTabbedView>(viewLayout, name);
-	ptr->init();
-	ptr->addToLayout();
-	return ptr;
+	return View::createAndAddToLayout<QtTabbedView>(viewLayout, name);
 }
 
 std::shared_ptr<BookmarkButtonsView> QtViewFactory::createBookmarkButtonsView(ViewLayout* viewLayout) const
 {
-	return View::createInitAndAddToLayout<QtBookmarkButtonsView>(viewLayout);
+	return View::createAndAddToLayout<QtBookmarkButtonsView>(viewLayout);
 }
 
 std::shared_ptr<BookmarkView> QtViewFactory::createBookmarkView(ViewLayout* viewLayout) const
 {
-	return View::createAndInit<QtBookmarkView>(viewLayout);
+	return View::create<QtBookmarkView>(viewLayout);
 }
 
 std::shared_ptr<CodeView> QtViewFactory::createCodeView(ViewLayout* viewLayout) const
 {
-	return View::createInitAndAddToLayout<QtCodeView>(viewLayout);
+	return View::createAndAddToLayout<QtCodeView>(viewLayout);
 }
 
 std::shared_ptr<ErrorView> QtViewFactory::createErrorView(ViewLayout* viewLayout) const
 {
-	return View::createInitAndAddToLayout<QtErrorView>(viewLayout);
+	return View::createAndAddToLayout<QtErrorView>(viewLayout);
 }
 
 std::shared_ptr<StatusView> QtViewFactory::createStatusView(ViewLayout* viewLayout) const
 {
-	return View::createInitAndAddToLayout<QtStatusView>(viewLayout);
+	return View::createAndAddToLayout<QtStatusView>(viewLayout);
 }
 
 std::shared_ptr<GraphView> QtViewFactory::createGraphView(ViewLayout* viewLayout) const
 {
-	return View::createInitAndAddToLayout<QtGraphView>(viewLayout);
+	return View::createAndAddToLayout<QtGraphView>(viewLayout);
 }
 
 std::shared_ptr<RefreshView> QtViewFactory::createRefreshView(ViewLayout* viewLayout) const
 {
-	return View::createInitAndAddToLayout<QtRefreshView>(viewLayout);
+	return View::createAndAddToLayout<QtRefreshView>(viewLayout);
 }
 
 std::shared_ptr<ScreenSearchView> QtViewFactory::createScreenSearchView(ViewLayout* viewLayout) const
 {
-	return View::createAndInit<QtScreenSearchView>(viewLayout);
+	return View::create<QtScreenSearchView>(viewLayout);
 }
 
 std::shared_ptr<SearchView> QtViewFactory::createSearchView(ViewLayout* viewLayout) const
 {
-	return View::createInitAndAddToLayout<QtSearchView>(viewLayout);
+	return View::createAndAddToLayout<QtSearchView>(viewLayout);
 }
 
 std::shared_ptr<StatusBarView> QtViewFactory::createStatusBarView(ViewLayout* viewLayout) const
 {
-	return View::createAndInit<QtStatusBarView>(viewLayout);
+	return View::create<QtStatusBarView>(viewLayout);
 }
 
 std::shared_ptr<TabsView> QtViewFactory::createTabsView(ViewLayout* viewLayout) const
 {
-	return View::createInitAndAddToLayout<QtTabsView>(viewLayout);
+	return View::createAndAddToLayout<QtTabsView>(viewLayout);
 }
 
 std::shared_ptr<TooltipView> QtViewFactory::createTooltipView(ViewLayout* viewLayout) const
 {
-	return View::createAndInit<QtTooltipView>(viewLayout);
+	return View::create<QtTooltipView>(viewLayout);
 }
 
 std::shared_ptr<UndoRedoView> QtViewFactory::createUndoRedoView(ViewLayout* viewLayout) const
 {
-	return View::createInitAndAddToLayout<QtUndoRedoView>(viewLayout);
+	return View::createAndAddToLayout<QtUndoRedoView>(viewLayout);
 }
 
 std::shared_ptr<DialogView> QtViewFactory::createDialogView(

src/lib_gui/qt/view/QtViewFactory.h

@@ -7,32 +7,32 @@ class QtViewFactory
 	: public ViewFactory
 {
 public:
-	QtViewFactory();
-	virtual ~QtViewFactory() = default;
+	QtViewFactory() = default;
+	~QtViewFactory() = default;
 
-	virtual std::shared_ptr<MainView> createMainView(StorageAccess* storageAccess) const;
-	virtual std::shared_ptr<CompositeView> createCompositeView(
-		ViewLayout* viewLayout, CompositeView::CompositeDirection direction, const std::string& name) const;
-	virtual std::shared_ptr<TabbedView> createTabbedView(ViewLayout* viewLayout, const std::string& name) const;
+	std::shared_ptr<MainView> createMainView(StorageAccess* storageAccess) const override;
+	std::shared_ptr<CompositeView> createCompositeView(
+		ViewLayout* viewLayout, CompositeView::CompositeDirection direction, const std::string& name) const override;
+	std::shared_ptr<TabbedView> createTabbedView(ViewLayout* viewLayout, const std::string& name) const override;
 
-	virtual std::shared_ptr<BookmarkButtonsView> createBookmarkButtonsView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<BookmarkView> createBookmarkView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<CodeView> createCodeView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<ErrorView> createErrorView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<GraphView> createGraphView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<RefreshView> createRefreshView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<ScreenSearchView> createScreenSearchView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<SearchView> createSearchView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<StatusBarView> createStatusBarView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<StatusView> createStatusView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<TabsView> createTabsView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<TooltipView> createTooltipView(ViewLayout* viewLayout) const;
-	virtual std::shared_ptr<UndoRedoView> createUndoRedoView(ViewLayout* viewLayout) const;
+	std::shared_ptr<BookmarkButtonsView> createBookmarkButtonsView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<BookmarkView> createBookmarkView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<CodeView> createCodeView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<ErrorView> createErrorView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<GraphView> createGraphView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<RefreshView> createRefreshView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<ScreenSearchView> createScreenSearchView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<SearchView> createSearchView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<StatusBarView> createStatusBarView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<StatusView> createStatusView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<TabsView> createTabsView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<TooltipView> createTooltipView(ViewLayout* viewLayout) const override;
+	std::shared_ptr<UndoRedoView> createUndoRedoView(ViewLayout* viewLayout) const override;
 
-	virtual std::shared_ptr<DialogView> createDialogView(
-		ViewLayout* viewLayout, DialogView::UseCase useCase, StorageAccess* storageAccess) const;
+	std::shared_ptr<DialogView> createDialogView(
+		ViewLayout* viewLayout, DialogView::UseCase useCase, StorageAccess* storageAccess) const override;
 
-	virtual std::shared_ptr<GraphViewStyleImpl> createGraphStyleImpl() const;
+	std::shared_ptr<GraphViewStyleImpl> createGraphStyleImpl() const override;
 };
 
 #endif // QT_VIEW_FACTORY_H

src/lib_gui/qt/view/QtViewWidgetWrapper.h

@@ -7,13 +7,14 @@
 
 class View;
 
-class QtViewWidgetWrapper: public ViewWidgetWrapper
+class QtViewWidgetWrapper
+	: public ViewWidgetWrapper
 {
 public:
 	static QWidget* getWidgetOfView(const View* view);
 
 	QtViewWidgetWrapper(QWidget* widget);
-	virtual ~QtViewWidgetWrapper();
+	~QtViewWidgetWrapper();
 
 	QWidget* getWidget();