diff --git a/src/plugins/designer/editorwidget.cpp b/src/plugins/designer/editorwidget.cpp index c2dfa92bab5..a9b10e6767b 100644 --- a/src/plugins/designer/editorwidget.cpp +++ b/src/plugins/designer/editorwidget.cpp @@ -43,7 +43,7 @@ namespace Internal { // ---------- EditorWidget -EditorWidget::EditorWidget(FormEditorW *few, QWidget *parent) : +EditorWidget::EditorWidget(QWidget *parent) : Utils::FancyMainWindow(parent), m_stack(new FormEditorStack) { @@ -54,7 +54,7 @@ EditorWidget::EditorWidget(FormEditorW *few, QWidget *parent) : setCorner(Qt::BottomLeftCorner, Qt::LeftDockWidgetArea); setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); - QWidget * const*subs = few->designerSubWindows(); + QWidget * const*subs = FormEditorW::designerSubWindows(); for (int i = 0; i < DesignerSubWindowCount; i++) { QWidget *subWindow = subs[i]; subWindow->setWindowTitle(subs[i]->windowTitle()); diff --git a/src/plugins/designer/editorwidget.h b/src/plugins/designer/editorwidget.h index 7bae38c2b73..5279135f58f 100644 --- a/src/plugins/designer/editorwidget.h +++ b/src/plugins/designer/editorwidget.h @@ -49,7 +49,6 @@ namespace Internal { class EditorData; class FormEditorStack; -class FormEditorW; // Design mode main view. class EditorWidget : public Utils::FancyMainWindow @@ -57,7 +56,7 @@ class EditorWidget : public Utils::FancyMainWindow Q_OBJECT public: - explicit EditorWidget(FormEditorW *fe, QWidget *parent = 0); + explicit EditorWidget(QWidget *parent = 0); QDockWidget* const* designerDockWidgets() const; diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index ce1aac321cf..b91e1cf0f82 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -406,7 +406,7 @@ void FormEditorData::fullInit() }); // Nest toolbar and editor widget - m_editorWidget = new EditorWidget(m_instance); + m_editorWidget = new EditorWidget; QSettings *settings = ICore::settings(); settings->beginGroup(QLatin1String(settingsGroupC)); m_editorWidget->restoreSettings(settings);