From 3aebe91e366efd0ed427bf07661c60af8c6e1aff Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Tue, 2 Jul 2019 15:04:09 +0200 Subject: [PATCH] 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 | 7 --- src/lib/component/view/View.h | 26 +++++----- src/lib_gui/qt/view/QtBookmarkButtonsView.cpp | 14 ++---- src/lib_gui/qt/view/QtBookmarkButtonsView.h | 3 +- src/lib_gui/qt/view/QtBookmarkView.cpp | 4 -- src/lib_gui/qt/view/QtBookmarkView.h | 19 ++++--- src/lib_gui/qt/view/QtCodeView.cpp | 8 --- src/lib_gui/qt/view/QtCodeView.h | 49 +++++++++---------- src/lib_gui/qt/view/QtCompositeView.cpp | 8 --- src/lib_gui/qt/view/QtCompositeView.h | 9 ++-- src/lib_gui/qt/view/QtErrorView.cpp | 14 ++---- src/lib_gui/qt/view/QtErrorView.h | 19 ++++--- src/lib_gui/qt/view/QtGraphView.cpp | 15 ++---- src/lib_gui/qt/view/QtGraphView.h | 37 +++++++------- src/lib_gui/qt/view/QtGraphViewStyleImpl.h | 2 +- src/lib_gui/qt/view/QtMainView.h | 2 +- src/lib_gui/qt/view/QtRefreshView.cpp | 4 -- src/lib_gui/qt/view/QtRefreshView.h | 1 - src/lib_gui/qt/view/QtScreenSearchView.cpp | 8 --- src/lib_gui/qt/view/QtScreenSearchView.h | 13 +++-- src/lib_gui/qt/view/QtSearchView.cpp | 8 --- src/lib_gui/qt/view/QtSearchView.h | 17 +++---- src/lib_gui/qt/view/QtStatusBarView.cpp | 4 -- src/lib_gui/qt/view/QtStatusBarView.h | 17 +++---- src/lib_gui/qt/view/QtStatusView.cpp | 15 ++---- src/lib_gui/qt/view/QtStatusView.h | 11 ++--- src/lib_gui/qt/view/QtTabbedView.cpp | 16 ++---- src/lib_gui/qt/view/QtTabbedView.h | 13 +++-- src/lib_gui/qt/view/QtTabsView.cpp | 13 ++--- src/lib_gui/qt/view/QtTabsView.h | 1 - src/lib_gui/qt/view/QtTooltipView.cpp | 8 --- src/lib_gui/qt/view/QtTooltipView.h | 14 +++--- src/lib_gui/qt/view/QtUndoRedoView.cpp | 8 --- src/lib_gui/qt/view/QtUndoRedoView.h | 16 +++--- src/lib_gui/qt/view/QtViewFactory.cpp | 40 ++++++--------- src/lib_gui/qt/view/QtViewFactory.h | 44 ++++++++--------- src/lib_gui/qt/view/QtViewWidgetWrapper.h | 5 +- 37 files changed, 193 insertions(+), 319 deletions(-) diff --git a/src/lib/component/view/View.cpp b/src/lib/component/view/View.cpp index 0afa5219..ee795974 100644 --- a/src/lib/component/view/View.cpp +++ b/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); diff --git a/src/lib/component/view/View.h b/src/lib/component/view/View.h index 07bcca3e..2696c782 100644 --- a/src/lib/component/view/View.h +++ b/src/lib/component/view/View.h @@ -15,11 +15,11 @@ class ControllerProxy; class View { public: - template - static std::shared_ptr createInitAndAddToLayout(ViewLayout* viewLayout); + template + static std::shared_ptr create(ViewLayout* viewLayout, const Args... args); - template - static std::shared_ptr createAndInit(ViewLayout* viewLayout); + template + static std::shared_ptr 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 m_widgetWrapper; }; -template -std::shared_ptr View::createInitAndAddToLayout(ViewLayout* viewLayout) +template +std::shared_ptr View::create(ViewLayout* viewLayout, const Args... args) { - std::shared_ptr ptr = View::createAndInit(viewLayout); + std::shared_ptr ptr = std::make_shared(viewLayout, args...); - ptr->addToLayout(); + ptr->createWidgetWrapper(); return ptr; } -template -std::shared_ptr View::createAndInit(ViewLayout* viewLayout) +template +std::shared_ptr View::createAndAddToLayout(ViewLayout* viewLayout, const Args... args) { - std::shared_ptr ptr = std::make_shared(viewLayout); + std::shared_ptr ptr = View::create(viewLayout, args...); - ptr->init(); + ptr->addToLayout(); return ptr; } diff --git a/src/lib_gui/qt/view/QtBookmarkButtonsView.cpp b/src/lib_gui/qt/view/QtBookmarkButtonsView.cpp index 9e2f8d11..e7203b7e 100644 --- a/src/lib_gui/qt/view/QtBookmarkButtonsView.cpp +++ b/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(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(m_widget)); +} + void QtBookmarkButtonsView::refreshView() { m_onQtThread( diff --git a/src/lib_gui/qt/view/QtBookmarkButtonsView.h b/src/lib_gui/qt/view/QtBookmarkButtonsView.h index f529fbbb..991cde70 100644 --- a/src/lib_gui/qt/view/QtBookmarkButtonsView.h +++ b/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 diff --git a/src/lib_gui/qt/view/QtBookmarkView.cpp b/src/lib_gui/qt/view/QtBookmarkView.cpp index 1d2bf55f..1010e83b 100644 --- a/src/lib_gui/qt/view/QtBookmarkView.cpp +++ b/src/lib_gui/qt/view/QtBookmarkView.cpp @@ -17,10 +17,6 @@ void QtBookmarkView::createWidgetWrapper() { } -void QtBookmarkView::initView() -{ -} - void QtBookmarkView::refreshView() { } diff --git a/src/lib_gui/qt/view/QtBookmarkView.h b/src/lib_gui/qt/view/QtBookmarkView.h index 5795e7cb..7d0eb0bc 100644 --- a/src/lib_gui/qt/view/QtBookmarkView.h +++ b/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& names, const std::vector& categories, Id nodeId); - virtual void displayBookmarkEditor( - std::shared_ptr bookmark, const std::vector& categories); + void displayBookmarkCreator( + const std::vector& names, const std::vector& categories, Id nodeId) override; + void displayBookmarkEditor( + std::shared_ptr bookmark, const std::vector& categories) override; - virtual void displayBookmarks(const std::vector>& bookmarks); - virtual bool bookmarkBrowserIsVisible() const; + void displayBookmarks(const std::vector>& bookmarks) override; + bool bookmarkBrowserIsVisible() const override; private: ControllerProxy m_controllerProxy; diff --git a/src/lib_gui/qt/view/QtCodeView.cpp b/src/lib_gui/qt/view/QtCodeView.cpp index d85c0245..e7b361cf 100644 --- a/src/lib_gui/qt/view/QtCodeView.cpp +++ b/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(m_widget)); } -void QtCodeView::initView() -{ -} - void QtCodeView::refreshView() { if (getController()) diff --git a/src/lib_gui/qt/view/QtCodeView.h b/src/lib_gui/qt/view/QtCodeView.h index 63b2f885..cf2122a0 100644 --- a/src/lib_gui/qt/view/QtCodeView.h +++ b/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& snippets, const CodeParams params); - virtual void updateCodeSnippets(const std::vector& snippets); - virtual void scrollTo(const ScrollParams params); + void showCodeSnippets(const std::vector& snippets, const CodeParams params) override; + void updateCodeSnippets(const std::vector& 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& activeTokenIds, std::shared_ptr collection, bool scrollTo); - virtual void showActiveTokenIds(const std::vector& activeTokenIds); - virtual void showActiveLocalSymbolIds(const std::vector& activeLocalSymbolIds); + void showActiveSnippet( + const std::vector& activeTokenIds, std::shared_ptr collection, bool scrollTo) override; + void showActiveTokenIds(const std::vector& activeTokenIds) override; + void showActiveLocalSymbolIds(const std::vector& activeLocalSymbolIds) override; - virtual void focusTokenIds(const std::vector& focusedTokenIds); - virtual void defocusTokenIds(); + void focusTokenIds(const std::vector& 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(); diff --git a/src/lib_gui/qt/view/QtCompositeView.cpp b/src/lib_gui/qt/view/QtCompositeView.cpp index 183d6515..68c688ad 100644 --- a/src/lib_gui/qt/view/QtCompositeView.cpp +++ b/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(m_widget)); } -void QtCompositeView::initView() -{ -} - void QtCompositeView::refreshView() { m_onQtThread([=]() diff --git a/src/lib_gui/qt/view/QtCompositeView.h b/src/lib_gui/qt/view/QtCompositeView.h index f06ec70b..ec82fdd1 100644 --- a/src/lib_gui/qt/view/QtCompositeView.h +++ b/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; diff --git a/src/lib_gui/qt/view/QtErrorView.cpp b/src/lib_gui/qt/view/QtErrorView.cpp index 3be7359a..9fa4d83c 100644 --- a/src/lib_gui/qt/view/QtErrorView.cpp +++ b/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(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([=]() diff --git a/src/lib_gui/qt/view/QtErrorView.h b/src/lib_gui/qt/view/QtErrorView.h index e8d23e19..8a814722 100644 --- a/src/lib_gui/qt/view/QtErrorView.h +++ b/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& errors, const ErrorCountInfo& errorCount, bool scrollTo); - virtual void setErrorId(Id errorId); + void addErrors(const std::vector& 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); diff --git a/src/lib_gui/qt/view/QtGraphView.cpp b/src/lib_gui/qt/view/QtGraphView.cpp index 2666185c..f33403aa 100644 --- a/src/lib_gui/qt/view/QtGraphView.cpp +++ b/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(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]() diff --git a/src/lib_gui/qt/view/QtGraphView.h b/src/lib_gui/qt/view/QtGraphView.h index 723e6cc7..6957ae2a 100644 --- a/src/lib_gui/qt/view/QtGraphView.h +++ b/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, const std::vector>& nodes, const std::vector>& edges, - const GraphParams params); - virtual void clear(); + const GraphParams params) override; + void clear() override; - virtual void focusTokenIds(const std::vector& focusedTokenIds); - virtual void defocusTokenIds(const std::vector& defocusedTokenIds); + void focusTokenIds(const std::vector& focusedTokenIds) override; + void defocusTokenIds(const std::vector& 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(); diff --git a/src/lib_gui/qt/view/QtGraphViewStyleImpl.h b/src/lib_gui/qt/view/QtGraphViewStyleImpl.h index 42048a0f..861ccd44 100644 --- a/src/lib_gui/qt/view/QtGraphViewStyleImpl.h +++ b/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; diff --git a/src/lib_gui/qt/view/QtMainView.h b/src/lib_gui/qt/view/QtMainView.h index c7a9b534..f6a3fec4 100644 --- a/src/lib_gui/qt/view/QtMainView.h +++ b/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; diff --git a/src/lib_gui/qt/view/QtRefreshView.cpp b/src/lib_gui/qt/view/QtRefreshView.cpp index f6ccdcc5..d0c15743 100644 --- a/src/lib_gui/qt/view/QtRefreshView.cpp +++ b/src/lib_gui/qt/view/QtRefreshView.cpp @@ -43,10 +43,6 @@ void QtRefreshView::createWidgetWrapper() setWidgetWrapper(std::make_shared(m_widget)); } -void QtRefreshView::initView() -{ -} - void QtRefreshView::refreshView() { m_onQtThread([this]() diff --git a/src/lib_gui/qt/view/QtRefreshView.h b/src/lib_gui/qt/view/QtRefreshView.h index 390d2038..45e0734d 100644 --- a/src/lib_gui/qt/view/QtRefreshView.h +++ b/src/lib_gui/qt/view/QtRefreshView.h @@ -15,7 +15,6 @@ public: // View implementation void createWidgetWrapper() override; - void initView() override; void refreshView() override; private: diff --git a/src/lib_gui/qt/view/QtScreenSearchView.cpp b/src/lib_gui/qt/view/QtScreenSearchView.cpp index c51c46f8..e19a8b08 100644 --- a/src/lib_gui/qt/view/QtScreenSearchView.cpp +++ b/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(m_widget)); } -void QtScreenSearchView::initView() -{ -} - void QtScreenSearchView::refreshView() { m_onQtThread([=]() diff --git a/src/lib_gui/qt/view/QtScreenSearchView.h b/src/lib_gui/qt/view/QtScreenSearchView.h index 3c7ec9e8..48c6900b 100644 --- a/src/lib_gui/qt/view/QtScreenSearchView.h +++ b/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(); diff --git a/src/lib_gui/qt/view/QtSearchView.cpp b/src/lib_gui/qt/view/QtSearchView.cpp index 80cdd6da..318bca08 100644 --- a/src/lib_gui/qt/view/QtSearchView.cpp +++ b/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(m_widget)); } -void QtSearchView::initView() -{ -} - void QtSearchView::refreshView() { m_onQtThread([this]() diff --git a/src/lib_gui/qt/view/QtSearchView.h b/src/lib_gui/qt/view/QtSearchView.h index d3bc63b2..e9b11485 100644 --- a/src/lib_gui/qt/view/QtSearchView.h +++ b/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& matches); - virtual void setFocus(); - virtual void findFulltext(); - virtual void setAutocompletionList(const std::vector& autocompletionList); + std::wstring getQuery() const override; + void setMatches(const std::vector& matches) override; + void setFocus() override; + void findFulltext() override; + void setAutocompletionList(const std::vector& autocompletionList) override; private: void setStyleSheet(); diff --git a/src/lib_gui/qt/view/QtStatusBarView.cpp b/src/lib_gui/qt/view/QtStatusBarView.cpp index ece7ad03..bdda978e 100644 --- a/src/lib_gui/qt/view/QtStatusBarView.cpp +++ b/src/lib_gui/qt/view/QtStatusBarView.cpp @@ -17,10 +17,6 @@ void QtStatusBarView::createWidgetWrapper() { } -void QtStatusBarView::initView() -{ -} - void QtStatusBarView::refreshView() { } diff --git a/src/lib_gui/qt/view/QtStatusBarView.h b/src/lib_gui/qt/view/QtStatusBarView.h index 486f133b..c4fb6eb7 100644 --- a/src/lib_gui/qt/view/QtStatusBarView.h +++ b/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; diff --git a/src/lib_gui/qt/view/QtStatusView.cpp b/src/lib_gui/qt/view/QtStatusView.cpp index c27cb7f9..bf269efe 100644 --- a/src/lib_gui/qt/view/QtStatusView.cpp +++ b/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(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]() diff --git a/src/lib_gui/qt/view/QtStatusView.h b/src/lib_gui/qt/view/QtStatusView.h index c74da6c8..58d9d4fe 100644 --- a/src/lib_gui/qt/view/QtStatusView.h +++ b/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); + void clear() override; + void addStatus(const std::vector& status) override; private: enum STATUSVIEW_COLUMN diff --git a/src/lib_gui/qt/view/QtTabbedView.cpp b/src/lib_gui/qt/view/QtTabbedView.cpp index 8736c7b4..b1b0d3bd 100644 --- a/src/lib_gui/qt/view/QtTabbedView.cpp +++ b/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(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([=]() diff --git a/src/lib_gui/qt/view/QtTabbedView.h b/src/lib_gui/qt/view/QtTabbedView.h index b38e9bfd..ae91aa95 100644 --- a/src/lib_gui/qt/view/QtTabbedView.h +++ b/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; diff --git a/src/lib_gui/qt/view/QtTabsView.cpp b/src/lib_gui/qt/view/QtTabsView.cpp index 4fc43ec6..8b1b614a 100644 --- a/src/lib_gui/qt/view/QtTabsView.cpp +++ b/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(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(m_widget)); +} + void QtTabsView::refreshView() { m_onQtThread([=]() diff --git a/src/lib_gui/qt/view/QtTabsView.h b/src/lib_gui/qt/view/QtTabsView.h index 5b55d714..356b390a 100644 --- a/src/lib_gui/qt/view/QtTabsView.h +++ b/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 diff --git a/src/lib_gui/qt/view/QtTooltipView.cpp b/src/lib_gui/qt/view/QtTooltipView.cpp index cb92987e..e9c8d6c6 100644 --- a/src/lib_gui/qt/view/QtTooltipView.cpp +++ b/src/lib_gui/qt/view/QtTooltipView.cpp @@ -13,19 +13,11 @@ QtTooltipView::QtTooltipView(ViewLayout* viewLayout) m_widget = new QtTooltip(dynamic_cast(viewLayout)->getMainWindow()); } -QtTooltipView::~QtTooltipView() -{ -} - void QtTooltipView::createWidgetWrapper() { setWidgetWrapper(std::make_shared(m_widget)); } -void QtTooltipView::initView() -{ -} - void QtTooltipView::refreshView() { m_onQtThread([=]() diff --git a/src/lib_gui/qt/view/QtTooltipView.h b/src/lib_gui/qt/view/QtTooltipView.h index accd3299..aebb3b7b 100644 --- a/src/lib_gui/qt/view/QtTooltipView.h +++ b/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; diff --git a/src/lib_gui/qt/view/QtUndoRedoView.cpp b/src/lib_gui/qt/view/QtUndoRedoView.cpp index 70db7cd2..6c6411b3 100644 --- a/src/lib_gui/qt/view/QtUndoRedoView.cpp +++ b/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(m_widget)); } -void QtUndoRedoView::initView() -{ -} - void QtUndoRedoView::refreshView() { m_onQtThread( diff --git a/src/lib_gui/qt/view/QtUndoRedoView.h b/src/lib_gui/qt/view/QtUndoRedoView.h index 75fe717b..06255420 100644 --- a/src/lib_gui/qt/view/QtUndoRedoView.h +++ b/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& searchMatches, size_t currentIndex); + void updateHistory(const std::vector& searchMatches, size_t currentIndex) override; private: QtThreadedLambdaFunctor m_onQtThread; diff --git a/src/lib_gui/qt/view/QtViewFactory.cpp b/src/lib_gui/qt/view/QtViewFactory.cpp index fc96f01d..dde53c97 100644 --- a/src/lib_gui/qt/view/QtViewFactory.cpp +++ b/src/lib_gui/qt/view/QtViewFactory.cpp @@ -20,10 +20,6 @@ #include "QtTooltipView.h" #include "QtUndoRedoView.h" -QtViewFactory::QtViewFactory() -{ -} - std::shared_ptr QtViewFactory::createMainView(StorageAccess* storageAccess) const { return std::make_shared(this, storageAccess); @@ -32,83 +28,77 @@ std::shared_ptr QtViewFactory::createMainView(StorageAccess* storageAc std::shared_ptr QtViewFactory::createCompositeView( ViewLayout* viewLayout, CompositeView::CompositeDirection direction, const std::string& name ) const { - std::shared_ptr ptr = std::make_shared(viewLayout, direction, name); - ptr->init(); - ptr->addToLayout(); - return ptr; + return View::createAndAddToLayout(viewLayout, direction, name); } std::shared_ptr QtViewFactory::createTabbedView(ViewLayout* viewLayout, const std::string& name) const { - std::shared_ptr ptr = std::make_shared(viewLayout, name); - ptr->init(); - ptr->addToLayout(); - return ptr; + return View::createAndAddToLayout(viewLayout, name); } std::shared_ptr QtViewFactory::createBookmarkButtonsView(ViewLayout* viewLayout) const { - return View::createInitAndAddToLayout(viewLayout); + return View::createAndAddToLayout(viewLayout); } std::shared_ptr QtViewFactory::createBookmarkView(ViewLayout* viewLayout) const { - return View::createAndInit(viewLayout); + return View::create(viewLayout); } std::shared_ptr QtViewFactory::createCodeView(ViewLayout* viewLayout) const { - return View::createInitAndAddToLayout(viewLayout); + return View::createAndAddToLayout(viewLayout); } std::shared_ptr QtViewFactory::createErrorView(ViewLayout* viewLayout) const { - return View::createInitAndAddToLayout(viewLayout); + return View::createAndAddToLayout(viewLayout); } std::shared_ptr QtViewFactory::createStatusView(ViewLayout* viewLayout) const { - return View::createInitAndAddToLayout(viewLayout); + return View::createAndAddToLayout(viewLayout); } std::shared_ptr QtViewFactory::createGraphView(ViewLayout* viewLayout) const { - return View::createInitAndAddToLayout(viewLayout); + return View::createAndAddToLayout(viewLayout); } std::shared_ptr QtViewFactory::createRefreshView(ViewLayout* viewLayout) const { - return View::createInitAndAddToLayout(viewLayout); + return View::createAndAddToLayout(viewLayout); } std::shared_ptr QtViewFactory::createScreenSearchView(ViewLayout* viewLayout) const { - return View::createAndInit(viewLayout); + return View::create(viewLayout); } std::shared_ptr QtViewFactory::createSearchView(ViewLayout* viewLayout) const { - return View::createInitAndAddToLayout(viewLayout); + return View::createAndAddToLayout(viewLayout); } std::shared_ptr QtViewFactory::createStatusBarView(ViewLayout* viewLayout) const { - return View::createAndInit(viewLayout); + return View::create(viewLayout); } std::shared_ptr QtViewFactory::createTabsView(ViewLayout* viewLayout) const { - return View::createInitAndAddToLayout(viewLayout); + return View::createAndAddToLayout(viewLayout); } std::shared_ptr QtViewFactory::createTooltipView(ViewLayout* viewLayout) const { - return View::createAndInit(viewLayout); + return View::create(viewLayout); } std::shared_ptr QtViewFactory::createUndoRedoView(ViewLayout* viewLayout) const { - return View::createInitAndAddToLayout(viewLayout); + return View::createAndAddToLayout(viewLayout); } std::shared_ptr QtViewFactory::createDialogView( diff --git a/src/lib_gui/qt/view/QtViewFactory.h b/src/lib_gui/qt/view/QtViewFactory.h index f42451b7..192a73fa 100644 --- a/src/lib_gui/qt/view/QtViewFactory.h +++ b/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 createMainView(StorageAccess* storageAccess) const; - virtual std::shared_ptr createCompositeView( - ViewLayout* viewLayout, CompositeView::CompositeDirection direction, const std::string& name) const; - virtual std::shared_ptr createTabbedView(ViewLayout* viewLayout, const std::string& name) const; + std::shared_ptr createMainView(StorageAccess* storageAccess) const override; + std::shared_ptr createCompositeView( + ViewLayout* viewLayout, CompositeView::CompositeDirection direction, const std::string& name) const override; + std::shared_ptr createTabbedView(ViewLayout* viewLayout, const std::string& name) const override; - virtual std::shared_ptr createBookmarkButtonsView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createBookmarkView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createCodeView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createErrorView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createGraphView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createRefreshView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createScreenSearchView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createSearchView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createStatusBarView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createStatusView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createTabsView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createTooltipView(ViewLayout* viewLayout) const; - virtual std::shared_ptr createUndoRedoView(ViewLayout* viewLayout) const; + std::shared_ptr createBookmarkButtonsView(ViewLayout* viewLayout) const override; + std::shared_ptr createBookmarkView(ViewLayout* viewLayout) const override; + std::shared_ptr createCodeView(ViewLayout* viewLayout) const override; + std::shared_ptr createErrorView(ViewLayout* viewLayout) const override; + std::shared_ptr createGraphView(ViewLayout* viewLayout) const override; + std::shared_ptr createRefreshView(ViewLayout* viewLayout) const override; + std::shared_ptr createScreenSearchView(ViewLayout* viewLayout) const override; + std::shared_ptr createSearchView(ViewLayout* viewLayout) const override; + std::shared_ptr createStatusBarView(ViewLayout* viewLayout) const override; + std::shared_ptr createStatusView(ViewLayout* viewLayout) const override; + std::shared_ptr createTabsView(ViewLayout* viewLayout) const override; + std::shared_ptr createTooltipView(ViewLayout* viewLayout) const override; + std::shared_ptr createUndoRedoView(ViewLayout* viewLayout) const override; - virtual std::shared_ptr createDialogView( - ViewLayout* viewLayout, DialogView::UseCase useCase, StorageAccess* storageAccess) const; + std::shared_ptr createDialogView( + ViewLayout* viewLayout, DialogView::UseCase useCase, StorageAccess* storageAccess) const override; - virtual std::shared_ptr createGraphStyleImpl() const; + std::shared_ptr createGraphStyleImpl() const override; }; #endif // QT_VIEW_FACTORY_H diff --git a/src/lib_gui/qt/view/QtViewWidgetWrapper.h b/src/lib_gui/qt/view/QtViewWidgetWrapper.h index 5907bf04..8c23be40 100644 --- a/src/lib_gui/qt/view/QtViewWidgetWrapper.h +++ b/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();