forked from qt-creator/qt-creator
Qt Designer plugin: Port to new signals & slots syntax.
Split ResourceHandler::updateResources(bool updateProjectResources) into 2 slots to make it compatible to void signals. Change-Id: I0614637cd575c45f9acd6514fe04fe08dfcfcff8 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
@@ -63,10 +63,10 @@ void FormEditorStack::add(const EditorData &data)
|
||||
{
|
||||
if (m_designerCore == 0) { // Initialize first time here
|
||||
m_designerCore = data.widgetHost->formWindow()->core();
|
||||
connect(m_designerCore->formWindowManager(), SIGNAL(activeFormWindowChanged(QDesignerFormWindowInterface*)),
|
||||
this, SLOT(updateFormWindowSelectionHandles()));
|
||||
connect(Core::ModeManager::instance(), SIGNAL(currentModeAboutToChange(Core::IMode*)),
|
||||
this, SLOT(modeAboutToChange(Core::IMode*)));
|
||||
connect(m_designerCore->formWindowManager(), &QDesignerFormWindowManagerInterface::activeFormWindowChanged,
|
||||
this, &FormEditorStack::updateFormWindowSelectionHandles);
|
||||
connect(Core::ModeManager::instance(), &Core::ModeManager::currentModeAboutToChange,
|
||||
this, &FormEditorStack::modeAboutToChange);
|
||||
}
|
||||
|
||||
if (Designer::Constants::Internal::debug)
|
||||
@@ -77,11 +77,11 @@ void FormEditorStack::add(const EditorData &data)
|
||||
// Editors are normally removed by listening to EditorManager::editorsClosed.
|
||||
// However, in the case opening a file fails, EditorManager just deletes the editor, which
|
||||
// is caught by the destroyed() signal.
|
||||
connect(data.formWindowEditor, SIGNAL(destroyed(QObject*)),
|
||||
this, SLOT(removeFormWindowEditor(QObject*)));
|
||||
connect(data.formWindowEditor, &FormWindowEditor::destroyed,
|
||||
this, &FormEditorStack::removeFormWindowEditor);
|
||||
|
||||
connect(data.widgetHost, SIGNAL(formWindowSizeChanged(int,int)),
|
||||
this, SLOT(formSizeChanged(int,int)));
|
||||
connect(data.widgetHost, &SharedTools::WidgetHost::formWindowSizeChanged,
|
||||
this, &FormEditorStack::formSizeChanged);
|
||||
|
||||
if (Designer::Constants::Internal::debug)
|
||||
qDebug() << "FormEditorStack::add" << data.widgetHost << m_formEditors.size();
|
||||
|
||||
Reference in New Issue
Block a user