diff options
| author | Ben Cho <ben.cho@qt.io> | 2024-10-07 11:25:26 +0200 |
|---|---|---|
| committer | Ben Cho <ben.cho@qt.io> | 2024-10-07 10:23:03 +0000 |
| commit | 10db4bb230a40dff2d2c7568313e1983065b0deb (patch) | |
| tree | 1e302c32acdf7e530e8a9737c5154622fadffbf7 /qt-cpp | |
| parent | 1b6399b6fd4e59a08039160fdf3faf1fa39b16db (diff) | |
qt-core, qt-cpp: Rename project classes
Project classes in the qt-core, qt-cpp modules are now prefixed with
Core- and Cpp- respectively, for improved consistency and clarity
across all modules.
Change-Id: I9d8025e91b9457717b6398afc9d4e0cb612e8c53
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Orkun Tokdemir <orkun.tokdemir@qt.io>
Diffstat (limited to 'qt-cpp')
| -rw-r--r-- | qt-cpp/src/extension.ts | 4 | ||||
| -rw-r--r-- | qt-cpp/src/kit-manager.ts | 10 | ||||
| -rw-r--r-- | qt-cpp/src/project.ts | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/qt-cpp/src/extension.ts b/qt-cpp/src/extension.ts index 90eda45..abdb5d4 100644 --- a/qt-cpp/src/extension.ts +++ b/qt-cpp/src/extension.ts @@ -24,7 +24,7 @@ import { registerbuildDirectoryName, registerlaunchTargetFilenameWithoutExtension } from '@cmd/launch-variables'; -import { Project, ProjectManager } from '@/project'; +import { CppProject, ProjectManager } from '@/project'; import { KitManager } from '@/kit-manager'; import { wasmStartTaskProvider, WASMStartTaskProvider } from '@task/wasm-start'; import { EXTENSION_ID } from '@/constants'; @@ -47,7 +47,7 @@ export async function activate(context: vscode.ExtensionContext) { if (vscode.workspace.workspaceFolders !== undefined) { for (const folder of vscode.workspace.workspaceFolders) { - const project = await Project.createProject(folder, context); + const project = await CppProject.createProject(folder, context); projectManager.addProject(project); kitManager.addProject(project); } diff --git a/qt-cpp/src/kit-manager.ts b/qt-cpp/src/kit-manager.ts index 81b33be..146f97a 100644 --- a/qt-cpp/src/kit-manager.ts +++ b/qt-cpp/src/kit-manager.ts @@ -20,7 +20,7 @@ import { QtInfo } from 'qt-lib'; import * as qtPath from '@util/get-qt-paths'; -import { Project } from '@/project'; +import { CppProject } from '@/project'; import { coreAPI } from '@/extension'; import { GlobalStateManager } from '@/state'; @@ -108,7 +108,7 @@ export interface Kit { } export class KitManager { - projects = new Set<Project>(); + projects = new Set<CppProject>(); workspaceFile: vscode.Uri | undefined; globalStateManager: GlobalStateManager; static readonly MapMsvcPlatformToQt: Record<string, string> = { @@ -137,12 +137,12 @@ export class KitManager { this.globalStateManager = new GlobalStateManager(context); } - public addProject(project: Project) { + public addProject(project: CppProject) { this.projects.add(project); void this.checkForQtInstallations(project); } - public removeProject(project: Project) { + public removeProject(project: CppProject) { this.projects.delete(project); } @@ -169,7 +169,7 @@ export class KitManager { // If the project parameter is undefined, it means that it is a global check // otherwise, it is a workspace folder check - private async checkForQtInstallations(project?: Project) { + private async checkForQtInstallations(project?: CppProject) { const currentQtInsRoot = project ? KitManager.getWorkspaceFolderQtInsRoot(project.folder) : getCurrentGlobalQtInstallationRoot(); diff --git a/qt-cpp/src/project.ts b/qt-cpp/src/project.ts index 5b0d09e..80e2e26 100644 --- a/qt-cpp/src/project.ts +++ b/qt-cpp/src/project.ts @@ -13,7 +13,7 @@ import { getSelectedQtInstallationPath } from '@cmd/register-qt-path'; const logger = createLogger('project'); // Project class represents a workspace folder in the extension. -export class Project implements ProjectBase { +export class CppProject implements ProjectBase { private readonly _stateManager: WorkspaceStateManager; private readonly _cmakeProject: cmakeAPi.Project | undefined; private constructor( @@ -56,7 +56,7 @@ export class Project implements ProjectBase { if (api) { cmakeProject = await api.getProject(folder.uri); } - return new Project(folder, context, cmakeProject); + return new CppProject(folder, context, cmakeProject); } public getStateManager() { return this._stateManager; @@ -71,11 +71,11 @@ export class Project implements ProjectBase { } export class ProjectManager { - projects = new Set<Project>(); + projects = new Set<CppProject>(); constructor(readonly context: vscode.ExtensionContext) { this.watchProjects(context); } - public addProject(project: Project) { + public addProject(project: CppProject) { logger.info('Adding project:', project.folder.uri.fsPath); this.projects.add(project); } @@ -99,7 +99,7 @@ export class ProjectManager { kitManager.removeProject(project); } for (const folder of event.added) { - const project = await Project.createProject(folder, context); + const project = await CppProject.createProject(folder, context); this.projects.add(project); kitManager.addProject(project); } |