diff options
author | hjk <hjk121@nokiamail.com> | 2014-07-19 19:48:23 +0200 |
---|---|---|
committer | hjk <hjk121@nokiamail.com> | 2014-07-24 11:15:26 +0200 |
commit | ebabc837b8d7c42934d8ffbecac86c96b9aed34a (patch) | |
tree | 320cb735996b6795cfd796434f863187bfcdd613 /src | |
parent | 540ac8ce232b82d49d819e9c9b48a4111b9497f1 (diff) | |
download | qt-creator-ebabc837b8d7c42934d8ffbecac86c96b9aed34a.tar.gz |
CppEditor: Remove unneeded intermediate CppTypeHierarchyStackedWidget
Change-Id: I2cd3a13aca4012dadc73d909ff73135eb487cd82
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/cppeditor/cpptypehierarchy.cpp | 17 | ||||
-rw-r--r-- | src/plugins/cppeditor/cpptypehierarchy.h | 14 |
2 files changed, 3 insertions, 28 deletions
diff --git a/src/plugins/cppeditor/cpptypehierarchy.cpp b/src/plugins/cppeditor/cpptypehierarchy.cpp index 9a34aaf5e6..c444cef57f 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.cpp +++ b/src/plugins/cppeditor/cpptypehierarchy.cpp @@ -241,19 +241,6 @@ void CppTypeHierarchyWidget::onItemClicked(const QModelIndex &index) Constants::CPPEDITOR_ID); } -// CppTypeHierarchyStackedWidget -CppTypeHierarchyStackedWidget::CppTypeHierarchyStackedWidget(QWidget *parent) : - QStackedWidget(parent), - m_typeHiearchyWidgetInstance(new CppTypeHierarchyWidget) -{ - addWidget(m_typeHiearchyWidgetInstance); -} - -CppTypeHierarchyStackedWidget::~CppTypeHierarchyStackedWidget() -{ - delete m_typeHiearchyWidgetInstance; -} - // CppTypeHierarchyFactory CppTypeHierarchyFactory::CppTypeHierarchyFactory() { @@ -264,8 +251,8 @@ CppTypeHierarchyFactory::CppTypeHierarchyFactory() Core::NavigationView CppTypeHierarchyFactory::createWidget() { - CppTypeHierarchyStackedWidget *w = new CppTypeHierarchyStackedWidget; - static_cast<CppTypeHierarchyWidget *>(w->currentWidget())->perform(); + auto w = new CppTypeHierarchyWidget; + w->perform(); return Core::NavigationView(w); } diff --git a/src/plugins/cppeditor/cpptypehierarchy.h b/src/plugins/cppeditor/cpptypehierarchy.h index 53514fe927..60ce04b120 100644 --- a/src/plugins/cppeditor/cpptypehierarchy.h +++ b/src/plugins/cppeditor/cpptypehierarchy.h @@ -91,22 +91,10 @@ private: QLabel *m_noTypeHierarchyAvailableLabel; }; -// @todo: Pretty much the same design as the OutlineWidgetStack. Maybe we can generalize the -// outline factory so that it works for different widgets that support the same editor. -class CppTypeHierarchyStackedWidget : public QStackedWidget -{ - Q_OBJECT -public: - CppTypeHierarchyStackedWidget(QWidget *parent = 0); - virtual ~CppTypeHierarchyStackedWidget(); - -private: - CppTypeHierarchyWidget *m_typeHiearchyWidgetInstance; -}; - class CppTypeHierarchyFactory : public Core::INavigationWidgetFactory { Q_OBJECT + public: CppTypeHierarchyFactory(); |