diff --git a/src/plugins/designer/formeditorplugin.cpp b/src/plugins/designer/formeditorplugin.cpp index dd6aa84cbc5..4292f6c09a2 100644 --- a/src/plugins/designer/formeditorplugin.cpp +++ b/src/plugins/designer/formeditorplugin.cpp @@ -115,8 +115,8 @@ void FormEditorPlugin::extensionsInitialized() mtools->addMenu(mformtools); connect(m_actionSwitchSource, &QAction::triggered, this, &FormEditorPlugin::switchSourceForm); - Core::Context context(Designer::Constants::C_FORMEDITOR, Core::Constants::C_EDITORMANAGER); - Core::Command *cmd = Core::ActionManager::registerAction(m_actionSwitchSource, + Context context(C_FORMEDITOR, Core::Constants::C_EDITORMANAGER); + Command *cmd = ActionManager::registerAction(m_actionSwitchSource, "FormEditor.FormSwitchSource", context); cmd->setDefaultKeySequence(tr("Shift+F4")); mformtools->addAction(cmd, Core::Constants::G_DEFAULT_THREE); @@ -192,5 +192,5 @@ void FormEditorPlugin::switchSourceForm() { const QString fileToOpen = otherFile(); if (!fileToOpen.isEmpty()) - Core::EditorManager::openEditor(fileToOpen); + EditorManager::openEditor(fileToOpen); } diff --git a/src/plugins/designer/formeditorw.cpp b/src/plugins/designer/formeditorw.cpp index ef90d949a7c..94cadaa9dd5 100644 --- a/src/plugins/designer/formeditorw.cpp +++ b/src/plugins/designer/formeditorw.cpp @@ -130,7 +130,7 @@ class FormWindowEditorFactory : public TextEditor::TextEditorFactory public: FormWindowEditorFactory() { - setId(Designer::Constants::K_DESIGNER_XML_EDITOR_ID); + setId(K_DESIGNER_XML_EDITOR_ID); setEditorCreator([]() { return new FormWindowEditor; }); setEditorWidgetCreator([]() { return new Internal::DesignerXmlEditorWidget; }); setDuplicatedSupported(false); @@ -168,29 +168,29 @@ public: void setupActions(); void setupViewActions(); - void addDockViewAction(Core::ActionContainer *viewMenu, + void addDockViewAction(ActionContainer *viewMenu, int index, - const Core::Context &context, - const QString &title, Core::Id id); + const Context &context, + const QString &title, Id id); - Core::ActionContainer *createPreviewStyleMenu(QActionGroup *actionGroup); + ActionContainer *createPreviewStyleMenu(QActionGroup *actionGroup); void critical(const QString &errorMessage); - void bindShortcut(Core::Command *command, QAction *action); + void bindShortcut(Command *command, QAction *action); QAction *createEditModeAction(QActionGroup *ag, - const Core::Context &context, - Core::ActionContainer *medit, + const Context &context, + ActionContainer *medit, const QString &actionName, - Core::Id id, + Id id, int toolNumber, const QString &iconName = QString(), const QString &keySequence = QString()); - Core::Command *addToolAction(QAction *a, - const Core::Context &context, Core::Id id, - Core::ActionContainer *c1, const QString &keySequence = QString(), - Core::Id groupId = Core::Id()); + Command *addToolAction(QAction *a, + const Context &context, Id id, + ActionContainer *c1, const QString &keySequence = QString(), + Id groupId = Id()); QToolBar *createEditorToolBar() const; - Core::IEditor *createEditor(); + IEditor *createEditor(); public: QDesignerFormEditorInterface *m_formeditor; @@ -198,12 +198,12 @@ public: QDesignerFormWindowManagerInterface *m_fwm; FormEditorW::InitializationStage m_initStage; - QWidget *m_designerSubWindows[Designer::Constants::DesignerSubWindowCount]; + QWidget *m_designerSubWindows[DesignerSubWindowCount]; QAction *m_lockAction; QAction *m_resetLayoutAction; - QList m_settingsPages; + QList m_settingsPages; QActionGroup *m_actionGroupEditMode; QAction *m_actionPrint; QAction *m_actionPreview; @@ -213,17 +213,17 @@ public: QSignalMapper m_shortcutMapper; DesignerContext *m_context; - Core::Context m_contexts; + Context m_contexts; - QList m_toolActionIds; + QList m_toolActionIds; QWidget *m_modeWidget; EditorWidget *m_editorWidget; - Core::DesignMode *m_designMode; + DesignMode *m_designMode; QWidget *m_editorToolBar; - Core::EditorToolBar *m_toolBar; + EditorToolBar *m_toolBar; - QMap m_commandToDesignerAction; + QMap m_commandToDesignerAction; FormWindowEditorFactory *m_xmlEditorFactory; }; @@ -254,7 +254,7 @@ FormEditorData::FormEditorData() : QTC_ASSERT(!d, return); d = this; - qFill(m_designerSubWindows, m_designerSubWindows + Designer::Constants::DesignerSubWindowCount, + qFill(m_designerSubWindows, m_designerSubWindows + DesignerSubWindowCount, static_cast(0)); m_formeditor->setTopLevel(ICore::mainWindow()); @@ -263,7 +263,7 @@ FormEditorData::FormEditorData() : m_fwm = m_formeditor->formWindowManager(); QTC_ASSERT(m_fwm, return); - m_contexts.add(Designer::Constants::C_FORMEDITOR); + m_contexts.add(C_FORMEDITOR); setupActions(); @@ -456,7 +456,7 @@ void FormEditorData::fullInit() void FormEditorData::initDesignerSubWindows() { - qFill(m_designerSubWindows, m_designerSubWindows + Designer::Constants::DesignerSubWindowCount, static_cast(0)); + qFill(m_designerSubWindows, m_designerSubWindows + DesignerSubWindowCount, static_cast(0)); QDesignerWidgetBoxInterface *wb = QDesignerComponents::createWidgetBox(m_formeditor, 0); wb->setWindowTitle(tr("Widget Box")); @@ -489,7 +489,7 @@ void FormEditorData::initDesignerSubWindows() m_initStage = FormEditorW::SubwindowsInitialized; } -QList FormEditorW::optionsPages() +QList FormEditorW::optionsPages() { return d->m_settingsPages; } @@ -760,7 +760,7 @@ QAction *FormEditorData::createEditModeAction(QActionGroup *ag, if (!iconName.isEmpty()) rc->setIcon(designerIcon(iconName)); Command *command = ActionManager::registerAction(rc, id, context); - command->setAttribute(Core::Command::CA_Hide); + command->setAttribute(Command::CA_Hide); if (!keySequence.isEmpty()) command->setDefaultKeySequence(QKeySequence(keySequence)); bindShortcut(command, rc); @@ -773,7 +773,7 @@ QAction *FormEditorData::createEditModeAction(QActionGroup *ag, // Create a tool action Command *FormEditorData::addToolAction(QAction *a, const Context &context, Id id, ActionContainer *c1, const QString &keySequence, - Core::Id groupId) + Id groupId) { Command *command = ActionManager::registerAction(a, id, context); if (!keySequence.isEmpty()) @@ -784,7 +784,7 @@ Command *FormEditorData::addToolAction(QAction *a, const Context &context, Id id return command; } -Core::IEditor *FormEditorData::createEditor() +IEditor *FormEditorData::createEditor() { if (Designer::Constants::Internal::debug) qDebug() << "FormEditorW::createEditor"; @@ -801,7 +801,7 @@ Core::IEditor *FormEditorData::createEditor() m_toolBar->addEditor(formWindowEditor); if (formWindowEditor) { - Core::InfoBarEntry info(Core::Id(Constants::INFO_READ_ONLY), + InfoBarEntry info(Id(Constants::INFO_READ_ONLY), tr("This file can only be edited in Design mode.")); info.setCustomButtonInfo(tr("Switch Mode"), []() { ModeManager::activateMode(Core::Constants::MODE_DESIGN); }); formWindowEditor->document()->infoBar()->addInfo(info); diff --git a/src/plugins/designer/gotoslot_test.cpp b/src/plugins/designer/gotoslot_test.cpp index a0ab9b1b894..abdad8cb781 100644 --- a/src/plugins/designer/gotoslot_test.cpp +++ b/src/plugins/designer/gotoslot_test.cpp @@ -234,15 +234,18 @@ public: } // anonymous namespace +namespace Designer { +namespace Internal { + /// Check: Executes "Go To Slot..." on a QPushButton in a *.ui file and checks if the respective /// header and source files are correctly updated. -void Designer::Internal::FormEditorPlugin::test_gotoslot() +void FormEditorPlugin::test_gotoslot() { QFETCH(QStringList, files); (GoToSlotTestCase(files)); } -void Designer::Internal::FormEditorPlugin::test_gotoslot_data() +void FormEditorPlugin::test_gotoslot_data() { typedef QLatin1String _; QTest::addColumn("files"); @@ -282,3 +285,6 @@ void Designer::Internal::FormEditorPlugin::test_gotoslot_data() << testDataDir.file(_("form.h")) << testDataDir.file(_("form.ui"))); } + +} // namespace Internal +} // namespace Designer diff --git a/src/plugins/designer/resourcehandler.cpp b/src/plugins/designer/resourcehandler.cpp index 708622a1c26..ba8638f6d13 100644 --- a/src/plugins/designer/resourcehandler.cpp +++ b/src/plugins/designer/resourcehandler.cpp @@ -73,7 +73,7 @@ void QrcFilesVisitor::visitProjectNode(ProjectNode *projectNode) void QrcFilesVisitor::visitFolderNode(FolderNode *folderNode) { foreach (const FileNode *fileNode, folderNode->fileNodes()) { - if (fileNode->fileType() == ProjectExplorer::ResourceType) + if (fileNode->fileType() == ResourceType) m_qrcFiles.append(fileNode->path()); } if (dynamic_cast(folderNode))