forked from qt-creator/qt-creator
Remove parent argument from IEditor constructor
Editors are owned by whoever created them via the corresponding editor factory, usually the EditorManager. Change-Id: I4432eab1a3a8c38ce1bba6bb10b0f9273695a524 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -38,7 +38,7 @@ using namespace Android;
|
||||
using namespace Internal;
|
||||
|
||||
AndroidManifestEditor::AndroidManifestEditor(AndroidManifestEditorWidget *editorWidget)
|
||||
: Core::IEditor(editorWidget), m_toolBar(nullptr)
|
||||
: m_toolBar(nullptr)
|
||||
{
|
||||
m_toolBar = new QToolBar(editorWidget);
|
||||
m_actionGroup = new QActionGroup(this);
|
||||
|
@@ -103,8 +103,8 @@ namespace Core {
|
||||
/*!
|
||||
\internal
|
||||
*/
|
||||
IEditor::IEditor(QObject *parent)
|
||||
: IContext(parent), m_duplicateSupported(false)
|
||||
IEditor::IEditor()
|
||||
: m_duplicateSupported(false)
|
||||
{}
|
||||
|
||||
/*!
|
||||
|
@@ -39,7 +39,7 @@ class CORE_EXPORT IEditor : public IContext
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
IEditor(QObject *parent = nullptr);
|
||||
IEditor();
|
||||
|
||||
bool duplicateSupported() const;
|
||||
void setDuplicateSupported(bool duplicateSupported);
|
||||
|
@@ -75,17 +75,15 @@ static bool updateButtonIconByTheme(QAbstractButton *button, const QString &name
|
||||
return false;
|
||||
}
|
||||
|
||||
ImageViewer::ImageViewer(QWidget *parent)
|
||||
: IEditor(parent),
|
||||
d(new ImageViewerPrivate)
|
||||
ImageViewer::ImageViewer()
|
||||
: d(new ImageViewerPrivate)
|
||||
{
|
||||
d->file.reset(new ImageViewerFile);
|
||||
ctor();
|
||||
}
|
||||
|
||||
ImageViewer::ImageViewer(const QSharedPointer<ImageViewerFile> &document, QWidget *parent)
|
||||
: IEditor(parent),
|
||||
d(new ImageViewerPrivate)
|
||||
ImageViewer::ImageViewer(const QSharedPointer<ImageViewerFile> &document)
|
||||
: d(new ImageViewerPrivate)
|
||||
{
|
||||
d->file = document;
|
||||
ctor();
|
||||
|
@@ -46,7 +46,7 @@ class ImageViewer : public Core::IEditor
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit ImageViewer(QWidget *parent = nullptr);
|
||||
ImageViewer();
|
||||
~ImageViewer() override;
|
||||
|
||||
Core::IDocument *document() const override;
|
||||
@@ -69,7 +69,7 @@ public:
|
||||
void togglePlay();
|
||||
|
||||
private:
|
||||
ImageViewer(const QSharedPointer<ImageViewerFile> &document, QWidget *parent = nullptr);
|
||||
ImageViewer(const QSharedPointer<ImageViewerFile> &document);
|
||||
void ctor();
|
||||
void playToggled();
|
||||
void updatePauseAction();
|
||||
|
@@ -141,16 +141,15 @@ public:
|
||||
QAction *syncEachOtherAction = nullptr;
|
||||
};
|
||||
|
||||
ModelEditor::ModelEditor(UiController *uiController, ActionHandler *actionHandler, QWidget *parent)
|
||||
: IEditor(parent),
|
||||
d(new ModelEditorPrivate)
|
||||
ModelEditor::ModelEditor(UiController *uiController, ActionHandler *actionHandler)
|
||||
: d(new ModelEditorPrivate)
|
||||
{
|
||||
setContext(Core::Context(Constants::MODEL_EDITOR_ID));
|
||||
d->uiController = uiController;
|
||||
d->actionHandler = actionHandler;
|
||||
d->document = new ModelDocument(this);
|
||||
connect(d->document, &ModelDocument::contentSet, this, &ModelEditor::onContentSet);
|
||||
init(parent);
|
||||
init();
|
||||
}
|
||||
|
||||
ModelEditor::~ModelEditor()
|
||||
@@ -206,13 +205,13 @@ bool ModelEditor::restoreState(const QByteArray &state)
|
||||
return false;
|
||||
}
|
||||
|
||||
void ModelEditor::init(QWidget *parent)
|
||||
void ModelEditor::init()
|
||||
{
|
||||
// create and configure properties view
|
||||
d->propertiesView = new qmt::PropertiesView(this);
|
||||
|
||||
// create and configure editor ui
|
||||
d->rightSplitter = new Core::MiniSplitter(parent);
|
||||
d->rightSplitter = new Core::MiniSplitter;
|
||||
connect(d->rightSplitter, &QSplitter::splitterMoved,
|
||||
this, &ModelEditor::onRightSplitterMoved);
|
||||
connect(d->uiController, &UiController::rightSplitterChanged,
|
||||
|
@@ -63,8 +63,7 @@ class ModelEditor :
|
||||
class ModelEditorPrivate;
|
||||
|
||||
public:
|
||||
explicit ModelEditor(UiController *uiController, ActionHandler *actionHandler,
|
||||
QWidget *parent = nullptr);
|
||||
ModelEditor(UiController *uiController, ActionHandler *actionHandler);
|
||||
~ModelEditor();
|
||||
|
||||
Core::IDocument *document() const override;
|
||||
@@ -96,7 +95,7 @@ public:
|
||||
qmt::MPackage *guessSelectedPackage() const;
|
||||
|
||||
private:
|
||||
void init(QWidget *parent);
|
||||
void init();
|
||||
void initDocument();
|
||||
|
||||
void updateSelectedArea(SelectedArea selectedArea);
|
||||
|
Reference in New Issue
Block a user