diff --git a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp index f7a04616087..eba95e58ebd 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp @@ -401,8 +401,8 @@ CMakeBuildConfigurationFactory::CMakeBuildConfigurationFactory() registerBuildConfiguration( "CMakeProjectManager.CMakeBuildConfiguration"); - setSupportedProjectType(CMakeProjectManager::Constants::CMAKEPROJECT_ID); - setSupportedProjectMimeTypeName(Constants::CMAKEPROJECTMIMETYPE); + setSupportedProjectType(CMakeProjectManager::Constants::CMAKE_PROJECT_ID); + setSupportedProjectMimeTypeName(Constants::CMAKE_PROJECT_MIMETYPE); setBuildGenerator([](const Kit *k, const FilePath &projectPath, bool forSetup) { QList result; diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp index 22b114518b3..bf1c269cc5a 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp @@ -556,7 +556,7 @@ CMakeBuildStepFactory::CMakeBuildStepFactory() { registerStep(Constants::CMAKE_BUILD_STEP_ID); setDisplayName(CMakeBuildStep::tr("Build", "Display name for CMakeProjectManager::CMakeBuildStep id.")); - setSupportedProjectType(Constants::CMAKEPROJECT_ID); + setSupportedProjectType(Constants::CMAKE_PROJECT_ID); } void CMakeBuildStep::processStarted() diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index b83d19a4b6b..a647c405f78 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -96,8 +96,8 @@ CMakeBuildSystem::CMakeBuildSystem(CMakeBuildConfiguration *bc) if (type == FileType::Unknown) { if (mimeType.isValid()) { const QString mt = mimeType.name(); - if (mt == CMakeProjectManager::Constants::CMAKEPROJECTMIMETYPE - || mt == CMakeProjectManager::Constants::CMAKEMIMETYPE) + if (mt == CMakeProjectManager::Constants::CMAKE_PROJECT_MIMETYPE + || mt == CMakeProjectManager::Constants::CMAKE_MIMETYPE) type = FileType::Project; } } diff --git a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp index 7ec99a52540..a3aef760e54 100644 --- a/src/plugins/cmakeprojectmanager/cmakeeditor.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeeditor.cpp @@ -212,7 +212,7 @@ static TextDocument *createCMakeDocument() { auto doc = new TextDocument; doc->setId(Constants::CMAKE_EDITOR_ID); - doc->setMimeType(QLatin1String(Constants::CMAKEMIMETYPE)); + doc->setMimeType(QLatin1String(Constants::CMAKE_MIMETYPE)); return doc; } @@ -224,8 +224,8 @@ CMakeEditorFactory::CMakeEditorFactory() { setId(Constants::CMAKE_EDITOR_ID); setDisplayName(QCoreApplication::translate("OpenWith::Editors", "CMake Editor")); - addMimeType(Constants::CMAKEMIMETYPE); - addMimeType(Constants::CMAKEPROJECTMIMETYPE); + addMimeType(Constants::CMAKE_MIMETYPE); + addMimeType(Constants::CMAKE_PROJECT_MIMETYPE); setEditorCreator([]() { return new CMakeEditor; }); setEditorWidgetCreator([]() { return new CMakeEditorWidget; }); diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index a5c2243c88f..bf658479b3a 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -195,8 +195,7 @@ private: void manageCMakeTools() { - Core::ICore::showOptionsDialog(Constants::CMAKE_SETTINGSPAGE_ID, - buttonWidget()); + Core::ICore::showOptionsDialog(Constants::CMAKE_SETTINGS_PAGE_ID, buttonWidget()); } bool m_removingItem = false; diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp index b458b9bf4c5..54dc9802687 100644 --- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp @@ -77,9 +77,9 @@ using namespace Internal; \class CMakeProject */ CMakeProject::CMakeProject(const FilePath &fileName) - : Project(Constants::CMAKEMIMETYPE, fileName) + : Project(Constants::CMAKE_MIMETYPE, fileName) { - setId(CMakeProjectManager::Constants::CMAKEPROJECT_ID); + setId(CMakeProjectManager::Constants::CMAKE_PROJECT_ID); setProjectLanguages(Core::Context(ProjectExplorer::Constants::CXX_LANGUAGE_ID)); setDisplayName(projectDirectory().fileName()); setCanBuildProducts(); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h index acd66a7bacf..9938e0e194f 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h +++ b/src/plugins/cmakeprojectmanager/cmakeprojectconstants.h @@ -30,33 +30,33 @@ namespace CMakeProjectManager { namespace Constants { -const char CMAKEMIMETYPE[] = "text/x-cmake"; -const char CMAKEPROJECTMIMETYPE[] = "text/x-cmake-project"; +const char CMAKE_MIMETYPE[] = "text/x-cmake"; +const char CMAKE_PROJECT_MIMETYPE[] = "text/x-cmake-project"; const char CMAKE_EDITOR_ID[] = "CMakeProject.CMakeEditor"; -const char RUNCMAKE[] = "CMakeProject.RunCMake"; -const char CLEARCMAKECACHE[] = "CMakeProject.ClearCache"; -const char RESCANPROJECT[] = "CMakeProject.RescanProject"; -const char RUNCMAKECONTEXTMENU[] = "CMakeProject.RunCMakeContextMenu"; -const char BUILDFILECONTEXTMENU[] = "CMakeProject.BuildFileContextMenu"; -const char BUILDFILE[] = "CMakeProject.BuildFile"; +const char RUN_CMAKE[] = "CMakeProject.RunCMake"; +const char CLEAR_CMAKE_CACHE[] = "CMakeProject.ClearCache"; +const char RESCAN_PROJECT[] = "CMakeProject.RescanProject"; +const char RUN_CMAKE_CONTEXT_MENU[] = "CMakeProject.RunCMakeContextMenu"; +const char BUILD_FILE_CONTEXT_MENU[] = "CMakeProject.BuildFileContextMenu"; +const char BUILD_FILE[] = "CMakeProject.BuildFile"; // Project -const char CMAKEPROJECT_ID[] = "CMakeProjectManager.CMakeProject"; +const char CMAKE_PROJECT_ID[] = "CMakeProjectManager.CMakeProject"; // Menu const char M_CONTEXT[] = "CMakeEditor.ContextMenu"; // Settings page -const char CMAKE_SETTINGSPAGE_ID[] = "Z.CMake"; +const char CMAKE_SETTINGS_PAGE_ID[] = "Z.CMake"; // Snippets const char CMAKE_SNIPPETS_GROUP_ID[] = "CMake"; // Icons -const char FILEOVERLAY_CMAKE[] = ":/cmakeproject/images/fileoverlay_cmake.png"; +const char FILE_OVERLAY_CMAKE[] = ":/cmakeproject/images/fileoverlay_cmake.png"; // Actions -const char BUILD_TARGET_CONTEXTMENU[] = "CMake.BuildTargetContextMenu"; +const char BUILD_TARGET_CONTEXT_MENU[] = "CMake.BuildTargetContextMenu"; // Build Step const char CMAKE_BUILD_STEP_ID[] = "CMakeProjectManager.MakeStep"; diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp index c5c1cd29706..0986554546d 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp @@ -70,11 +70,12 @@ CMakeManager::CMakeManager() : Core::ActionContainer *mfile = Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_FILECONTEXT); - const Core::Context projectContext(CMakeProjectManager::Constants::CMAKEPROJECT_ID); + const Core::Context projectContext(CMakeProjectManager::Constants::CMAKE_PROJECT_ID); const Core::Context globalContext(Core::Constants::C_GLOBAL); Core::Command *command = Core::ActionManager::registerAction(m_runCMakeAction, - Constants::RUNCMAKE, globalContext); + Constants::RUN_CMAKE, + globalContext); command->setAttribute(Core::Command::CA_Hide); mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_DEPLOY); connect(m_runCMakeAction, &QAction::triggered, [this]() { @@ -82,7 +83,8 @@ CMakeManager::CMakeManager() : }); command = Core::ActionManager::registerAction(m_clearCMakeCacheAction, - Constants::CLEARCMAKECACHE, globalContext); + Constants::CLEAR_CMAKE_CACHE, + globalContext); command->setAttribute(Core::Command::CA_Hide); mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_DEPLOY); connect(m_clearCMakeCacheAction, &QAction::triggered, [this]() { @@ -90,7 +92,8 @@ CMakeManager::CMakeManager() : }); command = Core::ActionManager::registerAction(m_runCMakeActionContextMenu, - Constants::RUNCMAKECONTEXTMENU, projectContext); + Constants::RUN_CMAKE_CONTEXT_MENU, + projectContext); command->setAttribute(Core::Command::CA_Hide); mproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD); msubproject->addAction(command, ProjectExplorer::Constants::G_PROJECT_BUILD); @@ -100,23 +103,27 @@ CMakeManager::CMakeManager() : m_buildFileContextMenu = new QAction(tr("Build"), this); command = Core::ActionManager::registerAction(m_buildFileContextMenu, - Constants::BUILDFILECONTEXTMENU, projectContext); + Constants::BUILD_FILE_CONTEXT_MENU, + projectContext); command->setAttribute(Core::Command::CA_Hide); mfile->addAction(command, ProjectExplorer::Constants::G_FILE_OTHER); connect(m_buildFileContextMenu, &QAction::triggered, this, &CMakeManager::buildFileContextMenu); command = Core::ActionManager::registerAction(m_rescanProjectAction, - Constants::RESCANPROJECT, globalContext); + Constants::RESCAN_PROJECT, + globalContext); command->setAttribute(Core::Command::CA_Hide); mbuild->addAction(command, ProjectExplorer::Constants::G_BUILD_DEPLOY); connect(m_rescanProjectAction, &QAction::triggered, [this]() { rescanProject(ProjectTree::currentBuildSystem()); }); - m_buildFileAction = new Utils::ParameterAction(tr("Build File"), tr("Build File \"%1\""), - Utils::ParameterAction::AlwaysEnabled, this); - command = Core::ActionManager::registerAction(m_buildFileAction, Constants::BUILDFILE); + m_buildFileAction = new Utils::ParameterAction(tr("Build File"), + tr("Build File \"%1\""), + Utils::ParameterAction::AlwaysEnabled, + this); + command = Core::ActionManager::registerAction(m_buildFileAction, Constants::BUILD_FILE); command->setAttribute(Core::Command::CA_Hide); command->setAttribute(Core::Command::CA_UpdateText); command->setDescription(m_buildFileAction->text()); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp index 1645807959f..fbb5f8deeea 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectnodes.cpp @@ -129,7 +129,7 @@ CMakeInputsNode::CMakeInputsNode(const Utils::FilePath &cmakeLists) : CMakeListsNode::CMakeListsNode(const Utils::FilePath &cmakeListPath) : ProjectExplorer::ProjectNode(cmakeListPath) { - static QIcon folderIcon = Core::FileIconProvider::directoryIcon(Constants::FILEOVERLAY_CMAKE); + static QIcon folderIcon = Core::FileIconProvider::directoryIcon(Constants::FILE_OVERLAY_CMAKE); setIcon(folderIcon); setListInProject(false); } diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp index 3b23b211803..f4f5dc5cd22 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectplugin.cpp @@ -105,19 +105,20 @@ bool CMakeProjectPlugin::initialize(const QStringList & /*arguments*/, QString * d = new CMakeProjectPluginPrivate; projectTypeSpecificSettings()->fromSettings(ICore::settings()); - const Context projectContext{CMakeProjectManager::Constants::CMAKEPROJECT_ID}; + const Context projectContext{CMakeProjectManager::Constants::CMAKE_PROJECT_ID}; - FileIconProvider::registerIconOverlayForSuffix(Constants::FILEOVERLAY_CMAKE, "cmake"); - FileIconProvider::registerIconOverlayForFilename(Constants::FILEOVERLAY_CMAKE, + FileIconProvider::registerIconOverlayForSuffix(Constants::FILE_OVERLAY_CMAKE, "cmake"); + FileIconProvider::registerIconOverlayForFilename(Constants::FILE_OVERLAY_CMAKE, "CMakeLists.txt"); TextEditor::SnippetProvider::registerGroup(Constants::CMAKE_SNIPPETS_GROUP_ID, tr("CMake", "SnippetProvider")); - ProjectManager::registerProjectType(Constants::CMAKEPROJECTMIMETYPE); + ProjectManager::registerProjectType(Constants::CMAKE_PROJECT_MIMETYPE); //register actions Command *command = ActionManager::registerAction(&d->buildTargetContextAction, - Constants::BUILD_TARGET_CONTEXTMENU, projectContext); + Constants::BUILD_TARGET_CONTEXT_MENU, + projectContext); command->setAttribute(Command::CA_Hide); command->setAttribute(Command::CA_UpdateText); command->setDescription(d->buildTargetContextAction.text()); diff --git a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp index af0d089a4eb..4c7819dd6bc 100644 --- a/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp +++ b/src/plugins/cmakeprojectmanager/cmakesettingspage.cpp @@ -694,7 +694,7 @@ void CMakeToolConfigWidget::currentCMakeToolChanged(const QModelIndex &newCurren CMakeSettingsPage::CMakeSettingsPage() { - setId(Constants::CMAKE_SETTINGSPAGE_ID); + setId(Constants::CMAKE_SETTINGS_PAGE_ID); setDisplayName(CMakeToolConfigWidget::tr("CMake")); setCategory(ProjectExplorer::Constants::KITS_SETTINGS_CATEGORY); setWidgetCreator([] { return new CMakeToolConfigWidget; }); diff --git a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp index 568b9510bd3..0a6aac06db1 100644 --- a/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp +++ b/src/plugins/cmakeprojectmanager/fileapidataextractor.cpp @@ -78,7 +78,7 @@ CMakeFileResult extractCMakeFilesData(const std::vectoraddWidget(m_statusInfoLabel); connect(m_statusInfoLabel, &QLabel::linkActivated, this, []{ Core::ICore::showOptionsDialog( - CMakeProjectManager::Constants::CMAKE_SETTINGSPAGE_ID, + CMakeProjectManager::Constants::CMAKE_SETTINGS_PAGE_ID, Core::ICore::mainWindow()); }); } diff --git a/src/plugins/projectexplorer/desktoprunconfiguration.cpp b/src/plugins/projectexplorer/desktoprunconfiguration.cpp index b30e4b5c8d5..75df893db35 100644 --- a/src/plugins/projectexplorer/desktoprunconfiguration.cpp +++ b/src/plugins/projectexplorer/desktoprunconfiguration.cpp @@ -196,7 +196,7 @@ const char CMAKE_RUNCONFIG_ID[] = "CMakeProjectManager.CMakeRunConfiguration."; CMakeRunConfigurationFactory::CMakeRunConfigurationFactory() { registerRunConfiguration(CMAKE_RUNCONFIG_ID); - addSupportedProjectType(CMakeProjectManager::Constants::CMAKEPROJECT_ID); + addSupportedProjectType(CMakeProjectManager::Constants::CMAKE_PROJECT_ID); addSupportedTargetDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE); } diff --git a/src/plugins/projectexplorer/simpleprojectwizard.cpp b/src/plugins/projectexplorer/simpleprojectwizard.cpp index d9d88aa3158..51dea77c11e 100644 --- a/src/plugins/projectexplorer/simpleprojectwizard.cpp +++ b/src/plugins/projectexplorer/simpleprojectwizard.cpp @@ -168,7 +168,7 @@ void FilesSelectionWizardPage::initializePage() SimpleProjectWizard::SimpleProjectWizard() { setSupportedProjectTypes({QmakeProjectManager::Constants::QMAKEPROJECT_ID, - CMakeProjectManager::Constants::CMAKEPROJECT_ID}); + CMakeProjectManager::Constants::CMAKE_PROJECT_ID}); setIcon(QIcon(QLatin1String(":/projectexplorer/images/importasproject.png"))); setDisplayName(tr("Import as qmake or cmake Project (Limited Functionality)")); setId("Z.DummyProFile");