diff --git a/src/plugins/coreplugin/baseview.cpp b/src/plugins/coreplugin/baseview.cpp index ae93c281fa5bb49b679b7de3130498077fa69bc1..8c04ee05aa7d9c9025a511673c5ca80f7e4ae1c9 100644 --- a/src/plugins/coreplugin/baseview.cpp +++ b/src/plugins/coreplugin/baseview.cpp @@ -82,29 +82,10 @@ BaseView::BaseView(QObject *parent) { } -/*! - \fn BaseView::BaseView(const char *name, QWidget *widget, const QList<int> &context, Qt::DockWidgetArea position, QObject *parent) - - Creates a view with the given properties. - - \a name - \a widget - \a context - \a position - \a parent -*/ - -BaseView::BaseView(const char *name, QWidget *widget, const QList<int> &context, IView::ViewPosition position, QObject *parent) - : IView(parent), - m_viewName(name), - m_widget(widget), - m_context(context), - m_defaultPosition(position) -{ -} - /*! \fn BaseView::~BaseView() + + Destructor also destroys the widget. */ BaseView::~BaseView() { diff --git a/src/plugins/coreplugin/baseview.h b/src/plugins/coreplugin/baseview.h index a39e4dc8ca2041d986c65d3f8b8c181a536663df..6044ace493a5460e9cd7b077c46ff05402dd9f31 100644 --- a/src/plugins/coreplugin/baseview.h +++ b/src/plugins/coreplugin/baseview.h @@ -40,14 +40,12 @@ namespace Core { -class CORE_EXPORT BaseView - : public IView +class CORE_EXPORT BaseView : public IView { Q_OBJECT public: BaseView(QObject *parent = 0); - BaseView(const char *name, QWidget *widget, const QList<int> &context, IView::ViewPosition position, QObject *parent = 0); ~BaseView(); QList<int> context() const; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index f5e131b98b1cb69a3811b648dd99929b2b0f0f73..262b70b2145f044adcc26111c5cb290be7960794 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -309,8 +309,10 @@ bool MainWindow::init(QString *errorMessage) // Add widget to the bottom, we create the view here instead of inside the // OutputPaneManager, since the ViewManager needs to be initilized before - m_outputView = new Core::BaseView("OutputWindow.Buttons", - OutputPaneManager::instance()->buttonsWidget(), QList<int>(), Core::IView::Second); + m_outputView = new Core::BaseView; + m_outputView->setUniqueViewName("OutputWindow.Buttons"); + m_outputView->setWidget(OutputPaneManager::instance()->buttonsWidget()); + m_outputView->setDefaultPosition(Core::IView::Second); pm->addObject(m_outputView); return true; } diff --git a/src/plugins/quickopen/quickopenplugin.cpp b/src/plugins/quickopen/quickopenplugin.cpp index aab8bf739bec660f9ce33234601663ed074abb6c..a7b6de8fbab36d04d053f8e391b07c787529fdfe 100644 --- a/src/plugins/quickopen/quickopenplugin.cpp +++ b/src/plugins/quickopen/quickopenplugin.cpp @@ -57,6 +57,7 @@ using namespace QuickOpen; using namespace QuickOpen::Internal; + namespace { static bool filterLessThan(const IQuickOpenFilter *first, const IQuickOpenFilter *second) { @@ -89,10 +90,12 @@ bool QuickOpenPlugin::initialize(const QStringList &, QString *) m_quickOpenToolWindow = new QuickOpenToolWindow(this); m_quickOpenToolWindow->setEnabled(false); - Core::BaseView *view = new Core::BaseView("QuickOpen.ToolWindow", - m_quickOpenToolWindow, - QList<int>() << core->uniqueIDManager()->uniqueIdentifier(QLatin1String("QuickOpenToolWindow")), - Core::IView::First); + Core::BaseView *view = new Core::BaseView; + view->setUniqueViewName("QuickOpen.ToolWindow"); + view->setWidget(m_quickOpenToolWindow); + view->setContext(QList<int>() << core->uniqueIDManager() + ->uniqueIdentifier(QLatin1String("QuickOpenToolWindow"))); + view->setDefaultPosition(Core::IView::First); addAutoReleasedObject(view); const QString actionId = QLatin1String("QtCreator.View.QuickOpen.ToolWindow");