diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 2af0850b712..a3d4cdd06d9 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -56809,7 +56809,7 @@ Tento průvodce vás provede základními kroky, které jsou nutné pro nasazen - BareMetal::BareMetalDeviceConfigurationWidget + BareMetal Form Formulář @@ -56826,13 +56826,6 @@ Tento průvodce vás provede základními kroky, které jsou nutné pro nasazen GDB commands: Příkazy GDB: - - - BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage - - Form - Formulář - Name: Název: @@ -56841,18 +56834,6 @@ Tento průvodce vás provede základními kroky, které jsou nutné pro nasazen localhost localhost - - GDB port: - Port GDB: - - - GDB host: - Hostitel GDB: - - - GDB commands: - Příkazy GDB: - load monitor reset @@ -57779,53 +57760,27 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr - BareMetal::Internal::BareMetalDevice + BareMetal Bare Metal Bare Metal - - - BareMetal::BareMetalDeviceConfigurationFactory Bare Metal Device Zařízení Bare Metal - - - BareMetal::BareMetalDeviceConfigurationWizard New Bare Metal Device Configuration Setup Zřízení nového nastavení zařízení Bare Metal - - - BareMetal::BareMetalDeviceConfigurationWizardSetupPage Set up GDB Server or Hardware Debugger Nastavit server GDB nebo hardwarový ladicí program - - Bare Metal Device - Zařízení Bare Metal - - - - BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget - - GDB commands: - Příkazy GDB: - - - - BareMetal::BareMetalGdbCommandsDeployStep GDB commands Příkazy GDB - - - BareMetal::BareMetalRunConfiguration %1 (via GDB server or hardware debugger) %1 (pomocí serveru GDB nebo hardwarového ladicího programu) @@ -57835,16 +57790,10 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr Bare Metal run configuration default run name Spustit na serveru GDB nebo hardwarovém ladicím programu - - - BareMetal::Internal::BareMetalRunConfigurationFactory %1 (on GDB server or hardware debugger) %1 (na serveru GDB nebo hardwarovém ladicím programu) - - - BareMetal::BareMetalRunConfigurationWidget Executable: Spustitelný soubor: @@ -57865,9 +57814,6 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr Unknown Neznámý - - - BareMetal::Internal::BareMetalRunControlFactory Cannot debug: Kit has no device. Nelze ladit: Kit nemá žádné zařízení. diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index 34b1c9bd369..cf54251fc42 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -2340,16 +2340,10 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Enter GDB commands to reset the hardware. The MCU should be halted after these commands. Indtast GDB-kommandoer for at nulstille hardwaren. MCU'en bør standses efter disse kommandoer. - - - BareMetal::GdbServerProvider Clone of %1 Klon af %1 - - - BareMetal::Internal::BareMetalCustomRunConfiguration Unknown Ukendt @@ -2366,9 +2360,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Custom Executable Brugerdefineret eksekverbar - - - BareMetal::Internal::BareMetalDebugSupport Cannot debug: Kit has no device. Kan ikke fejlrette: kit har ingen enhed. @@ -2385,37 +2376,22 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Cannot debug: Could not find executable for "%1". Kan ikke fejlrette: kunne ikke finde eksekverbar for "%1". - - - BareMetal::Internal::BareMetalDevice Bare Metal Bare Metal - - - BareMetal::Internal::BareMetalDeviceConfigurationFactory Bare Metal Device Bare Metal-enhed - - - BareMetal::Internal::BareMetalDeviceConfigurationWidget GDB server provider: GDB-serverudbyder: - - - BareMetal::Internal::BareMetalDeviceConfigurationWizard New Bare Metal Device Configuration Setup Ny Bare Metal-enhed konfigurationsopsætning - - - BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage Set up GDB Server or Hardware Debugger Opsæt GDB-server eller hardware-fejlretter @@ -2424,38 +2400,14 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Name: Navn: - - GDB server provider: - GDB-serverudbyder: - - - Bare Metal Device - Bare Metal-enhed - - - - BareMetal::Internal::BareMetalGdbCommandsDeployStep GDB commands GDB-kommandoer - - - BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget GDB commands: GDB-kommandoer: - - - BareMetal::Internal::BareMetalRunConfiguration - - Unknown - Ukendt - - - - BareMetal::Internal::DefaultGdbServerProviderConfigWidget Host: Vært: @@ -2468,16 +2420,10 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Reset commands: Nulstil-kommandoer: - - - BareMetal::Internal::DefaultGdbServerProviderFactory Default Standard - - - BareMetal::Internal::GdbServerProviderChooser Manage... Håndter... @@ -2486,17 +2432,10 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba None Ingen - - - BareMetal::Internal::GdbServerProviderConfigWidget Enter the name of the GDB server provider. Indtast navnet på GDB-serverudbyderen. - - Name: - Navn: - Choose the desired startup mode of the GDB server provider. Vælg den ønskede opstart-tilstand af GDB-serverudbyderen. @@ -2517,9 +2456,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Startup in Pipe Mode Opstart i pipe-tilstand - - - BareMetal::Internal::GdbServerProviderModel Name Navn @@ -2536,9 +2472,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba The following providers were already configured:<br>&nbsp;%1<br>They were not configured again. Følgende udbydere var allerede konfigureret:<br>&nbsp;%1<br>De blev ikke konfigureret igen. - - - BareMetal::Internal::GdbServerProvidersSettingsPage Add Tilføj @@ -2555,13 +2488,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba GDB Server Providers GDB-serverudbydere - - Bare Metal - Bare Metal - - - - BareMetal::Internal::HostWidget Enter TCP/IP hostname of the GDB server provider, like "localhost" or "192.0.2.1". Indtast TCP/IP-værtsnavn af GDB-serverudbyderen, såsom "localhost" eller "192.0.2.1". @@ -2570,13 +2496,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Enter TCP/IP port which will be listened by the GDB server provider. Indtast TCP/IP-port som skal lyttes på af GDB-serverudbyderen. - - - BareMetal::Internal::OpenOcdGdbServerProviderConfigWidget - - Host: - Vært: - Executable file: Eksekverbar fil: @@ -2593,32 +2512,10 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Additional arguments: Yderligere argumenter: - - Init commands: - Init-kommandoer: - - - Reset commands: - Nulstil-kommandoer: - - - - BareMetal::Internal::OpenOcdGdbServerProviderFactory OpenOCD OpenOCD - - - BareMetal::Internal::StLinkUtilGdbServerProviderConfigWidget - - Host: - Vært: - - - Executable file: - Eksekverbar fil: - Specify the verbosity level (0..99). Angiv detaljeniveauet (0..99). @@ -2651,14 +2548,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba Version: Version: - - Init commands: - Init-kommandoer: - - - Reset commands: - Nulstil-kommandoer: - ST-LINK/V1 ST-LINK/V1 @@ -2667,9 +2556,6 @@ Advarsel: dette er en eksperimentel facilitet og kan lede til at test-eksekverba ST-LINK/V2 ST-LINK/V2 - - - BareMetal::Internal::StLinkUtilGdbServerProviderFactory ST-LINK Utility ST-LINK-redskab diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 7cdbf1fbbab..675304a58f2 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -23474,7 +23474,7 @@ Bitte schließen Sie alle laufenden Instanzen Ihrer Anwendung vor dem Erstellen. - BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage + BareMetal Set up Debug Server or Hardware Debugger Debug-Server oder Hardware-Debugger einrichten @@ -23885,7 +23885,7 @@ Möchten Sie das vorhandene Paket deinstallieren? - BareMetal::Internal::BareMetalDevice + BareMetal Bare Metal Bare Metal @@ -23894,9 +23894,6 @@ Möchten Sie das vorhandene Paket deinstallieren? Bare Metal Device Bare-Metal-Gerät - - - BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget GDB commands: GDB-Kommandos: @@ -26963,30 +26960,14 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer.Enter GDB commands to reset the hardware. The MCU should be halted after these commands. Geben Sie GDB-Kommandos ein, um die Hardware zurückzusetzen. Die MCU sollte danach angehalten sein. - - - BareMetal::Internal::BareMetalDeviceConfigurationWidget - - Debug server provider: - Debug-Server-Provider: - - - - BareMetal::Internal::BareMetalDeviceConfigurationWizard New Bare Metal Device Configuration Setup Einrichtung der Konfiguration für neues Bare-Metal-Gerät - - - BareMetal::Internal::BareMetalGdbCommandsDeployStep GDB commands GDB-Kommandos - - - BareMetal::Internal::BareMetalRunConfiguration Unknown Unbekannt @@ -31414,11 +31395,7 @@ Senden selbst auch Zeit benötigt. - BareMetal::Internal::BareMetalCustomRunConfiguration - - Unknown - Unbekannt - + BareMetal The remote executable must be set in order to run a custom remote run configuration. Die entfernte ausführbare Datei muss eingestellt sein um eine benutzerdefinierte enternte Ausführungskonfiguration zu verwenden. @@ -31427,9 +31404,6 @@ Senden selbst auch Zeit benötigt. Custom Executable Benutzerdefinierte ausführbare Datei - - - BareMetal::Internal::BareMetalDebugSupport Cannot debug: Kit has no device. Kann nicht debuggen: Das Kit hat kein Gerät. @@ -31458,9 +31432,6 @@ Senden selbst auch Zeit benötigt. Unable to create an uVision project options template. Es kann keine uVision-Projekteinstellungsvorlage erzeugt werden. - - - BareMetal::Internal::GdbServerProviderConfigWidget Choose the desired startup mode of the GDB server provider. Wählen Sie den gewünschten Startmodus des GDB-Server-Providers. @@ -31473,10 +31444,6 @@ Senden selbst auch Zeit benötigt. Peripheral description files (*.svd) Peripherie-Beschreibungsdatei (*.svd) - - Select Peripheral Description File - Wählen Sie eine Peripherie-Beschreibungsdateien - Peripheral description file: Peripherie-Beschreibungsdatei: @@ -31489,9 +31456,6 @@ Senden selbst auch Zeit benötigt. Startup in Pipe Mode Im Pipe-Modus starten - - - BareMetal::Internal::HostWidget Enter TCP/IP hostname of the debug server, like "localhost" or "192.0.2.1". Geben Sie den TCP/IP-Hostnamen des Debug-Servers ein, etwa "localhost" oder "192.0.2.1". @@ -31500,9 +31464,6 @@ Senden selbst auch Zeit benötigt. Enter TCP/IP port which will be listened by the debug server. Geben Sie den TCP/IP-Port ein, an dem der Debug-Server Verbindungen annehmen wird. - - - BareMetal::Internal::OpenOcdGdbServerProviderConfigWidget Host: Host: @@ -31531,17 +31492,6 @@ Senden selbst auch Zeit benötigt. Reset commands: Kommandos zum Zurücksetzen: - - - BareMetal::Internal::StLinkUtilGdbServerProviderConfigWidget - - Host: - Host: - - - Executable file: - Ausführbare Datei: - Specify the verbosity level (0..99). Geben Sie den Detailgrad an (0..99). @@ -31574,14 +31524,6 @@ Senden selbst auch Zeit benötigt. Version: Version: - - Init commands: - Kommandos zum Einrichten: - - - Reset commands: - Kommandos zum Zurücksetzen: - ST-LINK/V1 ST-LINK/V1 @@ -44363,7 +44305,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - BareMetal::Internal::DebugServerProviderChooser + BareMetal Manage... Verwalten... @@ -44372,9 +44314,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e None Keine - - - BareMetal::Internal::DebugServerProviderModel Not recognized Nicht erkannt @@ -44399,9 +44338,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e The following providers were already configured:<br>&nbsp;%1<br>They were not configured again. Die folgenden Provider wurden bereits konfiguriert:<br>&nbsp;%1<br>Sie wurden nicht noch einmal konfiguriert. - - - BareMetal::Internal::DebugServerProvidersSettingsPage Add Hinzufügen @@ -44422,13 +44358,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Clone of %1 Kopie von %1 - - Bare Metal - Bare Metal - - - - BareMetal::Internal::GdbServerProvider EBlink EBlink @@ -44445,25 +44374,10 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e ST-LINK Utility ST-LINK-Werkzeug - - - BareMetal::Internal::EBlinkGdbServerProviderConfigWidget - - Host: - Host: - - - Executable file: - Ausführbare Datei: - Script file: Skriptdatei: - - Verbosity level: - Detailgrad: - Type: Typ: @@ -44472,14 +44386,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Speed: Geschwindigkeit: - - Init commands: - Kommandos zum Einrichten: - - - Reset commands: - Kommandos zum Zurücksetzen: - SWD SWD @@ -44488,13 +44394,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e JTAG JTAG - - - BareMetal::Internal::JLinkGdbServerProviderConfigWidget - - Host: - Host: - JLink GDB Server (JLinkGDBServerCL.exe) JLink GDB-Server (JLinkGDBServerCL.exe) @@ -44503,10 +44402,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e JLink GDB Server (JLinkGDBServer) JLink GDB-Server (JLinkGDBServer) - - Executable file: - Ausführbare Datei: - Default Vorgabe @@ -44527,21 +44422,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Device: Geräte: - - Additional arguments: - Zusätzliche Argumente: - - - Init commands: - Kommandos zum Einrichten: - - - Reset commands: - Kommandos zum Zurücksetzen: - - - - BareMetal::Internal::UvscServerProvider uVision Simulator uVision Simulator @@ -44550,25 +44430,10 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e uVision St-Link uVision St-Link - - - BareMetal::Internal::StLinkUvscAdapterOptionsWidget Port: Port: - - Speed: - Geschwindigkeit: - - - JTAG - JTAG - - - SWD - SWD - 9MHz 9MHz @@ -44641,20 +44506,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e 5kHz 5kHz - - - BareMetal::Internal::UvscServerProviderConfigWidget - - Host: - Host: - - - - BareMetal::Internal::Uv::DeviceSelectionModel - - Name - Name - Version Version @@ -44663,9 +44514,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Vendor Anbieter - - - BareMetal::Internal::Uv::DeviceSelectionMemoryModel ID ID @@ -44678,23 +44526,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Size Größe - - - BareMetal::Internal::Uv::DeviceSelectionAlgorithmModel - - Name - Name - - - - BareMetal::Internal::Uv::DeviceSelectorToolPanel - - Manage... - Verwalten... - - - - BareMetal::Internal::Uv::DeviceSelectorDetailsPanel Vendor: Anbieter: @@ -44711,42 +44542,14 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e Memory: Speicher: - - Peripheral description files (*.svd) - Peripherie-Beschreibungsdatei (*.svd) - Select Peripheral Description File Wählen Sie eine Peripherie-Beschreibungsdatei - - Peripheral description file: - Peripherie-Beschreibungsdatei: - - - - BareMetal::Internal::Uv::DriverSelectionModel Path Pfad - - - BareMetal::Internal::Uv::DriverSelectionCpuDllModel - - Name - Name - - - - BareMetal::Internal::Uv::DriverSelectorToolPanel - - Manage... - Verwalten... - - - - BareMetal::Internal::IarToolChainConfigWidget &Compiler path: &Compiler-Pfad: @@ -44759,20 +44562,10 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e &ABI: &ABI: - - - BareMetal::Internal::IDebugServerProviderConfigWidget Enter the name of the debugger server provider. Geben Sie den Namen des Debug-Server-Providers ein. - - Name: - Name: - - - - SdccToolChain SDCC %1 (%2, %3) SDCC %1 (%2, %3) @@ -44782,17 +44575,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e SDCC - - BareMetal::Internal::SdccToolChainConfigWidget - - &Compiler path: - &Compiler-Pfad: - - - &ABI: - &ABI: - - Beautifier::Internal::ArtisticStyle @@ -48174,23 +47956,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e - BareMetal::Internal::JLinkUvscAdapterOptionsWidget - - Port: - Port: - - - Speed: - Geschwindigkeit: - - - JTAG - JTAG - - - SWD - SWD - + BareMetal 50MHz 50MHz @@ -48235,13 +48001,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e 200kHz 200kHz - - 100kHz - 100kHz - - - - KeilToolChain KEIL %1 (%2, %3) KEIL %1 (%2, %3) @@ -48251,21 +48010,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e KEIL - - BareMetal::Internal::KeilToolChainConfigWidget - - &Compiler path: - &Compiler-Pfad: - - - Platform codegen flags: - Plattformspezifische Optionen für codegen: - - - &ABI: - &ABI: - - Beautifier::Internal diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index b0f6629fdf9..8b00b472e09 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -54923,7 +54923,7 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un - BareMetal::BareMetalDeviceConfigurationWidget + BareMetal Form Formulaire @@ -54940,13 +54940,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un GDB commands: Commandes GDB : - - - BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage - - Form - Formulaire - Name: Nom : @@ -54955,18 +54948,6 @@ Cet assistant vous guidera à travers les étapes essentielles pour déployez un localhost localhost - - GDB port: - Port GDB : - - - GDB host: - Hôte GDB : - - - GDB commands: - Commandes GDB : - load monitor reset @@ -55834,53 +55815,27 @@ réinitialisation du moniteur - BareMetal::Internal::BareMetalDevice + BareMetal Bare Metal Bare Metal - - - BareMetal::BareMetalDeviceConfigurationFactory Bare Metal Device Périphérique Bare Metal - - - BareMetal::BareMetalDeviceConfigurationWizard New Bare Metal Device Configuration Setup Nouveau paramètres de configuration du périphérique Bare Metal - - - BareMetal::BareMetalDeviceConfigurationWizardSetupPage Set up GDB Server or Hardware Debugger Définir un serveur GDB ou un débogueur hardware - - Bare Metal Device - Périphérique Bare Metal - - - - BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget - - GDB commands: - Commandes GDB : - - - - BareMetal::BareMetalGdbCommandsDeployStep GDB commands Commandes GDB - - - BareMetal::BareMetalRunConfiguration %1 (via GDB server or hardware debugger) %1 (via le serveur GDB ou le débogueur hardware) @@ -55890,16 +55845,10 @@ réinitialisation du moniteur Bare Metal run configuration default run name Exécuter sur un serveur GDB ou un débogueur hardware - - - BareMetal::Internal::BareMetalRunConfigurationFactory %1 (on GDB server or hardware debugger) %1 (via le serveur GDB ou le débogueur hardware) - - - BareMetal::BareMetalRunConfigurationWidget Executable: Exécutable : @@ -55920,9 +55869,6 @@ réinitialisation du moniteur Unknown Inconnue - - - BareMetal::Internal::BareMetalRunControlFactory Cannot debug: Kit has no device. Impossible de déboguer : le kit n'a pas de périphérique. diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 6097f03ad6f..deff7f29d7d 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -15273,7 +15273,7 @@ Check the test environment. - BareMetal::Internal::BareMetalCustomRunConfiguration + BareMetal Unknown Nepoznato @@ -15286,9 +15286,6 @@ Check the test environment. The remote executable must be set in order to run a custom remote run configuration. - - - BareMetal::Internal::BareMetalDebugSupport Cannot debug: Kit has no device. @@ -15305,37 +15302,22 @@ Check the test environment. Cannot debug: Could not find executable for "%1". - - - BareMetal::Internal::BareMetalDevice Bare Metal - - - BareMetal::Internal::BareMetalDeviceConfigurationFactory Bare Metal Device - - - BareMetal::Internal::BareMetalDeviceConfigurationWidget GDB server provider: - - - BareMetal::Internal::BareMetalDeviceConfigurationWizard New Bare Metal Device Configuration Setup - - - BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage Set up GDB Server or Hardware Debugger @@ -15344,45 +15326,18 @@ Check the test environment. Name: Naziv: - - GDB server provider: - - - - Bare Metal Device - - - - - BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget GDB commands: - - - BareMetal::Internal::BareMetalGdbCommandsDeployStep GDB commands - - - BareMetal::Internal::BareMetalRunConfiguration - - Unknown - Nepoznato - - - - BareMetal::Internal::DefaultGdbServerProviderFactory Default Standardno - - - BareMetal::Internal::DefaultGdbServerProviderConfigWidget Host: @@ -15395,24 +15350,14 @@ Check the test environment. Reset commands: - - - BareMetal::GdbServerProvider Clone of %1 Klon od %1 - - - BareMetal::Internal::GdbServerProviderConfigWidget Enter the name of the GDB server provider. - - Name: - Naziv: - Choose the desired startup mode of the GDB server provider. @@ -15433,9 +15378,6 @@ Check the test environment. Startup in Pipe Mode - - - BareMetal Enter GDB commands to reset the board and to write the nonvolatile memory. @@ -15444,9 +15386,6 @@ Check the test environment. Enter GDB commands to reset the hardware. The MCU should be halted after these commands. - - - BareMetal::Internal::HostWidget Enter TCP/IP hostname of the GDB server provider, like "localhost" or "192.0.2.1". @@ -15455,9 +15394,6 @@ Check the test environment. Enter TCP/IP port which will be listened by the GDB server provider. - - - BareMetal::Internal::GdbServerProviderChooser Manage... @@ -15466,9 +15402,6 @@ Check the test environment. None Bez - - - BareMetal::Internal::GdbServerProviderModel Name Naziv @@ -15485,9 +15418,6 @@ Check the test environment. The following providers were already configured:<br>&nbsp;%1<br>They were not configured again. - - - BareMetal::Internal::GdbServerProvidersSettingsPage Add Dodaj @@ -15504,24 +15434,10 @@ Check the test environment. GDB Server Providers - - Bare Metal - - - - - BareMetal::Internal::OpenOcdGdbServerProviderFactory OpenOCD - - - BareMetal::Internal::OpenOcdGdbServerProviderConfigWidget - - Host: - - Executable file: @@ -15538,32 +15454,10 @@ Check the test environment. Additional arguments: Dodatni argumenti: - - Init commands: - - - - Reset commands: - - - - - BareMetal::Internal::StLinkUtilGdbServerProviderFactory ST-LINK Utility - - - BareMetal::Internal::StLinkUtilGdbServerProviderConfigWidget - - Host: - - - - Executable file: - - Specify the verbosity level (0..99). @@ -15596,14 +15490,6 @@ Check the test environment. Version: Verzija: - - Init commands: - - - - Reset commands: - - ST-LINK/V1 diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index a91ab237a68..d6b1ea9665f 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -858,7 +858,7 @@ - BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage + BareMetal Set up Debug Server or Hardware Debugger デバッグサーバーまたはハードウェアデバッガをセットアップ @@ -867,10 +867,6 @@ Name: 名前: - - Debug server provider: - デバッグサーバーを選択: - GDB server provider: GDB サーバープロバイダ: @@ -12181,40 +12177,19 @@ in the system's browser for manual download. - BareMetal::Internal::BareMetalDevice + BareMetal Bare Metal ベアメタル - - Bare Metal Device - ベアメタルデバイス - - - - BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget GDB commands: GDB コマンド: - - - BareMetal::Internal::BareMetalRunConfigurationFactory %1 (on GDB server or hardware debugger) %1 (GDB サーバーあるいはハードウェアデバッガ経由) - - - BareMetal::Internal::BareMetalRunControlFactory - - Cannot debug: Local executable is not set. - デバッグエラー: ローカル実行ファイルが設定されていません。 - - - Cannot debug: Could not find executable for "%1". - デバッグエラー: "%1" に実行ファイルが見つかりませんでした。 - Cannot debug: Kit has no device. デバッグエラー: キットにデバイスがありません。 @@ -34900,28 +34875,15 @@ API バージョンが %1 以上の SDK をインストールしてください - BareMetal::Internal::BareMetalDeviceConfigurationFactory - - Bare Metal Device - ベアメタルデバイス - - - - BareMetal::Internal::BareMetalDeviceConfigurationWizard + BareMetal New Bare Metal Device Configuration Setup 新しいベアメタルデバイスの設定 - - - BareMetal::Internal::BareMetalGdbCommandsDeployStep GDB commands GDB コマンド - - - BareMetal::Internal::BareMetalRunConfiguration %1 (via GDB server or hardware debugger) %1 (GDB サーバーあるいはハードウェアデバッガ経由) @@ -34935,9 +34897,6 @@ API バージョンが %1 以上の SDK をインストールしてください Unknown 不明 - - - BareMetal::Internal::BareMetalRunConfigurationWidget Executable: 実行ファイル: @@ -34950,10 +34909,6 @@ API バージョンが %1 以上の SDK をインストールしてください Working directory: 作業ディレクトリ: - - Unknown - 不明 - Core::BaseFileWizardFactory @@ -37774,10 +37729,6 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop BareMetal - - Bare Metal - ベアメタル - Enter GDB commands to reset the board and to write the nonvolatile memory. ボードのリセットと不揮発メモリに書き込むための GDB コマンドを入力してください。 @@ -37786,24 +37737,10 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Enter GDB commands to reset the hardware. The MCU should be halted after these commands. ハードウェアリセットコマンドを入力してください。実行後に MCU が停止するコマンドを入力してください。 - - - BareMetal::Internal::BareMetalCustomRunConfigWidget - - Executable: - 実行ファイル: - Work directory: 作業ディレクトリ: - - - BareMetal::Internal::BareMetalCustomRunConfiguration - - Unknown - 不明 - Custom Executable カスタム実行ファイル @@ -37816,9 +37753,6 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Custom Executable (on GDB server or hardware debugger) カスタム実行ファイル (GDB サーバーあるいはハードウェアデバッガ経由) - - - BareMetal::Internal::BareMetalDebugSupport Debugging failed. デバッグに失敗しました。 @@ -37831,35 +37765,18 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Starting GDB server... GDB サーバー起動中... - - Cannot debug: Kit has no device. - デバッグエラー: キットにデバイスがありません。 - No debug server provider found for %1 デバッグ・サーバー・プロバイダが見つかりませんでした。%1 - - - BareMetal::Internal::BareMetalDeviceConfigurationWidget - - GDB server provider: - GDB サーバープロバイダ: - Debug server provider: サーバー・プロバイダーをデバッグする: - - - BareMetal::Internal::DefaultGdbServerProviderFactory Default 既定 - - - BareMetal::Internal::DefaultGdbServerProviderConfigWidget Host: ホスト: @@ -37872,24 +37789,14 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Reset commands: リセットコマンド: - - - BareMetal::GdbServerProvider Clone of %1 %1 を複製 - - - BareMetal::Internal::GdbServerProviderConfigWidget Enter the name of the GDB server provider. GDB サーバープロバイダの名前を入力してください。 - - Name: - 名前: - Choose the desired startup mode of the GDB server provider. GDB サーバープロバイダーに適切な起動モードを選択してください。 @@ -37922,9 +37829,6 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Startup in Pipe Mode パイプモードで起動 - - - BareMetal::Internal::HostWidget Enter TCP/IP hostname of the GDB server provider, like "localhost" or "192.0.2.1". GDB サーバープロバイダの TCP/IP ホスト名を入力してください。例: "localhost" や "192.0.2.1". @@ -37941,28 +37845,14 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Enter TCP/IP port which will be listened by the debug server. デバッグ サーバーが待ち受けに使用している TCP/IP ポート番号を入力してください。 - - - BareMetal::Internal::GdbServerProviderChooser Manage... 管理... - - None - なし - - - - BareMetal::Internal::GdbServerProviderModel Name 名前 - - Type - タイプ - Duplicate Providers Detected 重複したプロバイダの検出 @@ -37971,9 +37861,6 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop The following providers were already configured:<br>&nbsp;%1<br>They were not configured again. 以下のプロバイダは既に設定済みです。<br>&nbsp;%1<br>重複した設定は行いません。 - - - BareMetal::Internal::GdbServerProvidersSettingsPage GDB Server Providers GDB サーバープロバイダ @@ -37990,20 +37877,10 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Remove 削除 - - - BareMetal::Internal::OpenOcdGdbServerProviderFactory OpenOCD OpenOCD - - - BareMetal::Internal::OpenOcdGdbServerProviderConfigWidget - - Host: - ホスト: - Executable file: 実行ファイル: @@ -38020,32 +37897,10 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Additional arguments: 追加の引数: - - Init commands: - 初期化コマンド: - - - Reset commands: - リセットコマンド: - - - - BareMetal::Internal::StLinkUtilGdbServerProviderFactory ST-LINK Utility ST-LINK ユーティリティ - - - BareMetal::Internal::StLinkUtilGdbServerProviderConfigWidget - - Host: - ホスト: - - - Executable file: - 実行ファイル: - Specify the verbosity level (0..99). 詳細レベル(0..99)を指定してください。 @@ -38078,14 +37933,6 @@ Only desktop kits are supported. Make sure the currently active kit is a desktop Version: バージョン: - - Init commands: - 初期化コマンド: - - - Reset commands: - リセットコマンド: - ST-LINK/V1 ST-LINK/V1 @@ -47073,25 +46920,15 @@ The name of the release build configuration created by default for a qmake proje - BareMetalDeployConfiguration + BareMetal Deploy to BareMetal Device ベアメタルデバイスにデプロイ - - - BareMetal::Internal::DebugServerProviderChooser - - Manage... - 管理... - None しない - - - BareMetal::Internal::DebugServerProviderModel Not recognized 不明 @@ -47116,10 +46953,6 @@ The name of the release build configuration created by default for a qmake proje UVSC 対応プロバイダーエンジン (KEIL uVision と併用)。 - - Name - 名前 - Type 型 @@ -47128,44 +46961,10 @@ The name of the release build configuration created by default for a qmake proje Engine エンジン - - Duplicate Providers Detected - 重複したプロバイダの検出 - - - The following providers were already configured:<br>&nbsp;%1<br>They were not configured again. - 以下のプロバイダは既に設定済みです。<br>&nbsp;%1<br>重複した設定は行いません。 - - - - BareMetal::Internal::DebugServerProvidersSettingsPage - - Add - 追加 - - - Clone - 複製 - - - Remove - 削除 - Debug Server Providers サーバー・プロバイダーをデバッグする - - Clone of %1 - %1 を複製 - - - Bare Metal - ベアメタル - - - - BareMetal::Internal::GdbServerProvider EBlink EBlink @@ -47178,25 +46977,6 @@ The name of the release build configuration created by default for a qmake proje JLink JLink - - OpenOCD - OpenOCD - - - ST-LINK Utility - ST-LINK ユーティリティ - - - - BareMetal::Internal::EBlinkGdbServerProviderConfigWidget - - Host: - ホスト: - - - Executable file: - 実行ファイル: - Script file: スクリプトファイル: @@ -47205,10 +46985,6 @@ The name of the release build configuration created by default for a qmake proje Specify the verbosity level (0 to 7). 詳細レベル (0 ～ 7) を指定してください。 - - Verbosity level: - 詳細レベル: - Connect under reset (hotplug). リセット状態での接続(ホットプラグ)。 @@ -47249,25 +47025,6 @@ The name of the release build configuration created by default for a qmake proje Auto shutdown: 自動シャットダウン: - - Init commands: - 初期化コマンド: - - - Reset commands: - リセットコマンド: - - - SWD - SWD - - - JTAG - JTAG - - - - BareMetalDebugSupport Cannot debug: Local executable is not set. デバッグエラー: ローカル実行ファイルが設定されていません。 @@ -47284,40 +47041,6 @@ The name of the release build configuration created by default for a qmake proje Unable to create a uVision project template. uVision プロジェクトのテンプレートを作成できません。 - - - BareMetal::Internal::GenericGdbServerProviderConfigWidget - - Host: - ホスト: - - - Extended mode: - 拡張モード: - - - Init commands: - 初期化コマンド: - - - Reset commands: - リセットコマンド: - - - - BareMetal::Internal::JLinkGdbServerProviderConfigWidget - - Host: - ホスト: - - - Executable file: - 実行ファイル: - - - Default - 既定 - JTAG JTAG @@ -47330,21 +47053,6 @@ The name of the release build configuration created by default for a qmake proje Device: デバイス: - - Additional arguments: - 追加の引数: - - - Init commands: - 初期化コマンド: - - - Reset commands: - リセットコマンド: - - - - BareMetal::Internal::UvscServerProvider uVision JLink uVision JLink @@ -47357,32 +47065,14 @@ The name of the release build configuration created by default for a qmake proje uVision St-Link uVision St-Link - - - BareMetal::Internal::JLinkUvscServerProviderConfigWidget Adapter options: アダプタオプション: - - - BareMetal::Internal::JLinkUvscAdapterOptionsWidget Port: ポート: - - Speed: - 速度: - - - JTAG - JTAG - - - SWD - SWD - 50MHz 50MHz @@ -47431,9 +47121,6 @@ The name of the release build configuration created by default for a qmake proje 100kHz 100kHz - - - BareMetal::Internal::SimulatorUvscServerProviderConfigWidget Limit speed to real-time. 速度をリアルタイムに制限する。 @@ -47442,32 +47129,6 @@ The name of the release build configuration created by default for a qmake proje Limit speed to real-time: 速度をリアルタイムに制限する: - - - BareMetal::Internal::StLinkUvscServerProviderConfigWidget - - Adapter options: - アダプタオプション: - - - - BareMetal::Internal::StLinkUvscAdapterOptionsWidget - - Port: - ポート: - - - Speed: - 速度: - - - JTAG - JTAG - - - SWD - SWD - 9MHz 9MHz @@ -47520,10 +47181,6 @@ The name of the release build configuration created by default for a qmake proje 125kHz 125kHz - - 100kHz - 100kHz - 50kHz 50kHz @@ -47540,13 +47197,6 @@ The name of the release build configuration created by default for a qmake proje 5kHz 5kHz - - - BareMetal::Internal::UvscServerProviderConfigWidget - - Host: - ホスト: - Choose Keil Toolset Configuration File Keil Toolset の設定ファイルを選択する @@ -47580,11 +47230,7 @@ The name of the release build configuration created by default for a qmake proje - BareMetal::Internal::Uv::DeviceSelectionModel - - Name - 名前 - + BareMetal Version バージョン @@ -47593,9 +47239,6 @@ The name of the release build configuration created by default for a qmake proje Vendor ベンダー - - - BareMetal::Internal::Uv::DeviceSelectionMemoryModel ID ID @@ -47608,13 +47251,6 @@ The name of the release build configuration created by default for a qmake proje Size サイズ - - - BareMetal::Internal::Uv::DeviceSelectionAlgorithmModel - - Name - 名前 - FLASH Start FLASH スタート @@ -47631,9 +47267,6 @@ The name of the release build configuration created by default for a qmake proje RAM Size RAM サイズ - - - BareMetal::Internal::Uv::DeviceSelectionAlgorithmView Algorithm path. アルゴリズムのパス。 @@ -47654,16 +47287,6 @@ The name of the release build configuration created by default for a qmake proje RAM: RAM: - - - BareMetal::Internal::Uv::DeviceSelectorToolPanel - - Manage... - 管理... - - - - BareMetal::Internal::Uv::DeviceSelectorDetailsPanel Vendor: ベンダー: @@ -47684,63 +47307,22 @@ The name of the release build configuration created by default for a qmake proje Flash algorithm: FLASH アルゴリズム: - - Peripheral description files (*.svd) - ペリフェラル説明ファイル (*.svd) - - - Select Peripheral Description File - ペリフェラル説明ファイルを選択する - - - Peripheral description file: - ペリフェラル説明ファイル: - - - - BareMetal::Internal::Uv::DeviceSelector Target device not selected. ターゲットデバイスが選択されていません。 - - - BareMetal::Internal::Uv::DeviceSelectionDialog Available Target Devices 使用可能なターゲットデバイス - - - BareMetal::Internal::Uv::DriverSelectionModel Path パス - - - BareMetal::Internal::Uv::DriverSelectionCpuDllModel - - Name - 名前 - - - - BareMetal::Internal::Uv::DriverSelectionCpuDllView Debugger CPU library (depends on a CPU core). デバッガ CPU ライブラリ(CPU コアに依存)。 - - - BareMetal::Internal::Uv::DriverSelectorToolPanel - - Manage... - 管理... - - - - BareMetal::Internal::Uv::DriverSelectorDetailsPanel Debugger driver library. デバッガドライバライブラリ。 @@ -47753,23 +47335,14 @@ The name of the release build configuration created by default for a qmake proje CPU library: CPU ライブラリ: - - - BareMetal::Internal::Uv::DriverSelector Target driver not selected. ターゲットドライバーが選択されていません。 - - - BareMetal::Internal::Uv::DriverSelectionDialog Available Target Drivers 使用可能なターゲットドライバー - - - IarToolChain IAREW %1 (%2, %3) IAREW %1 (%2, %3) @@ -47778,9 +47351,6 @@ The name of the release build configuration created by default for a qmake proje IAREW IAREW - - - BareMetal::Internal::IarToolChainConfigWidget &Compiler path: コンパイラのパス(&C): @@ -47793,20 +47363,10 @@ The name of the release build configuration created by default for a qmake proje &ABI: &ABI: - - - BareMetal::Internal::IDebugServerProviderConfigWidget Enter the name of the debugger server provider. デバッガ サーバー プロバイダの名前を入力してください。 - - Name: - 名前: - - - - KeilToolChain KEIL %1 (%2, %3) KEIL %1 (%2, %3) @@ -47815,24 +47375,6 @@ The name of the release build configuration created by default for a qmake proje KEIL KEIL - - - BareMetal::Internal::KeilToolChainConfigWidget - - &Compiler path: - コンパイラのパス(&C): - - - Platform codegen flags: - プラットフォーム用コード生成オプション: - - - &ABI: - &ABI: - - - - SdccToolChain SDCC %1 (%2, %3) SDCC %1 (%2, %3) @@ -47842,17 +47384,6 @@ The name of the release build configuration created by default for a qmake proje SDCC - - BareMetal::Internal::SdccToolChainConfigWidget - - &Compiler path: - コンパイラのパス(&C): - - - &ABI: - &ABI: - - Bazaar diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 5cd55977b44..ba482c9d0ff 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -26284,7 +26284,7 @@ Zdalny: %4 - BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage + BareMetal Set up GDB Server or Hardware Debugger Ustaw serwer GDB lub debugger sprzętowy @@ -27062,21 +27062,15 @@ Czy odinstalować istniejący pakiet? - BareMetal::Internal::BareMetalDevice + BareMetal Bare Metal Bare Metal - - - BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget GDB commands: Komendy GDB: - - - BareMetal::Internal::BareMetalRunConfigurationFactory %1 (on GDB server or hardware debugger) %1 (na serwerze GDB lub debuggerze sprzętowym) @@ -29876,37 +29870,14 @@ Zainstaluj SDK o wersji %1 lub wyższej. Enter GDB commands to reset the hardware. The MCU should be halted after these commands. Wprowadź komendy GDB resetujące sprzęt. MCU powinien zostać zatrzymany po tych komendach. - - - BareMetal::Internal::BareMetalDeviceConfigurationFactory - - Bare Metal Device - Urządzenie Bare Metal - - - - BareMetal::Internal::BareMetalDeviceConfigurationWidget - - GDB server provider: - Dostawca serwera GDB: - - - - BareMetal::Internal::BareMetalDeviceConfigurationWizard New Bare Metal Device Configuration Setup Nowa konfiguracja urządzenia Bare Metal - - - BareMetal::Internal::BareMetalGdbCommandsDeployStep GDB commands Komendy GDB - - - BareMetal::Internal::BareMetalRunConfiguration %1 (via GDB server or hardware debugger) %1 (poprzez serwer GDB lub debugger sprzętowy) @@ -29916,9 +29887,6 @@ Zainstaluj SDK o wersji %1 lub wyższej. Bare Metal run configuration default run name Uruchom na serwerze GDB lub debuggerze sprzętowym - - - BareMetal::Internal::BareMetalRunConfigurationWidget Executable: Plik wykonywalny: @@ -33396,18 +33364,11 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan - BareMetal::Internal::BareMetalCustomRunConfigWidget - - Executable: - Plik wykonywalny: - + BareMetal Work directory: Katalog roboczy: - - - BareMetal::Internal::BareMetalCustomRunConfiguration The remote executable must be set in order to run a custom remote run configuration. W celu uruchomienia własnej, zdalnej konfiguracji uruchamiania, należy ustawić zdalny plik wykonywalny. @@ -33416,9 +33377,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Custom Executable (on GDB server or hardware debugger) Własny plik wykonywalny (na serwerze GDB lub debuggerze sprzętowym) - - - BareMetal::Internal::BareMetalDebugSupport Cannot debug: Kit has no device. Nie można debugować: brak urządzenia w zestawie narzędzi. @@ -33431,16 +33389,10 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Cannot debug: Could not find executable for "%1". Nie można debugować: nie można odnaleźć pliku wykonywalnego dla "%1". - - - BareMetal::Internal::DefaultGdbServerProviderFactory Default Domyślny - - - BareMetal::Internal::DefaultGdbServerProviderConfigWidget Host: Host: @@ -33453,24 +33405,14 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Reset commands: Komendy resetujące: - - - BareMetal::GdbServerProvider Clone of %1 Klon %1 - - - BareMetal::Internal::GdbServerProviderConfigWidget Enter the name of the GDB server provider. Podaj nazwę dostawcy serwera GDB. - - Name: - Nazwa: - Choose the desired startup mode of the GDB server provider. Wybierz tryb startowy dostarczyciela serwera GDB. @@ -33491,9 +33433,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Startup in Pipe Mode Start w trybie potokowym - - - BareMetal::Internal::HostWidget Enter TCP/IP hostname of the GDB server provider, like "localhost" or "192.0.2.1". Podaj nazwę TCP/IP hosta dostawcy serwera GDB, np. "localhost" lub "192.0.2.1". @@ -33502,9 +33441,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Enter TCP/IP port which will be listened by the GDB server provider. Podaj port TCP/IP, na którym będzie nasłuchiwał dostawca serwera GDB. - - - BareMetal::Internal::GdbServerProviderChooser Manage... Zarządzaj... @@ -33513,9 +33449,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan None Brak - - - BareMetal::Internal::GdbServerProviderModel Name Nazwa @@ -33532,9 +33465,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan The following providers were already configured:<br>&nbsp;%1<br>They were not configured again. Następujący dostawcy zostali już skonfigurowani:<br>&nbsp;%1<br>Nie zostali oni ponownie skonfigurowani. - - - BareMetal::Internal::GdbServerProvidersSettingsPage Add Dodaj @@ -33551,24 +33481,10 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan GDB Server Providers Dostawcy serwera GDB - - Bare Metal - Bare Metal - - - - BareMetal::Internal::OpenOcdGdbServerProviderFactory OpenOCD OpenOCD - - - BareMetal::Internal::OpenOcdGdbServerProviderConfigWidget - - Host: - Host: - Executable file: Plik wykonywalny: @@ -33585,32 +33501,10 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Additional arguments: Dodatkowe argumenty: - - Init commands: - Komendy inicjalizujące: - - - Reset commands: - Komendy resetujące: - - - - BareMetal::Internal::StLinkUtilGdbServerProviderFactory ST-LINK Utility Narzędzie ST-LINK - - - BareMetal::Internal::StLinkUtilGdbServerProviderConfigWidget - - Host: - Host: - - - Executable file: - Plik wykonywalny: - Specify the verbosity level (0..99). Poziom gadatliwości (0..99). @@ -33643,14 +33537,6 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan Version: Wersja: - - Init commands: - Komendy inicjalizujące: - - - Reset commands: - Komendy resetujące: - ST-LINK/V1 ST-LINK/V1 diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 42b2c4089a3..b3ccca5111a 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -3402,9 +3402,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Enter GDB commands to reset the hardware. The MCU should be halted after these commands. Введите команды GDB для аппаратного сброса. После этих команд процессор должен быть остановлен. - - - BareMetal::Internal::BareMetalCustomRunConfiguration Unknown Неизвестно @@ -3417,9 +3414,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Custom Executable Особая программа - - - BareMetal::Internal::BareMetalDebugSupport Cannot debug: Kit has no device. Отладка невозможна: отсутствует устройство в комплекте. @@ -3448,70 +3442,30 @@ Warning: this is an experimental feature and might lead to failing to execute th Unable to create an uVision project options template. Не удалось создать шаблон проекта настроек uVision. - - - BareMetal::Internal::BareMetalDevice - - Bare Metal - Голое железо - Bare Metal Device Устройство на голом железе - - - BareMetal::Internal::BareMetalDeviceConfigurationWidget Debug server provider: Тип сервера отладки: - - - BareMetal::Internal::BareMetalDeviceConfigurationWizard New Bare Metal Device Configuration Setup Настройка новой конфигурации голого устройства - - - BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage Set up Debug Server or Hardware Debugger Настройка сервера отладки или аппаратного отладчика - - Name: - Название: - - - Debug server provider: - Тип сервера отладки: - - - - BareMetal::Internal::BareMetalGdbCommandsDeployStep GDB commands Команды GDB - - - BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget GDB commands: Команды GDB: - - - BareMetal::Internal::BareMetalRunConfiguration - - Unknown - Неизвестно - - - - BareMetal::Internal::DebugServerProviderChooser Manage... Управление... @@ -3520,9 +3474,6 @@ Warning: this is an experimental feature and might lead to failing to execute th None Нет - - - BareMetal::Internal::DebugServerProviderModel Not recognized Не определён @@ -3547,10 +3498,6 @@ Warning: this is an experimental feature and might lead to failing to execute th UVSC-совместимый провайдер отладчика (используется совместно с KEIL uVision). - - Name - Имя - Type Тип @@ -3567,9 +3514,6 @@ Warning: this is an experimental feature and might lead to failing to execute th The following providers were already configured:<br>&nbsp;%1<br>They were not configured again. Следующие провайдеры уже настроены:<br>&nbsp;%1<br>Повторно настраиваться не будут. - - - BareMetal::Internal::DebugServerProvidersSettingsPage Add Добавить @@ -3594,9 +3538,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Bare Metal Bare Metal - - - BareMetal::Internal::EBlinkGdbServerProviderConfigWidget Host: Хост: @@ -3673,9 +3614,6 @@ Warning: this is an experimental feature and might lead to failing to execute th JTAG JTAG - - - BareMetal::Internal::GdbServerProvider EBlink EBlink @@ -3692,9 +3630,6 @@ Warning: this is an experimental feature and might lead to failing to execute th ST-LINK Utility Утилита ST-LINK - - - BareMetal::Internal::GdbServerProviderConfigWidget Choose the desired startup mode of the GDB server provider. Выберите желаемый метод запуска сервера GDB. @@ -3723,9 +3658,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Startup in Pipe Mode Запуск в локальном режиме (pipe) - - - BareMetal::Internal::HostWidget Enter TCP/IP hostname of the debug server, like "localhost" or "192.0.2.1". Введите TCP/IP имя сервера отладки, например: «localhost» или «192.0.2.1». @@ -3734,9 +3666,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Enter TCP/IP port which will be listened by the debug server. Введите порт TCP/IP, который будет прослушиваться сервером отладки. - - - BareMetal::Internal::IDebugServerProviderConfigWidget Enter the name of the debugger server provider. Введите имя провайдера сервера отладки. @@ -3745,9 +3674,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Name: Имя: - - - BareMetal::Internal::IarToolChainConfigWidget &Compiler path: Путь к &компилятору: @@ -3760,13 +3686,6 @@ Warning: this is an experimental feature and might lead to failing to execute th &ABI: &ABI: - - - BareMetal::Internal::JLinkGdbServerProviderConfigWidget - - Host: - Хост: - JLink GDB Server (JLinkGDBServerCL.exe) JLink сервер GDB (JLinkGDBServerCL.exe) @@ -3775,10 +3694,6 @@ Warning: this is an experimental feature and might lead to failing to execute th JLink GDB Server (JLinkGDBServer) JLink сервер GDB (JLinkGDBServer) - - Executable file: - Исполняемый файл: - Default По умолчанию @@ -3811,33 +3726,10 @@ Warning: this is an experimental feature and might lead to failing to execute th Additional arguments: Дополнительные параметры: - - Init commands: - Команды инициализации: - - - Reset commands: - Команды сброса: - - - - BareMetal::Internal::JLinkUvscAdapterOptionsWidget Port: Порт: - - Speed: - Скорость: - - - JTAG - JTAG - - - SWD - SWD - 50MHz 50 МГц @@ -3886,39 +3778,10 @@ Warning: this is an experimental feature and might lead to failing to execute th 100kHz 100 кГц - - - BareMetal::Internal::JLinkUvscServerProviderConfigWidget Adapter options: Параметры адаптера: - - - BareMetal::Internal::KeilToolChainConfigWidget - - &Compiler path: - Путь к &компилятору: - - - Platform codegen flags: - Флаги генерации кода для платформы: - - - &ABI: - &ABI: - - - - BareMetal::Internal::OpenOcdGdbServerProviderConfigWidget - - Host: - Хост: - - - Executable file: - Исполняемый файл: - Root scripts directory: Корень каталога скриптов: @@ -3927,32 +3790,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Configuration file: Файл конфигурации: - - Additional arguments: - Дополнительные параметры: - - - Init commands: - Команды инициализации: - - - Reset commands: - Команды сброса: - - - - BareMetal::Internal::SdccToolChainConfigWidget - - &Compiler path: - Путь к &компилятору: - - - &ABI: - &ABI: - - - - BareMetal::Internal::SimulatorUvscServerProviderConfigWidget Limit speed to real-time. Ограничить скорость реальным временем. @@ -3961,25 +3798,10 @@ Warning: this is an experimental feature and might lead to failing to execute th Limit speed to real-time: Ограничить скорость: - - - BareMetal::Internal::StLinkUtilGdbServerProviderConfigWidget - - Host: - Хост: - - - Executable file: - Исполняемый файл: - Specify the verbosity level (0..99). Укажите уровень информативности (0...99). - - Verbosity level: - Уровень информативности: - Continue listening for connections after disconnect. Продолжать ожидание подключений после отключения. @@ -4004,14 +3826,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Version: Версия: - - Init commands: - Команды инициализации: - - - Reset commands: - Команды сброса: - ST-LINK/V1 ST-LINK/V1 @@ -4020,25 +3834,6 @@ Warning: this is an experimental feature and might lead to failing to execute th ST-LINK/V2 ST-LINK/V2 - - - BareMetal::Internal::StLinkUvscAdapterOptionsWidget - - Port: - Порт: - - - Speed: - Скорость: - - - JTAG - JTAG - - - SWD - SWD - 9MHz 9 МГц @@ -4091,10 +3886,6 @@ Warning: this is an experimental feature and might lead to failing to execute th 125kHz 125 кГц - - 100kHz - 100 кГц - 50kHz 50 кГц @@ -4111,16 +3902,6 @@ Warning: this is an experimental feature and might lead to failing to execute th 5kHz 5 кГц - - - BareMetal::Internal::StLinkUvscServerProviderConfigWidget - - Adapter options: - Параметры адаптера: - - - - BareMetal::Internal::Uv::DeviceSelectionAlgorithmModel Name Название @@ -4141,9 +3922,6 @@ Warning: this is an experimental feature and might lead to failing to execute th RAM Size RAM Объём - - - BareMetal::Internal::Uv::DeviceSelectionAlgorithmView Algorithm path. Путь к алгоритму. @@ -4164,16 +3942,10 @@ Warning: this is an experimental feature and might lead to failing to execute th RAM: RAM: - - - BareMetal::Internal::Uv::DeviceSelectionDialog Available Target Devices Доступные устройства - - - BareMetal::Internal::Uv::DeviceSelectionMemoryModel ID ID @@ -4186,13 +3958,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Size Размер - - - BareMetal::Internal::Uv::DeviceSelectionModel - - Name - Название - Version Версия @@ -4201,16 +3966,10 @@ Warning: this is an experimental feature and might lead to failing to execute th Vendor Поставщик - - - BareMetal::Internal::Uv::DeviceSelector Target device not selected. Устройство не выбрано. - - - BareMetal::Internal::Uv::DeviceSelectorDetailsPanel Vendor: Поставщик: @@ -4231,63 +3990,22 @@ Warning: this is an experimental feature and might lead to failing to execute th Flash algorithm: Алгоритм прошивания: - - Peripheral description files (*.svd) - Файлы описания устройств (*.svd) - - - Select Peripheral Description File - Выбор файла описания внешнего устройства - - - Peripheral description file: - Файл описания устройства: - - - - BareMetal::Internal::Uv::DeviceSelectorToolPanel - - Manage... - Управление... - - - - BareMetal::Internal::Uv::DriverSelectionCpuDllModel - - Name - Название - - - - BareMetal::Internal::Uv::DriverSelectionCpuDllView Debugger CPU library (depends on a CPU core). Библиотека поддержки процессора для отладчика (зависит от ядра процессора). - - - BareMetal::Internal::Uv::DriverSelectionDialog Available Target Drivers Доступные драйвера - - - BareMetal::Internal::Uv::DriverSelectionModel Path Путь - - - BareMetal::Internal::Uv::DriverSelector Target driver not selected. Драйвер не выбран. - - - BareMetal::Internal::Uv::DriverSelectorDetailsPanel Debugger driver library. Библиотека драйвера отладчика. @@ -4300,16 +4018,6 @@ Warning: this is an experimental feature and might lead to failing to execute th CPU library: Библиотека процессора: - - - BareMetal::Internal::Uv::DriverSelectorToolPanel - - Manage... - Управление... - - - - BareMetal::Internal::UvscServerProvider uVision Simulator Симулятор uVision @@ -4322,13 +4030,6 @@ Warning: this is an experimental feature and might lead to failing to execute th uVision JLink uVision JLink - - - BareMetal::Internal::UvscServerProviderConfigWidget - - Host: - Хост: - Choose Keil Toolset Configuration File Выбор файла конфигурации инструментария Keil @@ -4345,9 +4046,6 @@ Warning: this is an experimental feature and might lead to failing to execute th Target driver: Драйвер: - - - BareMetalDeployConfiguration Deploy to BareMetal Device Развёртывание на устройство на голом железе @@ -23728,7 +23426,7 @@ Add, modify, and remove document filters, which determine the documentation set - IarToolChain + BareMetal IAREW %1 (%2, %3) IAREW %1 (%2, %3) @@ -25092,7 +24790,7 @@ Error: %5 - KeilToolChain + BareMetal KEIL %1 (%2, %3) KEIL %1 (%2, %3) @@ -44893,7 +44591,7 @@ Row: %4, Column: %5 - SdccToolChain + BareMetal SDCC %1 (%2, %3) SDCC %1 (%2, %3) diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 8ab54dce9bf..a454b5e8d4d 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -36314,7 +36314,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d - BareMetal::BareMetalDeviceConfigurationWidget + BareMetal Form Форма @@ -36323,25 +36323,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d GDB host: Вузол GDB: - - GDB port: - Порт GDB: - - - GDB commands: - Команди GDB: - - - - BareMetal::Internal::BareMetalDeviceConfigurationWizardSetupPage - - Form - Форма - - - Set up GDB Server or Hardware Debugger - Налаштування сервера GDB або апаратного зневаджувача - Name: Назва: @@ -36350,34 +36331,10 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d GDB server provider: Постачальник сервера GDB: - - Init commands: - Команди ініціалізації: - - - Reset commands: - Команди скидання: - - - Bare Metal Device - Голий пристрій - localhost localhost - - GDB port: - Порт GDB: - - - GDB host: - Вузол GDB: - - - GDB commands: - Команди GDB: - load monitor reset @@ -37410,95 +37367,27 @@ Do you want to uninstall the existing package next time? - BareMetal::Internal::BareMetalDevice + BareMetal Bare Metal Голе залізо - - - BareMetal::BareMetalDeviceConfigurationFactory Bare Metal Device Голий пристрій - - - BareMetal::BareMetalDeviceConfigurationWizard - - New Bare Metal Device Configuration Setup - Налаштування нової конфігурації голого пристрою - - - - BareMetal::BareMetalDeviceConfigurationWizardSetupPage Set up GDB Server or Hardware Debugger Налаштування сервера GDB або апаратного зневаджувача - - Bare Metal Device - Голий пристрій - - - - BareMetal::Internal::BareMetalGdbCommandsDeployStepWidget GDB commands: Команди GDB: - - - BareMetal::BareMetalGdbCommandsDeployStep - - GDB commands - Команди GDB - - - - BareMetal::BareMetalRunConfiguration - - %1 (via GDB server or hardware debugger) - %1 (через сервер GDB або апаратний зневаджувач) - - - Run on GDB server or hardware debugger - Bare Metal run configuration default run name - Виконати на сервері GDB або апаратному зневаджувачі - - - - BareMetal::Internal::BareMetalRunConfigurationFactory %1 (on GDB server or hardware debugger) %1 (через сервер GDB або апаратний зневаджувач) - - - BareMetal::BareMetalRunConfigurationWidget - - Executable: - Виконуваний модуль: - - - Arguments: - Аргументи: - - - <default> - <типово> - - - Working directory: - Робоча тека: - - - Unknown - Невідомо - - - - BareMetal::Internal::BareMetalRunControlFactory Cannot debug: Local executable is not set. Неможливо зневадити: локальний виконуваний модуль не задано. @@ -41067,57 +40956,14 @@ Install an SDK of at least API version %1. Enter GDB commands to reset the hardware. The MCU should be halted after these commands. Введіть команди GDB для апаратного скидання. Мікроконтролер має бути зупинено після цих команд. - - Bare Metal - Голе залізо - - - - BareMetal::Internal::BareMetalDeviceConfigurationFactory - - Bare Metal Device - Голий пристрій - - - - BareMetal::Internal::BareMetalDeviceConfigurationWidget - - GDB host: - Вузол GDB: - - - GDB port: - Порт GDB: - - - Init commands: - Команди ініціалізації: - - - Reset commands: - Команди скидання: - - - GDB server provider: - Постачальник сервера GDB: - - - - BareMetal::Internal::BareMetalDeviceConfigurationWizard New Bare Metal Device Configuration Setup Налаштування нової конфігурації голого пристрою - - - BareMetal::Internal::BareMetalGdbCommandsDeployStep GDB commands Команди GDB - - - BareMetal::Internal::BareMetalRunConfiguration %1 (via GDB server or hardware debugger) %1 (через сервер GDB або апаратний зневаджувач) @@ -41127,17 +40973,10 @@ Install an SDK of at least API version %1. Bare Metal run configuration default run name Виконати на сервері GDB або апаратному зневаджувачі - - - BareMetal::Internal::BareMetalRunConfigurationWidget Executable: Виконуваний модуль: - - Arguments: - Аргументи: - <default> <типово> @@ -45881,22 +45720,11 @@ Affected are breakpoints %1 - BareMetal::Internal::BareMetalCustomRunConfigWidget - - Executable: - Виконуваний модуль: - - - Arguments: - Аргументи: - + BareMetal Work directory: Робоча тека: - - - BareMetal::Internal::BareMetalCustomRunConfiguration The remote executable must be set in order to run a custom remote run configuration. Має бути заданий віддалений виконуваний модуль, щоб виконати користувацьку віддалену конфігурацію запуску. @@ -45905,9 +45733,6 @@ Affected are breakpoints %1 Custom Executable (on GDB server or hardware debugger) Виконуваний модуль (через сервер GDB або апаратний зневаджувач) - - - BareMetal::Internal::BareMetalDebugSupport Debugging failed. Збій зневадження. @@ -45920,16 +45745,10 @@ Affected are breakpoints %1 Starting GDB server... Запуск сервера GDB... - - - BareMetal::Internal::DefaultGdbServerProviderFactory Default Типовий - - - BareMetal::Internal::DefaultGdbServerProviderConfigWidget Host: Вузол: @@ -45942,24 +45761,14 @@ Affected are breakpoints %1 Reset commands: Команди скидання: - - - BareMetal::GdbServerProvider Clone of %1 Клон %1 - - - BareMetal::Internal::GdbServerProviderConfigWidget Enter the name of the GDB server provider. Введіть назву постачальника сервера GDB. - - Name: - Назва: - Choose the desired startup mode of the GDB server provider. Оберіть бажаний режим запуску постачальника сервера GDB. @@ -45980,9 +45789,6 @@ Affected are breakpoints %1 Startup in Pipe Mode Запуск в режимі конвеєра - - - BareMetal::Internal::HostWidget Enter TCP/IP hostname of the GDB server provider, like "localhost" or "192.0.2.1". Введіть назву вузла постачальника сервера GDB (напр., "localhost" або "192.0.2.1"). @@ -45991,9 +45797,6 @@ Affected are breakpoints %1 Enter TCP/IP port which will be listened by the GDB server provider. Введіть порт, на якому буде слухати постачальник сервера GDB. - - - BareMetal::Internal::GdbServerProviderChooser Manage... Управління... @@ -46002,9 +45805,6 @@ Affected are breakpoints %1 None Немає - - - BareMetal::Internal::GdbServerProviderModel Name Назва @@ -46025,9 +45825,6 @@ Affected are breakpoints %1 The following providers were already configured:<br>&nbsp;%1<br>They were not configured again. Наступні постачальники вже сконфігуровано:<br>&nbsp;%1<br>Їх не буде сконфігуровано знову. - - - BareMetal::Internal::GdbServerProvidersSettingsPage GDB Server Providers Постачальники сервера GDB @@ -46044,20 +45841,10 @@ Affected are breakpoints %1 Remove Видалити - - - BareMetal::Internal::OpenOcdGdbServerProviderFactory OpenOCD OpenOCD - - - BareMetal::Internal::OpenOcdGdbServerProviderConfigWidget - - Host: - Вузол: - Executable file: Виконуваний файл: @@ -46074,32 +45861,10 @@ Affected are breakpoints %1 Additional arguments: Додаткові аргументи: - - Init commands: - Команди ініціалізації: - - - Reset commands: - Команди скидання: - - - - BareMetal::Internal::StLinkUtilGdbServerProviderFactory ST-LINK Utility Утиліта ST-LINK - - - BareMetal::Internal::StLinkUtilGdbServerProviderConfigWidget - - Host: - Вузол: - - - Executable file: - Виконуваний файл: - Specify the verbosity level (0..99). Вкажіть рівень деталізації (0..99). @@ -46132,14 +45897,6 @@ Affected are breakpoints %1 Version: Версія: - - Init commands: - Команди ініціалізації: - - - Reset commands: - Команди скидання: - ST-LINK/V1 ST-LINK/V1 diff --git a/src/plugins/baremetal/baremetaldebugsupport.cpp b/src/plugins/baremetal/baremetaldebugsupport.cpp index 7149c42bb85..1f29fab0a4f 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.cpp +++ b/src/plugins/baremetal/baremetaldebugsupport.cpp @@ -2,7 +2,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "baremetaldebugsupport.h" + #include "baremetaldevice.h" +#include "baremetaltr.h" #include "debugserverprovidermanager.h" #include "idebugserverprovider.h" @@ -27,24 +29,21 @@ using namespace Debugger; using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { - -// BareMetalDebugSupport +namespace BareMetal::Internal { BareMetalDebugSupport::BareMetalDebugSupport(RunControl *runControl) : Debugger::DebuggerRunTool(runControl) { const auto dev = qSharedPointerCast(device()); if (!dev) { - reportFailure(tr("Cannot debug: Kit has no device.")); + reportFailure(Tr::tr("Cannot debug: Kit has no device.")); return; } const QString providerId = dev->debugServerProviderId(); IDebugServerProvider *p = DebugServerProviderManager::findProvider(providerId); if (!p) { - reportFailure(tr("No debug server provider found for %1").arg(providerId)); + reportFailure(Tr::tr("No debug server provider found for %1").arg(providerId)); return; } @@ -67,5 +66,4 @@ void BareMetalDebugSupport::start() DebuggerRunTool::start(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetaldebugsupport.h b/src/plugins/baremetal/baremetaldebugsupport.h index 161ea346bec..655b6666f45 100644 --- a/src/plugins/baremetal/baremetaldebugsupport.h +++ b/src/plugins/baremetal/baremetaldebugsupport.h @@ -5,21 +5,10 @@ #include -namespace ProjectExplorer { -class RunControl; -} - -namespace BareMetal { -namespace Internal { - -class IDebugServerProvider; - -// BareMetalDebugSupport +namespace BareMetal::Internal { class BareMetalDebugSupport final : public Debugger::DebuggerRunTool { - Q_OBJECT - public: explicit BareMetalDebugSupport(ProjectExplorer::RunControl *runControl); @@ -27,5 +16,4 @@ private: void start() final; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetaldevice.cpp b/src/plugins/baremetal/baremetaldevice.cpp index 236a941e242..7b79b990fdf 100644 --- a/src/plugins/baremetal/baremetaldevice.cpp +++ b/src/plugins/baremetal/baremetaldevice.cpp @@ -2,10 +2,12 @@ // Copyright (C) 2016 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "baremetalconstants.h" #include "baremetaldevice.h" + +#include "baremetalconstants.h" #include "baremetaldeviceconfigurationwidget.h" #include "baremetaldeviceconfigurationwizard.h" +#include "baremetaltr.h" #include "debugserverprovidermanager.h" #include "idebugserverprovider.h" @@ -13,8 +15,7 @@ using namespace ProjectExplorer; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { const char debugServerProviderIdKeyC[] = "IDebugServerProviderId"; @@ -22,7 +23,7 @@ const char debugServerProviderIdKeyC[] = "IDebugServerProviderId"; BareMetalDevice::BareMetalDevice() { - setDisplayType(tr("Bare Metal")); + setDisplayType(Tr::tr("Bare Metal")); setDefaultDisplayName(defaultDisplayName()); setOsType(Utils::OsTypeOther); } @@ -36,7 +37,7 @@ BareMetalDevice::~BareMetalDevice() QString BareMetalDevice::defaultDisplayName() { - return tr("Bare Metal Device"); + return Tr::tr("Bare Metal Device"); } QString BareMetalDevice::debugServerProviderId() const @@ -100,7 +101,7 @@ IDeviceWidget *BareMetalDevice::createWidget() BareMetalDeviceFactory::BareMetalDeviceFactory() : IDeviceFactory(Constants::BareMetalOsType) { - setDisplayName(BareMetalDevice::tr("Bare Metal Device")); + setDisplayName(Tr::tr("Bare Metal Device")); setCombinedIcon(":/baremetal/images/baremetaldevicesmall.png", ":/baremetal/images/baremetaldevice.png"); setConstructionFunction(&BareMetalDevice::create); @@ -112,5 +113,4 @@ BareMetalDeviceFactory::BareMetalDeviceFactory() }); } -} //namespace Internal -} //namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetaldevice.h b/src/plugins/baremetal/baremetaldevice.h index 337bab662a7..6fcc1972b39 100644 --- a/src/plugins/baremetal/baremetaldevice.h +++ b/src/plugins/baremetal/baremetaldevice.h @@ -7,8 +7,7 @@ #include #include -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class IDebugServerProvider; @@ -16,8 +15,6 @@ class IDebugServerProvider; class BareMetalDevice final : public ProjectExplorer::IDevice { - Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalDevice) - public: using Ptr = QSharedPointer; using ConstPtr = QSharedPointer; @@ -52,5 +49,4 @@ public: BareMetalDeviceFactory(); }; -} //namespace Internal -} //namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp index 0153388a2f9..390893b8ee9 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp @@ -3,8 +3,9 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "baremetaldevice.h" -#include "baremetaldeviceconfigurationwidget.h" +#include "baremetaldeviceconfigurationwidget.h" +#include "baremetaltr.h" #include "debugserverproviderchooser.h" #include @@ -12,10 +13,7 @@ #include -namespace BareMetal { -namespace Internal { - -// BareMetalDeviceConfigurationWidget +namespace BareMetal::Internal { BareMetalDeviceConfigurationWidget::BareMetalDeviceConfigurationWidget( const ProjectExplorer::IDevice::Ptr &deviceConfig) @@ -30,7 +28,7 @@ BareMetalDeviceConfigurationWidget::BareMetalDeviceConfigurationWidget( m_debugServerProviderChooser = new DebugServerProviderChooser(true, this); m_debugServerProviderChooser->populate(); m_debugServerProviderChooser->setCurrentProviderId(dev->debugServerProviderId()); - formLayout->addRow(tr("Debug server provider:"), m_debugServerProviderChooser); + formLayout->addRow(Tr::tr("Debug server provider:"), m_debugServerProviderChooser); connect(m_debugServerProviderChooser, &DebugServerProviderChooser::providerChanged, this, &BareMetalDeviceConfigurationWidget::debugServerProviderChanged); @@ -48,5 +46,4 @@ void BareMetalDeviceConfigurationWidget::updateDeviceFromUi() debugServerProviderChanged(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h index 23be5e98d47..81ac8d410f4 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwidget.h @@ -6,18 +6,13 @@ #include -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class DebugServerProviderChooser; -// BareMetalDeviceConfigurationWidget - class BareMetalDeviceConfigurationWidget final : public ProjectExplorer::IDeviceWidget { - Q_OBJECT - public: explicit BareMetalDeviceConfigurationWidget(const ProjectExplorer::IDevicePtr &deviceConfig); @@ -28,5 +23,4 @@ private: DebugServerProviderChooser *m_debugServerProviderChooser = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp index ac86d737f38..e3524cd5214 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp @@ -2,25 +2,22 @@ // Copyright (C) 2016 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "baremetaldeviceconfigurationwizard.h" + #include "baremetalconstants.h" #include "baremetaldevice.h" -#include "baremetaldeviceconfigurationwizard.h" #include "baremetaldeviceconfigurationwizardpages.h" +#include "baremetaltr.h" -#include - -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { enum PageId { SetupPageId }; -// BareMetalDeviceConfigurationWizard - BareMetalDeviceConfigurationWizard::BareMetalDeviceConfigurationWizard(QWidget *parent) : Utils::Wizard(parent), m_setupPage(new BareMetalDeviceConfigurationWizardSetupPage(this)) { - setWindowTitle(tr("New Bare Metal Device Configuration Setup")); + setWindowTitle(Tr::tr("New Bare Metal Device Configuration Setup")); setPage(SetupPageId, m_setupPage); m_setupPage->setCommitPage(true); } @@ -36,5 +33,4 @@ ProjectExplorer::IDevice::Ptr BareMetalDeviceConfigurationWizard::device() const return dev; } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h index 8290de81bae..ab7d6062c26 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizard.h @@ -6,17 +6,12 @@ #include #include -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class BareMetalDeviceConfigurationWizardSetupPage; -// BareMetalDeviceConfigurationWizard - class BareMetalDeviceConfigurationWizard final : public Utils::Wizard { - Q_OBJECT - public: explicit BareMetalDeviceConfigurationWizard(QWidget *parent = nullptr); @@ -26,5 +21,4 @@ private: BareMetalDeviceConfigurationWizardSetupPage *m_setupPage = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp index 57451c1cc85..b7b5163056b 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp @@ -2,9 +2,10 @@ // Copyright (C) 2016 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "baremetaldevice.h" #include "baremetaldeviceconfigurationwizardpages.h" +#include "baremetaldevice.h" +#include "baremetaltr.h" #include "debugserverproviderchooser.h" #include @@ -14,24 +15,21 @@ #include #include -namespace BareMetal { -namespace Internal { - -// BareMetalDeviceConfigurationWizardSetupPage +namespace BareMetal::Internal { BareMetalDeviceConfigurationWizardSetupPage::BareMetalDeviceConfigurationWizardSetupPage( QWidget *parent) : QWizardPage(parent) { - setTitle(tr("Set up Debug Server or Hardware Debugger")); + setTitle(Tr::tr("Set up Debug Server or Hardware Debugger")); const auto formLayout = new QFormLayout(this); formLayout->setFieldGrowthPolicy(QFormLayout::AllNonFixedFieldsGrow); m_nameLineEdit = new QLineEdit(this); - formLayout->addRow(tr("Name:"), m_nameLineEdit); + formLayout->addRow(Tr::tr("Name:"), m_nameLineEdit); m_debugServerProviderChooser = new DebugServerProviderChooser(false, this); m_debugServerProviderChooser->populate(); - formLayout->addRow(tr("Debug server provider:"), m_debugServerProviderChooser); + formLayout->addRow(Tr::tr("Debug server provider:"), m_debugServerProviderChooser); connect(m_nameLineEdit, &QLineEdit::textChanged, this, &BareMetalDeviceConfigurationWizardSetupPage::completeChanged); @@ -59,5 +57,4 @@ QString BareMetalDeviceConfigurationWizardSetupPage::debugServerProviderId() con return m_debugServerProviderChooser->currentProviderId(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h index 978b5d70166..2bc70a5c79f 100644 --- a/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h +++ b/src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h @@ -10,17 +10,12 @@ QT_BEGIN_NAMESPACE class QLineEdit; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class DebugServerProviderChooser; -// BareMetalDeviceConfigurationWizardSetupPage - class BareMetalDeviceConfigurationWizardSetupPage final : public QWizardPage { - Q_OBJECT - public: explicit BareMetalDeviceConfigurationWizardSetupPage(QWidget *parent = nullptr); @@ -34,5 +29,4 @@ private: DebugServerProviderChooser *m_debugServerProviderChooser = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp index 6e6ea56a1e1..14f2eb2aaf1 100644 --- a/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp +++ b/src/plugins/baremetal/baremetalgdbcommandsdeploystep.cpp @@ -22,7 +22,7 @@ BareMetalGdbCommandsDeployStepWidget::BareMetalGdbCommandsDeployStepWidget(BareM fl->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); setLayout(fl); m_commands = new QPlainTextEdit(this); - fl->addRow(tr("GDB commands:"), m_commands); + fl->addRow(Tr::tr("GDB commands:"), m_commands); m_commands->setPlainText(m_step.gdbCommands()); connect(m_commands, &QPlainTextEdit::textChanged, this, &BareMetalGdbCommandsDeployStepWidget::update); } @@ -82,7 +82,7 @@ Core::Id BareMetalGdbCommandsDeployStep::stepId() QString BareMetalGdbCommandsDeployStep::displayName() { - return tr("GDB commands"); + return Tr::tr("GDB commands"); } void BareMetalGdbCommandsDeployStep::updateGdbCommands(const QString &newCommands) diff --git a/src/plugins/baremetal/baremetalplugin.cpp b/src/plugins/baremetal/baremetalplugin.cpp index a285f151f42..a6b7f994ed0 100644 --- a/src/plugins/baremetal/baremetalplugin.cpp +++ b/src/plugins/baremetal/baremetalplugin.cpp @@ -2,11 +2,13 @@ // Copyright (C) 2016 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "baremetalplugin.h" + #include "baremetalconstants.h" #include "baremetaldebugsupport.h" #include "baremetaldevice.h" -#include "baremetalplugin.h" #include "baremetalrunconfiguration.h" +#include "baremetaltr.h" #include "debugserverprovidermanager.h" #include "debugserverproviderssettingspage.h" @@ -27,8 +29,7 @@ using namespace ProjectExplorer; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class BareMetalDeployConfigurationFactory : public DeployConfigurationFactory { @@ -36,8 +37,7 @@ public: BareMetalDeployConfigurationFactory() { setConfigBaseId("BareMetal.DeployConfiguration"); - setDefaultDisplayName(QCoreApplication::translate("BareMetalDeployConfiguration", - "Deploy to BareMetal Device")); + setDefaultDisplayName(Tr::tr("Deploy to BareMetal Device")); addSupportedTargetDeviceType(Constants::BareMetalOsType); } }; @@ -87,5 +87,4 @@ void BareMetalPlugin::extensionsInitialized() DebugServerProviderManager::instance()->restoreProviders(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetalplugin.h b/src/plugins/baremetal/baremetalplugin.h index baf688fdd3d..9e6cda59abe 100644 --- a/src/plugins/baremetal/baremetalplugin.h +++ b/src/plugins/baremetal/baremetalplugin.h @@ -6,10 +6,7 @@ #include -namespace BareMetal { -namespace Internal { - -// BareMetalPlugin +namespace BareMetal::Internal { class BareMetalPlugin final : public ExtensionSystem::IPlugin { @@ -34,5 +31,4 @@ private slots: #endif // WITH_TESTS }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetalrunconfiguration.cpp b/src/plugins/baremetal/baremetalrunconfiguration.cpp index 8b16aadb533..3edc38de9e4 100644 --- a/src/plugins/baremetal/baremetalrunconfiguration.cpp +++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp @@ -1,9 +1,11 @@ // Copyright (C) 2016 Tim Sander // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "baremetalconstants.h" #include "baremetalrunconfiguration.h" +#include "baremetalconstants.h" +#include "baremetaltr.h" + #include #include #include @@ -13,22 +15,19 @@ using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // RunConfigurations class BareMetalRunConfiguration final : public RunConfiguration { - Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalRunConfiguration) - public: explicit BareMetalRunConfiguration(Target *target, Id id) : RunConfiguration(target, id) { const auto exeAspect = addAspect(target, ExecutableAspect::RunDevice); exeAspect->setDisplayStyle(StringAspect::LabelDisplay); - exeAspect->setPlaceHolderText(tr("Unknown")); + exeAspect->setPlaceHolderText(Tr::tr("Unknown")); addAspect(macroExpander()); addAspect(macroExpander(), nullptr); @@ -44,15 +43,13 @@ public: class BareMetalCustomRunConfiguration final : public RunConfiguration { - Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::BareMetalCustomRunConfiguration) - public: explicit BareMetalCustomRunConfiguration(Target *target, Id id) : RunConfiguration(target, id) { const auto exeAspect = addAspect(target, ExecutableAspect::RunDevice); exeAspect->setSettingsKey("BareMetal.CustomRunConfig.Executable"); - exeAspect->setPlaceHolderText(tr("Unknown")); + exeAspect->setPlaceHolderText(Tr::tr("Unknown")); exeAspect->setDisplayStyle(StringAspect::PathChooserDisplay); exeAspect->setHistoryCompleter("BareMetal.CustomRunConfig.History"); exeAspect->setExpectedKind(PathChooser::Any); @@ -60,7 +57,8 @@ public: addAspect(macroExpander()); addAspect(macroExpander(), nullptr); - setDefaultDisplayName(RunConfigurationFactory::decoratedTargetName(tr("Custom Executable"), target)); + setDefaultDisplayName(RunConfigurationFactory::decoratedTargetName( + Tr::tr("Custom Executable"), target)); } public: @@ -71,8 +69,8 @@ Tasks BareMetalCustomRunConfiguration::checkForIssues() const { Tasks tasks; if (aspect()->executable().isEmpty()) { - tasks << createConfigurationIssue(tr("The remote executable must be set in order to run " - "a custom remote run configuration.")); + tasks << createConfigurationIssue(Tr::tr("The remote executable must be set in order to " + "run a custom remote run configuration.")); } return tasks; } @@ -89,12 +87,10 @@ BareMetalRunConfigurationFactory::BareMetalRunConfigurationFactory() // BaseMetalCustomRunConfigurationFactory BareMetalCustomRunConfigurationFactory::BareMetalCustomRunConfigurationFactory() - : FixedRunConfigurationFactory(BareMetalCustomRunConfiguration::tr("Custom Executable"), true) + : FixedRunConfigurationFactory(Tr::tr("Custom Executable"), true) { registerRunConfiguration("BareMetal"); addSupportedTargetDeviceType(BareMetal::Constants::BareMetalOsType); } -} // namespace Internal -} // namespace BareMetal - +} // BareMetal::Internal diff --git a/src/plugins/baremetal/baremetalrunconfiguration.h b/src/plugins/baremetal/baremetalrunconfiguration.h index f050dde41d3..1d8e7d03fee 100644 --- a/src/plugins/baremetal/baremetalrunconfiguration.h +++ b/src/plugins/baremetal/baremetalrunconfiguration.h @@ -5,8 +5,7 @@ #include -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class BareMetalRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory @@ -22,5 +21,4 @@ public: BareMetalCustomRunConfigurationFactory(); }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugserverproviderchooser.cpp b/src/plugins/baremetal/debugserverproviderchooser.cpp index 1f51f0adbd4..76c8bb4bcaf 100644 --- a/src/plugins/baremetal/debugserverproviderchooser.cpp +++ b/src/plugins/baremetal/debugserverproviderchooser.cpp @@ -3,6 +3,7 @@ #include "baremetalconstants.h" +#include "baremetaltr.h" #include "debugserverproviderchooser.h" #include "debugserverprovidermanager.h" #include "idebugserverprovider.h" @@ -14,8 +15,7 @@ #include #include -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // DebugServerProviderChooser @@ -25,7 +25,7 @@ DebugServerProviderChooser::DebugServerProviderChooser( { m_chooser = new QComboBox(this); m_chooser->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); - m_manageButton = new QPushButton(tr("Manage..."), this); + m_manageButton = new QPushButton(Tr::tr("Manage..."), this); m_manageButton->setEnabled(useManageButton); m_manageButton->setVisible(useManageButton); @@ -83,7 +83,7 @@ void DebugServerProviderChooser::populate() { const QSignalBlocker blocker(m_chooser); m_chooser->clear(); - m_chooser->addItem(tr("None")); + m_chooser->addItem(Tr::tr("None")); for (const IDebugServerProvider *p : DebugServerProviderManager::providers()) { if (!providerMatches(p)) @@ -92,5 +92,4 @@ void DebugServerProviderChooser::populate() } } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugserverproviderchooser.h b/src/plugins/baremetal/debugserverproviderchooser.h index dd537318f8b..938e6bf1831 100644 --- a/src/plugins/baremetal/debugserverproviderchooser.h +++ b/src/plugins/baremetal/debugserverproviderchooser.h @@ -10,13 +10,10 @@ class QComboBox; class QPushButton; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class IDebugServerProvider; -// DebugServerProviderChooser - class DebugServerProviderChooser final : public QWidget { Q_OBJECT @@ -42,5 +39,4 @@ private: QPushButton *m_manageButton = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugserverprovidermanager.cpp b/src/plugins/baremetal/debugserverprovidermanager.cpp index 2ed256e47ae..e857e50620e 100644 --- a/src/plugins/baremetal/debugserverprovidermanager.cpp +++ b/src/plugins/baremetal/debugserverprovidermanager.cpp @@ -24,10 +24,7 @@ #include #include -#include - -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { const char dataKeyC[] = "DebugServerProvider."; const char countKeyC[] = "DebugServerProvider.Count"; @@ -199,5 +196,4 @@ void DebugServerProviderManager::deregisterProvider(IDebugServerProvider *provid delete provider; } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugserverprovidermanager.h b/src/plugins/baremetal/debugserverprovidermanager.h index adc12f0cda5..eb5f929a790 100644 --- a/src/plugins/baremetal/debugserverprovidermanager.h +++ b/src/plugins/baremetal/debugserverprovidermanager.h @@ -10,8 +10,7 @@ namespace Utils { class PersistentSettingsWriter; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class BareMetalPlugin; class BareMetalPluginPrivate; @@ -59,5 +58,4 @@ private: friend class IDebugServerProvider; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugserverproviderssettingspage.cpp b/src/plugins/baremetal/debugserverproviderssettingspage.cpp index 47ce9549edf..5947102c6eb 100644 --- a/src/plugins/baremetal/debugserverproviderssettingspage.cpp +++ b/src/plugins/baremetal/debugserverproviderssettingspage.cpp @@ -1,10 +1,11 @@ // Copyright (C) 2016 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "baremetalconstants.h" - -#include "debugserverprovidermanager.h" #include "debugserverproviderssettingspage.h" + +#include "baremetalconstants.h" +#include "baremetaltr.h" +#include "debugserverprovidermanager.h" #include "idebugserverprovider.h" #include @@ -32,8 +33,7 @@ using namespace Debugger; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // DebugServerProviderNode @@ -47,11 +47,11 @@ static QString engineTypeName(DebuggerEngineType engineType) { switch (engineType) { case NoEngineType: - return DebugServerProviderModel::tr("Not recognized"); + return Tr::tr("Not recognized"); case GdbEngineType: - return DebugServerProviderModel::tr("GDB"); + return Tr::tr("GDB"); case UvscEngineType: - return DebugServerProviderModel::tr("UVSC"); + return Tr::tr("UVSC"); default: return {}; } @@ -61,13 +61,13 @@ static QString engineTypeDescription(DebuggerEngineType engineType) { switch (engineType) { case NoEngineType: - return DebugServerProviderModel::tr("Not recognized"); + return Tr::tr("Not recognized"); case GdbEngineType: - return DebugServerProviderModel::tr("GDB compatible provider engine\n" \ - "(used together with the GDB debuggers)."); + return Tr::tr("GDB compatible provider engine\n" \ + "(used together with the GDB debuggers)."); case UvscEngineType: - return DebugServerProviderModel::tr("UVSC compatible provider engine\n" \ - "(used together with the KEIL uVision)."); + return Tr::tr("UVSC compatible provider engine\n" \ + "(used together with the KEIL uVision)."); default: return {}; } @@ -114,7 +114,7 @@ public: DebugServerProviderModel::DebugServerProviderModel() { - setHeader({tr("Name"), tr("Type"), tr("Engine")}); + setHeader({Tr::tr("Name"), Tr::tr("Type"), Tr::tr("Engine")}); const DebugServerProviderManager *manager = DebugServerProviderManager::instance(); @@ -175,8 +175,8 @@ void DebugServerProviderModel::apply() if (!skippedProviders.isEmpty()) { QMessageBox::warning(Core::ICore::dialogParent(), - tr("Duplicate Providers Detected"), - tr("The following providers were already configured:
" + Tr::tr("Duplicate Providers Detected"), + Tr::tr("The following providers were already configured:
" " %1
" "They were not configured again.") .arg(skippedProviders.join(",
 "))); @@ -254,8 +254,6 @@ void DebugServerProviderModel::removeProvider(IDebugServerProvider *provider) class DebugServerProvidersSettingsWidget final : public Core::IOptionsPageWidget { - Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::DebugServerProvidersSettingsPage) - public: DebugServerProvidersSettingsWidget(); @@ -284,9 +282,9 @@ DebugServerProvidersSettingsWidget::DebugServerProvidersSettingsWidget() m_providerView->setUniformRowHeights(true); m_providerView->header()->setStretchLastSection(false); - m_addButton = new QPushButton(tr("Add"), this); - m_cloneButton = new QPushButton(tr("Clone"), this); - m_delButton = new QPushButton(tr("Remove"), this); + m_addButton = new QPushButton(Tr::tr("Add"), this); + m_cloneButton = new QPushButton(Tr::tr("Clone"), this); + m_delButton = new QPushButton(Tr::tr("Remove"), this); m_container = new Utils::DetailsWidget(this); m_container->setState(Utils::DetailsWidget::NoSummary); @@ -310,7 +308,7 @@ DebugServerProvidersSettingsWidget::DebugServerProvidersSettingsWidget() horizontalLayout->addLayout(verticalLayout); horizontalLayout->addWidget(m_container); - const auto groupBox = new QGroupBox(tr("Debug Server Providers"), this); + const auto groupBox = new QGroupBox(Tr::tr("Debug Server Providers"), this); groupBox->setLayout(horizontalLayout); const auto topLayout = new QVBoxLayout(this); @@ -351,7 +349,7 @@ DebugServerProvidersSettingsWidget::DebugServerProvidersSettingsWidget() if (id.startsWith(f->id())) { IDebugServerProvider *p = f->create(); p->fromMap(old->toMap()); - p->setDisplayName(tr("Clone of %1").arg(old->displayName())); + p->setDisplayName(Tr::tr("Clone of %1").arg(old->displayName())); p->resetId(); addProviderToModel(p); } @@ -432,10 +430,9 @@ QModelIndex DebugServerProvidersSettingsWidget::currentIndex() const DebugServerProvidersSettingsPage::DebugServerProvidersSettingsPage() { setId(Constants::DEBUG_SERVER_PROVIDERS_SETTINGS_ID); - setDisplayName(DebugServerProvidersSettingsWidget::tr("Bare Metal")); + setDisplayName(Tr::tr("Bare Metal")); setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY); setWidgetCreator([] { return new DebugServerProvidersSettingsWidget; }); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugserverproviderssettingspage.h b/src/plugins/baremetal/debugserverproviderssettingspage.h index 999af0d2e7e..fc1633de53f 100644 --- a/src/plugins/baremetal/debugserverproviderssettingspage.h +++ b/src/plugins/baremetal/debugserverproviderssettingspage.h @@ -15,8 +15,7 @@ QT_END_NAMESPACE namespace Utils { class DetailsWidget; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class DebugServerProviderNode; class DebugServerProvidersSettingsWidget; @@ -66,5 +65,4 @@ public: DebugServerProvidersSettingsPage(); }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp index 943eb71143c..4cb7949e638 100644 --- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp @@ -4,6 +4,7 @@ #include "eblinkgdbserverprovider.h" #include +#include #include #include @@ -16,13 +17,10 @@ #include #include #include -#include -#include using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { const char executableFileKeyC[] = "ExecutableFile"; const char verboseLevelKeyC[] = "VerboseLevel"; @@ -44,7 +42,7 @@ EBlinkGdbServerProvider::EBlinkGdbServerProvider() setInitCommands(defaultInitCommands()); setResetCommands(defaultResetCommands()); setChannel("127.0.0.1", 2331); - setTypeDisplayName(GdbServerProvider::tr("EBlink")); + setTypeDisplayName(Tr::tr("EBlink")); setConfigurationWidgetCreator([this] { return new EBlinkGdbServerProviderConfigWidget(this); }); } @@ -208,7 +206,7 @@ bool EBlinkGdbServerProvider::operator==(const IDebugServerProvider &other) cons EBlinkGdbServerProviderFactory::EBlinkGdbServerProviderFactory() { setId(Constants::GDBSERVER_EBLINK_PROVIDER_ID); - setDisplayName(GdbServerProvider::tr("EBlink")); + setDisplayName(Tr::tr("EBlink")); setCreator([] { return new EBlinkGdbServerProvider; }); } @@ -221,52 +219,52 @@ EBlinkGdbServerProviderConfigWidget::EBlinkGdbServerProviderConfigWidget( Q_ASSERT(p); m_gdbHostWidget = new HostWidget(this); - m_mainLayout->addRow(tr("Host:"), m_gdbHostWidget); + m_mainLayout->addRow(Tr::tr("Host:"), m_gdbHostWidget); m_executableFileChooser = new PathChooser; m_executableFileChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); - m_mainLayout->addRow(tr("Executable file:"), m_executableFileChooser); + m_mainLayout->addRow(Tr::tr("Executable file:"), m_executableFileChooser); m_scriptFileChooser = new Utils::PathChooser; m_scriptFileChooser->setExpectedKind(Utils::PathChooser::File); m_scriptFileChooser->setPromptDialogFilter("*.script"); - m_mainLayout->addRow(tr("Script file:"), m_scriptFileChooser); + m_mainLayout->addRow(Tr::tr("Script file:"), m_scriptFileChooser); m_verboseLevelSpinBox = new QSpinBox; m_verboseLevelSpinBox->setRange(0, 7); m_verboseLevelSpinBox->setMaximumWidth(80); - m_verboseLevelSpinBox->setToolTip(tr("Specify the verbosity level (0 to 7).")); - m_mainLayout->addRow(tr("Verbosity level:"), m_verboseLevelSpinBox); + m_verboseLevelSpinBox->setToolTip(Tr::tr("Specify the verbosity level (0 to 7).")); + m_mainLayout->addRow(Tr::tr("Verbosity level:"), m_verboseLevelSpinBox); m_resetOnConnectCheckBox = new QCheckBox; - m_resetOnConnectCheckBox->setToolTip(tr("Connect under reset (hotplug).")); - m_mainLayout->addRow(tr("Connect under reset:"), m_resetOnConnectCheckBox); + m_resetOnConnectCheckBox->setToolTip(Tr::tr("Connect under reset (hotplug).")); + m_mainLayout->addRow(Tr::tr("Connect under reset:"), m_resetOnConnectCheckBox); m_interfaceTypeComboBox = new QComboBox; - m_interfaceTypeComboBox->setToolTip(tr("Interface type.")); - m_mainLayout->addRow(tr("Type:"), m_interfaceTypeComboBox); + m_interfaceTypeComboBox->setToolTip(Tr::tr("Interface type.")); + m_mainLayout->addRow(Tr::tr("Type:"), m_interfaceTypeComboBox); m_interfaceSpeedSpinBox = new QSpinBox; m_interfaceSpeedSpinBox->setRange(120, 8000); m_interfaceSpeedSpinBox->setMaximumWidth(120); - m_interfaceSpeedSpinBox->setToolTip(tr("Specify the speed of the interface (120 to 8000) in kilohertz (kHz).")); - m_mainLayout->addRow(tr("Speed:"), m_interfaceSpeedSpinBox); + m_interfaceSpeedSpinBox->setToolTip(Tr::tr("Specify the speed of the interface (120 to 8000) in kilohertz (kHz).")); + m_mainLayout->addRow(Tr::tr("Speed:"), m_interfaceSpeedSpinBox); m_notUseCacheCheckBox = new QCheckBox; - m_notUseCacheCheckBox->setToolTip(tr("Do not use EBlink flash cache.")); - m_mainLayout->addRow(tr("Disable cache:"), m_notUseCacheCheckBox); + m_notUseCacheCheckBox->setToolTip(Tr::tr("Do not use EBlink flash cache.")); + m_mainLayout->addRow(Tr::tr("Disable cache:"), m_notUseCacheCheckBox); m_shutDownAfterDisconnectCheckBox = new QCheckBox; m_shutDownAfterDisconnectCheckBox->setEnabled(false); - m_shutDownAfterDisconnectCheckBox->setToolTip(tr("Shut down EBlink server after disconnect.")); - m_mainLayout->addRow(tr("Auto shutdown:"), m_shutDownAfterDisconnectCheckBox); + m_shutDownAfterDisconnectCheckBox->setToolTip(Tr::tr("Shut down EBlink server after disconnect.")); + m_mainLayout->addRow(Tr::tr("Auto shutdown:"), m_shutDownAfterDisconnectCheckBox); m_initCommandsTextEdit = new QPlainTextEdit(this); m_initCommandsTextEdit->setToolTip(defaultInitCommandsTooltip()); - m_mainLayout->addRow(tr("Init commands:"), m_initCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Init commands:"), m_initCommandsTextEdit); m_resetCommandsTextEdit = new QPlainTextEdit(this); m_resetCommandsTextEdit->setToolTip(defaultResetCommandsTooltip()); - m_mainLayout->addRow(tr("Reset commands:"), m_resetCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Reset commands:"), m_resetCommandsTextEdit); populateInterfaceTypes(); addErrorLabel(); @@ -316,9 +314,9 @@ EBlinkGdbServerProviderConfigWidget::interfaceTypeFromWidget() const void EBlinkGdbServerProviderConfigWidget::populateInterfaceTypes() { - m_interfaceTypeComboBox->insertItem(EBlinkGdbServerProvider::SWD, tr("SWD"), + m_interfaceTypeComboBox->insertItem(EBlinkGdbServerProvider::SWD, Tr::tr("SWD"), EBlinkGdbServerProvider::SWD); - m_interfaceTypeComboBox->insertItem(EBlinkGdbServerProvider::JTAG, tr("JTAG"), + m_interfaceTypeComboBox->insertItem(EBlinkGdbServerProvider::JTAG, Tr::tr("JTAG"), EBlinkGdbServerProvider::JTAG); } @@ -368,5 +366,4 @@ void EBlinkGdbServerProviderConfigWidget::discard() GdbServerProviderConfigWidget::discard(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h index 770e7ed1292..7432bc3c982 100644 --- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h @@ -12,8 +12,7 @@ QT_END_NAMESPACE namespace Utils { class PathChooser; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // EBlinkGdbServerProvider @@ -71,8 +70,6 @@ public: class EBlinkGdbServerProviderConfigWidget final : public GdbServerProviderConfigWidget { - Q_OBJECT - public: explicit EBlinkGdbServerProviderConfigWidget( EBlinkGdbServerProvider *provider); @@ -101,6 +98,5 @@ private: QPlainTextEdit *m_resetCommandsTextEdit = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp index b098aecbc1b..da3f8bcaca7 100644 --- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.cpp @@ -5,6 +5,7 @@ #include #include +#include #include #include @@ -22,8 +23,7 @@ using namespace Debugger; using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { const char startupModeKeyC[] = "Mode"; const char peripheralDescriptionFileKeyC[] = "PeripheralDescriptionFile"; @@ -144,13 +144,11 @@ bool GdbServerProvider::aboutToRun(DebuggerRunTool *runTool, const FilePath bin = FilePath::fromString(exeAspect->executable.path()); if (bin.isEmpty()) { - errorMessage = BareMetalDebugSupport::tr( - "Cannot debug: Local executable is not set."); + errorMessage = Tr::tr("Cannot debug: Local executable is not set."); return false; } if (!bin.exists()) { - errorMessage = BareMetalDebugSupport::tr( - "Cannot debug: Could not find executable for \"%1\".") + errorMessage = Tr::tr("Cannot debug: Could not find executable for \"%1\".") .arg(bin.toString()); return false; } @@ -201,17 +199,17 @@ GdbServerProviderConfigWidget::GdbServerProviderConfigWidget( : IDebugServerProviderConfigWidget(provider) { m_startupModeComboBox = new QComboBox(this); - m_startupModeComboBox->setToolTip(tr("Choose the desired startup mode " - "of the GDB server provider.")); - m_mainLayout->addRow(tr("Startup mode:"), m_startupModeComboBox); + m_startupModeComboBox->setToolTip(Tr::tr("Choose the desired startup mode " + "of the GDB server provider.")); + m_mainLayout->addRow(Tr::tr("Startup mode:"), m_startupModeComboBox); m_peripheralDescriptionFileChooser = new PathChooser(this); m_peripheralDescriptionFileChooser->setExpectedKind(PathChooser::File); m_peripheralDescriptionFileChooser->setPromptDialogFilter( - tr("Peripheral description files (*.svd)")); + Tr::tr("Peripheral description files (*.svd)")); m_peripheralDescriptionFileChooser->setPromptDialogTitle( - tr("Select Peripheral Description File")); - m_mainLayout->addRow(tr("Peripheral description file:"), + Tr::tr("Select Peripheral Description File")); + m_mainLayout->addRow(Tr::tr("Peripheral description file:"), m_peripheralDescriptionFileChooser); populateStartupModes(); @@ -264,9 +262,9 @@ static QString startupModeName(GdbServerProvider::StartupMode m) { switch (m) { case GdbServerProvider::StartupOnNetwork: - return GdbServerProviderConfigWidget::tr("Startup in TCP/IP Mode"); + return Tr::tr("Startup in TCP/IP Mode"); case GdbServerProvider::StartupOnPipe: - return GdbServerProviderConfigWidget::tr("Startup in Pipe Mode"); + return Tr::tr("Startup in Pipe Mode"); default: return {}; } @@ -299,16 +297,14 @@ void GdbServerProviderConfigWidget::setFromProvider() QString GdbServerProviderConfigWidget::defaultInitCommandsTooltip() { - return QCoreApplication::translate("BareMetal", - "Enter GDB commands to reset the board " - "and to write the nonvolatile memory."); + return Tr::tr("Enter GDB commands to reset the board " + "and to write the nonvolatile memory."); } QString GdbServerProviderConfigWidget::defaultResetCommandsTooltip() { - return QCoreApplication::translate("BareMetal", - "Enter GDB commands to reset the hardware. " - "The MCU should be halted after these commands."); + return Tr::tr("Enter GDB commands to reset the hardware. " + "The MCU should be halted after these commands."); } // GdbServerProviderRunner @@ -325,5 +321,4 @@ GdbServerProviderRunner::GdbServerProviderRunner(ProjectExplorer::RunControl *ru }); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h index 3d707dbb299..8bf7211db1e 100644 --- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h @@ -7,23 +7,18 @@ #include -#include - QT_BEGIN_NAMESPACE class QComboBox; QT_END_NAMESPACE namespace Utils { class PathChooser; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // GdbServerProvider class GdbServerProvider : public IDebugServerProvider { - Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::GdbServerProvider) - public: enum StartupMode { StartupOnNetwork, @@ -75,8 +70,6 @@ protected: class GdbServerProviderConfigWidget : public IDebugServerProviderConfigWidget { - Q_OBJECT - public: explicit GdbServerProviderConfigWidget(GdbServerProvider *provider); void apply() override; @@ -107,5 +100,4 @@ public: const Utils::CommandLine &commandLine); }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp index fe25e567663..9bff7203d72 100644 --- a/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.cpp @@ -4,6 +4,7 @@ #include "genericgdbserverprovider.h" #include +#include #include #include @@ -13,8 +14,7 @@ #include #include -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // GenericGdbServerProvider @@ -22,7 +22,7 @@ GenericGdbServerProvider::GenericGdbServerProvider() : GdbServerProvider(Constants::GDBSERVER_GENERIC_PROVIDER_ID) { setChannel("localhost", 3333); - setTypeDisplayName(GdbServerProvider::tr("Generic")); + setTypeDisplayName(Tr::tr("Generic")); setConfigurationWidgetCreator([this] { return new GenericGdbServerProviderConfigWidget(this); }); } @@ -36,7 +36,7 @@ QSet GenericGdbServerProvider::supportedStartupM GenericGdbServerProviderFactory::GenericGdbServerProviderFactory() { setId(Constants::GDBSERVER_GENERIC_PROVIDER_ID); - setDisplayName(GdbServerProvider::tr("Generic")); + setDisplayName(Tr::tr("Generic")); setCreator([] { return new GenericGdbServerProvider; }); } @@ -49,17 +49,17 @@ GenericGdbServerProviderConfigWidget::GenericGdbServerProviderConfigWidget( Q_ASSERT(provider); m_hostWidget = new HostWidget(this); - m_mainLayout->addRow(tr("Host:"), m_hostWidget); + m_mainLayout->addRow(Tr::tr("Host:"), m_hostWidget); m_useExtendedRemoteCheckBox = new QCheckBox(this); - m_useExtendedRemoteCheckBox->setToolTip("Use GDB target extended-remote"); - m_mainLayout->addRow(tr("Extended mode:"), m_useExtendedRemoteCheckBox); + m_useExtendedRemoteCheckBox->setToolTip(Tr::tr("Use GDB target extended-remote")); + m_mainLayout->addRow(Tr::tr("Extended mode:"), m_useExtendedRemoteCheckBox); m_initCommandsTextEdit = new QPlainTextEdit(this); m_initCommandsTextEdit->setToolTip(defaultInitCommandsTooltip()); - m_mainLayout->addRow(tr("Init commands:"), m_initCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Init commands:"), m_initCommandsTextEdit); m_resetCommandsTextEdit = new QPlainTextEdit(this); m_resetCommandsTextEdit->setToolTip(defaultResetCommandsTooltip()); - m_mainLayout->addRow(tr("Reset commands:"), m_resetCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Reset commands:"), m_resetCommandsTextEdit); addErrorLabel(); setFromProvider(); @@ -108,5 +108,4 @@ void GenericGdbServerProviderConfigWidget::setFromProvider() m_resetCommandsTextEdit->setPlainText(p->resetCommands()); } -} // namespace Internal -} // namespace ProjectExplorer +} // ProjectExplorer::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.h index 45d8b9c22d3..168d33b3370 100644 --- a/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/genericgdbserverprovider.h @@ -10,8 +10,7 @@ class QCheckBox; class QPlainTextEdit; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // GenericGdbServerProvider @@ -39,8 +38,6 @@ public: class GenericGdbServerProviderConfigWidget final : public GdbServerProviderConfigWidget { - Q_OBJECT - public: explicit GenericGdbServerProviderConfigWidget( GenericGdbServerProvider *provider); @@ -57,5 +54,4 @@ private: QPlainTextEdit *m_resetCommandsTextEdit = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp index f40082a5c06..f8fecc9c869 100644 --- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp @@ -4,6 +4,7 @@ #include "jlinkgdbserverprovider.h" #include +#include #include #include @@ -21,8 +22,7 @@ using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { const char executableFileKeyC[] = "ExecutableFile"; const char jlinkDeviceKeyC[] = "JLinkDevice"; @@ -40,7 +40,7 @@ JLinkGdbServerProvider::JLinkGdbServerProvider() setInitCommands(defaultInitCommands()); setResetCommands(defaultResetCommands()); setChannel("localhost", 2331); - setTypeDisplayName(GdbServerProvider::tr("JLink")); + setTypeDisplayName(Tr::tr("JLink")); setConfigurationWidgetCreator([this] { return new JLinkGdbServerProviderConfigWidget(this); }); } @@ -166,7 +166,7 @@ bool JLinkGdbServerProvider::operator==(const IDebugServerProvider &other) const JLinkGdbServerProviderFactory::JLinkGdbServerProviderFactory() { setId(Constants::GDBSERVER_JLINK_PROVIDER_ID); - setDisplayName(GdbServerProvider::tr("JLink")); + setDisplayName(Tr::tr("JLink")); setCreator([] { return new JLinkGdbServerProvider; }); } @@ -179,58 +179,58 @@ JLinkGdbServerProviderConfigWidget::JLinkGdbServerProviderConfigWidget( Q_ASSERT(provider); m_hostWidget = new HostWidget(this); - m_mainLayout->addRow(tr("Host:"), m_hostWidget); + m_mainLayout->addRow(Tr::tr("Host:"), m_hostWidget); m_executableFileChooser = new Utils::PathChooser; m_executableFileChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); m_executableFileChooser->setCommandVersionArguments({"--version"}); if (HostOsInfo::hostOs() == OsTypeWindows) { - m_executableFileChooser->setPromptDialogFilter(tr("JLink GDB Server (JLinkGDBServerCL.exe)")); + m_executableFileChooser->setPromptDialogFilter(Tr::tr("JLink GDB Server (JLinkGDBServerCL.exe)")); m_executableFileChooser->lineEdit()->setPlaceholderText("JLinkGDBServerCL.exe"); } else { - m_executableFileChooser->setPromptDialogFilter(tr("JLink GDB Server (JLinkGDBServer)")); + m_executableFileChooser->setPromptDialogFilter(Tr::tr("JLink GDB Server (JLinkGDBServer)")); m_executableFileChooser->lineEdit()->setPlaceholderText("JLinkGDBServer"); } - m_mainLayout->addRow(tr("Executable file:"), m_executableFileChooser); + m_mainLayout->addRow(Tr::tr("Executable file:"), m_executableFileChooser); // Host interface settings. m_hostInterfaceWidget = new QWidget(this); m_hostInterfaceComboBox = new QComboBox(m_hostInterfaceWidget); m_hostInterfaceAddressLabel = new QLabel(m_hostInterfaceWidget); - m_hostInterfaceAddressLabel->setText(tr("IP Address")); + m_hostInterfaceAddressLabel->setText(Tr::tr("IP Address")); m_hostInterfaceAddressLineEdit = new QLineEdit(m_hostInterfaceWidget); const auto hostInterfaceLayout = new QHBoxLayout(m_hostInterfaceWidget); hostInterfaceLayout->setContentsMargins(0, 0, 0, 0); hostInterfaceLayout->addWidget(m_hostInterfaceComboBox); hostInterfaceLayout->addWidget(m_hostInterfaceAddressLabel); hostInterfaceLayout->addWidget(m_hostInterfaceAddressLineEdit); - m_mainLayout->addRow(tr("Host interface:"), m_hostInterfaceWidget); + m_mainLayout->addRow(Tr::tr("Host interface:"), m_hostInterfaceWidget); // Target interface settings. m_targetInterfaceWidget = new QWidget(this); m_targetInterfaceComboBox = new QComboBox(m_targetInterfaceWidget); m_targetInterfaceSpeedLabel = new QLabel(m_targetInterfaceWidget); - m_targetInterfaceSpeedLabel->setText(tr("Speed")); + m_targetInterfaceSpeedLabel->setText(Tr::tr("Speed")); m_targetInterfaceSpeedComboBox = new QComboBox(m_targetInterfaceWidget); const auto targetInterfaceLayout = new QHBoxLayout(m_targetInterfaceWidget); targetInterfaceLayout->setContentsMargins(0, 0, 0, 0); targetInterfaceLayout->addWidget(m_targetInterfaceComboBox); targetInterfaceLayout->addWidget(m_targetInterfaceSpeedLabel); targetInterfaceLayout->addWidget(m_targetInterfaceSpeedComboBox); - m_mainLayout->addRow(tr("Target interface:"), m_targetInterfaceWidget); + m_mainLayout->addRow(Tr::tr("Target interface:"), m_targetInterfaceWidget); m_jlinkDeviceLineEdit = new QLineEdit(this); - m_mainLayout->addRow(tr("Device:"), m_jlinkDeviceLineEdit); + m_mainLayout->addRow(Tr::tr("Device:"), m_jlinkDeviceLineEdit); m_additionalArgumentsTextEdit = new QPlainTextEdit(this); - m_mainLayout->addRow(tr("Additional arguments:"), m_additionalArgumentsTextEdit); + m_mainLayout->addRow(Tr::tr("Additional arguments:"), m_additionalArgumentsTextEdit); m_initCommandsTextEdit = new QPlainTextEdit(this); m_initCommandsTextEdit->setToolTip(defaultInitCommandsTooltip()); - m_mainLayout->addRow(tr("Init commands:"), m_initCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Init commands:"), m_initCommandsTextEdit); m_resetCommandsTextEdit = new QPlainTextEdit(this); m_resetCommandsTextEdit->setToolTip(defaultResetCommandsTooltip()); - m_mainLayout->addRow(tr("Reset commands:"), m_resetCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Reset commands:"), m_resetCommandsTextEdit); populateHostInterfaces(); populateTargetInterfaces(); @@ -297,26 +297,26 @@ void JLinkGdbServerProviderConfigWidget::discard() void JLinkGdbServerProviderConfigWidget::populateHostInterfaces() { - m_hostInterfaceComboBox->addItem(tr("Default")); - m_hostInterfaceComboBox->addItem(tr("USB"), "USB"); - m_hostInterfaceComboBox->addItem(tr("TCP/IP"), "IP"); + m_hostInterfaceComboBox->addItem(Tr::tr("Default")); + m_hostInterfaceComboBox->addItem(Tr::tr("USB"), "USB"); + m_hostInterfaceComboBox->addItem(Tr::tr("TCP/IP"), "IP"); } void JLinkGdbServerProviderConfigWidget::populateTargetInterfaces() { - m_targetInterfaceComboBox->addItem(tr("Default")); - m_targetInterfaceComboBox->addItem(tr("JTAG"), "JTAG"); - m_targetInterfaceComboBox->addItem(tr("Compact JTAG"), "cJTAG"); - m_targetInterfaceComboBox->addItem(tr("SWD"), "SWD"); - m_targetInterfaceComboBox->addItem(tr("Renesas RX FINE"), "FINE"); - m_targetInterfaceComboBox->addItem(tr("ICSP"), "ICSP"); + m_targetInterfaceComboBox->addItem(Tr::tr("Default")); + m_targetInterfaceComboBox->addItem(Tr::tr("JTAG"), "JTAG"); + m_targetInterfaceComboBox->addItem(Tr::tr("Compact JTAG"), "cJTAG"); + m_targetInterfaceComboBox->addItem(Tr::tr("SWD"), "SWD"); + m_targetInterfaceComboBox->addItem(Tr::tr("Renesas RX FINE"), "FINE"); + m_targetInterfaceComboBox->addItem(Tr::tr("ICSP"), "ICSP"); } void JLinkGdbServerProviderConfigWidget::populateTargetSpeeds() { - m_targetInterfaceSpeedComboBox->addItem(tr("Default")); - m_targetInterfaceSpeedComboBox->addItem(tr("Auto"), "auto"); - m_targetInterfaceSpeedComboBox->addItem(tr("Adaptive"), "adaptive"); + m_targetInterfaceSpeedComboBox->addItem(Tr::tr("Default")); + m_targetInterfaceSpeedComboBox->addItem(Tr::tr("Auto"), "auto"); + m_targetInterfaceSpeedComboBox->addItem(Tr::tr("Adaptive"), "adaptive"); const QStringList fixedSpeeds = {"1", "5", "10", "20", "30", "50", "100", "200", "300", "400", "500", "600", "750", "800", "900", "1000", "1334", @@ -324,7 +324,7 @@ void JLinkGdbServerProviderConfigWidget::populateTargetSpeeds() "6000", "8000", "9600", "12000", "15000", "20000", "25000", "30000", "40000", "50000"}; for (const auto &fixedSpeed : fixedSpeeds) - m_targetInterfaceSpeedComboBox->addItem(tr("%1 kHz").arg(fixedSpeed), fixedSpeed); + m_targetInterfaceSpeedComboBox->addItem(Tr::tr("%1 kHz").arg(fixedSpeed), fixedSpeed); } void JLinkGdbServerProviderConfigWidget::setHostInterface(const QString &newIface) @@ -388,7 +388,6 @@ void JLinkGdbServerProviderConfigWidget::setFromProvider() m_hostInterfaceAddressLineEdit->setText(p->m_jlinkHostAddr); m_hostWidget->setChannel(p->channel()); m_initCommandsTextEdit->setPlainText(p->initCommands()); - m_jlinkDeviceLineEdit->setText( p->m_jlinkDevice); m_jlinkDeviceLineEdit->setText(p->m_jlinkDevice); m_resetCommandsTextEdit->setPlainText(p->resetCommands()); @@ -399,5 +398,4 @@ void JLinkGdbServerProviderConfigWidget::setFromProvider() updateAllowedControls(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h index 953f6e7de04..6cc33f14854 100644 --- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h @@ -11,8 +11,7 @@ QT_END_NAMESPACE namespace Utils { class PathChooser; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // JLinkGdbServerProvider @@ -62,11 +61,8 @@ public: class JLinkGdbServerProviderConfigWidget final : public GdbServerProviderConfigWidget { - Q_OBJECT - public: - explicit JLinkGdbServerProviderConfigWidget( - JLinkGdbServerProvider *provider); + explicit JLinkGdbServerProviderConfigWidget(JLinkGdbServerProvider *provider); private: void apply() final; @@ -103,5 +99,4 @@ private: QPlainTextEdit *m_resetCommandsTextEdit = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp index 6879d8a5346..97cad3cad1c 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp @@ -4,6 +4,7 @@ #include "openocdgdbserverprovider.h" #include +#include #include #include @@ -19,8 +20,7 @@ using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { const char executableFileKeyC[] = "ExecutableFile"; const char rootScriptsDirKeyC[] = "RootScriptsDir"; @@ -35,7 +35,7 @@ OpenOcdGdbServerProvider::OpenOcdGdbServerProvider() setInitCommands(defaultInitCommands()); setResetCommands(defaultResetCommands()); setChannel("localhost", 3333); - setTypeDisplayName(GdbServerProvider::tr("OpenOCD")); + setTypeDisplayName(Tr::tr("OpenOCD")); setConfigurationWidgetCreator([this] { return new OpenOcdGdbServerProviderConfigWidget(this); }); } @@ -164,7 +164,7 @@ bool OpenOcdGdbServerProvider::operator==(const IDebugServerProvider &other) con OpenOcdGdbServerProviderFactory::OpenOcdGdbServerProviderFactory() { setId(Constants::GDBSERVER_OPENOCD_PROVIDER_ID); - setDisplayName(GdbServerProvider::tr("OpenOCD")); + setDisplayName(Tr::tr("OpenOCD")); setCreator([] { return new OpenOcdGdbServerProvider; }); } @@ -177,31 +177,31 @@ OpenOcdGdbServerProviderConfigWidget::OpenOcdGdbServerProviderConfigWidget( Q_ASSERT(provider); m_hostWidget = new HostWidget(this); - m_mainLayout->addRow(tr("Host:"), m_hostWidget); + m_mainLayout->addRow(Tr::tr("Host:"), m_hostWidget); m_executableFileChooser = new Utils::PathChooser; m_executableFileChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); m_executableFileChooser->setCommandVersionArguments({"--version"}); - m_mainLayout->addRow(tr("Executable file:"), m_executableFileChooser); + m_mainLayout->addRow(Tr::tr("Executable file:"), m_executableFileChooser); m_rootScriptsDirChooser = new Utils::PathChooser; m_rootScriptsDirChooser->setExpectedKind(Utils::PathChooser::Directory); - m_mainLayout->addRow(tr("Root scripts directory:"), m_rootScriptsDirChooser); + m_mainLayout->addRow(Tr::tr("Root scripts directory:"), m_rootScriptsDirChooser); m_configurationFileChooser = new Utils::PathChooser; m_configurationFileChooser->setExpectedKind(Utils::PathChooser::File); m_configurationFileChooser->setPromptDialogFilter("*.cfg"); - m_mainLayout->addRow(tr("Configuration file:"), m_configurationFileChooser); + m_mainLayout->addRow(Tr::tr("Configuration file:"), m_configurationFileChooser); m_additionalArgumentsLineEdit = new QLineEdit(this); - m_mainLayout->addRow(tr("Additional arguments:"), m_additionalArgumentsLineEdit); + m_mainLayout->addRow(Tr::tr("Additional arguments:"), m_additionalArgumentsLineEdit); m_initCommandsTextEdit = new QPlainTextEdit(this); m_initCommandsTextEdit->setToolTip(defaultInitCommandsTooltip()); - m_mainLayout->addRow(tr("Init commands:"), m_initCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Init commands:"), m_initCommandsTextEdit); m_resetCommandsTextEdit = new QPlainTextEdit(this); m_resetCommandsTextEdit->setToolTip(defaultResetCommandsTooltip()); - m_mainLayout->addRow(tr("Reset commands:"), m_resetCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Reset commands:"), m_resetCommandsTextEdit); addErrorLabel(); setFromProvider(); @@ -274,5 +274,4 @@ void OpenOcdGdbServerProviderConfigWidget::setFromProvider() m_resetCommandsTextEdit->setPlainText(p->resetCommands()); } -} // namespace Internal -} // namespace ProjectExplorer +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h index 1e99ab31b17..06050e33339 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h @@ -11,8 +11,7 @@ QT_END_NAMESPACE namespace Utils { class PathChooser; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // OpenOcdGdbServerProvider @@ -59,11 +58,8 @@ public: class OpenOcdGdbServerProviderConfigWidget final : public GdbServerProviderConfigWidget { - Q_OBJECT - public: - explicit OpenOcdGdbServerProviderConfigWidget( - OpenOcdGdbServerProvider *provider); + explicit OpenOcdGdbServerProviderConfigWidget(OpenOcdGdbServerProvider *provider); private: void apply() final; @@ -81,5 +77,4 @@ private: QPlainTextEdit *m_resetCommandsTextEdit = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp index c297685235d..5f51e49d6a8 100644 --- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp @@ -4,9 +4,10 @@ #include "stlinkutilgdbserverprovider.h" #include +#include #include -#include +#include #include #include #include @@ -19,8 +20,7 @@ using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { const char executableFileKeyC[] = "ExecutableFile"; const char verboseLevelKeyC[] = "VerboseLevel"; @@ -36,7 +36,7 @@ StLinkUtilGdbServerProvider::StLinkUtilGdbServerProvider() setInitCommands(defaultInitCommands()); setResetCommands(defaultResetCommands()); setChannel("localhost", 4242); - setTypeDisplayName(GdbServerProvider::tr("ST-LINK Utility")); + setTypeDisplayName(Tr::tr("ST-LINK Utility")); setConfigurationWidgetCreator([this] { return new StLinkUtilGdbServerProviderConfigWidget(this); }); } @@ -151,7 +151,7 @@ bool StLinkUtilGdbServerProvider::operator==(const IDebugServerProvider &other) StLinkUtilGdbServerProviderFactory::StLinkUtilGdbServerProviderFactory() { setId(Constants::GDBSERVER_STLINK_UTIL_PROVIDER_ID); - setDisplayName(GdbServerProvider::tr("ST-LINK Utility")); + setDisplayName(Tr::tr("ST-LINK Utility")); setCreator([] { return new StLinkUtilGdbServerProvider; }); } @@ -164,36 +164,36 @@ StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget Q_ASSERT(p); m_hostWidget = new HostWidget(this); - m_mainLayout->addRow(tr("Host:"), m_hostWidget); + m_mainLayout->addRow(Tr::tr("Host:"), m_hostWidget); m_executableFileChooser = new Utils::PathChooser; m_executableFileChooser->setExpectedKind(Utils::PathChooser::ExistingCommand); - m_mainLayout->addRow(tr("Executable file:"), m_executableFileChooser); + m_mainLayout->addRow(Tr::tr("Executable file:"), m_executableFileChooser); m_verboseLevelSpinBox = new QSpinBox; m_verboseLevelSpinBox->setRange(0, 99); - m_verboseLevelSpinBox->setToolTip(tr("Specify the verbosity level (0..99).")); - m_mainLayout->addRow(tr("Verbosity level:"), m_verboseLevelSpinBox); + m_verboseLevelSpinBox->setToolTip(Tr::tr("Specify the verbosity level (0..99).")); + m_mainLayout->addRow(Tr::tr("Verbosity level:"), m_verboseLevelSpinBox); m_extendedModeCheckBox = new QCheckBox; - m_extendedModeCheckBox->setToolTip(tr("Continue listening for connections " + m_extendedModeCheckBox->setToolTip(Tr::tr("Continue listening for connections " "after disconnect.")); - m_mainLayout->addRow(tr("Extended mode:"), m_extendedModeCheckBox); + m_mainLayout->addRow(Tr::tr("Extended mode:"), m_extendedModeCheckBox); m_resetBoardCheckBox = new QCheckBox; - m_resetBoardCheckBox->setToolTip(tr("Reset board on connection.")); - m_mainLayout->addRow(tr("Reset on connection:"), m_resetBoardCheckBox); + m_resetBoardCheckBox->setToolTip(Tr::tr("Reset board on connection.")); + m_mainLayout->addRow(Tr::tr("Reset on connection:"), m_resetBoardCheckBox); m_transportLayerComboBox = new QComboBox; - m_transportLayerComboBox->setToolTip(tr("Transport layer type.")); - m_mainLayout->addRow(tr("Version:"), m_transportLayerComboBox); + m_transportLayerComboBox->setToolTip(Tr::tr("Transport layer type.")); + m_mainLayout->addRow(Tr::tr("Version:"), m_transportLayerComboBox); m_initCommandsTextEdit = new QPlainTextEdit(this); m_initCommandsTextEdit->setToolTip(defaultInitCommandsTooltip()); - m_mainLayout->addRow(tr("Init commands:"), m_initCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Init commands:"), m_initCommandsTextEdit); m_resetCommandsTextEdit = new QPlainTextEdit(this); m_resetCommandsTextEdit->setToolTip(defaultResetCommandsTooltip()); - m_mainLayout->addRow(tr("Reset commands:"), m_resetCommandsTextEdit); + m_mainLayout->addRow(Tr::tr("Reset commands:"), m_resetCommandsTextEdit); populateTransportLayers(); addErrorLabel(); @@ -273,13 +273,13 @@ void StLinkUtilGdbServerProviderConfigWidget::setTransportLayer( void StLinkUtilGdbServerProviderConfigWidget::populateTransportLayers() { m_transportLayerComboBox->insertItem( - m_transportLayerComboBox->count(), tr("ST-LINK/V1"), + m_transportLayerComboBox->count(), Tr::tr("ST-LINK/V1"), StLinkUtilGdbServerProvider::ScsiOverUsb); m_transportLayerComboBox->insertItem( - m_transportLayerComboBox->count(), tr("ST-LINK/V2"), + m_transportLayerComboBox->count(), Tr::tr("ST-LINK/V2"), StLinkUtilGdbServerProvider::RawUsb); m_transportLayerComboBox->insertItem( - m_transportLayerComboBox->count(), tr("Keep unspecified"), + m_transportLayerComboBox->count(), Tr::tr("Keep unspecified"), StLinkUtilGdbServerProvider::UnspecifiedTransport); } @@ -299,5 +299,4 @@ void StLinkUtilGdbServerProviderConfigWidget::setFromProvider() m_resetCommandsTextEdit->setPlainText(p->resetCommands()); } -} // namespace Internal -} // namespace ProjectExplorer +} // ProjectExplorer::Internal diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h index b8721dc7547..c6c72e01342 100644 --- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h @@ -12,8 +12,7 @@ QT_END_NAMESPACE namespace Utils { class PathChooser; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // StLinkUtilGdbServerProvider @@ -63,11 +62,8 @@ public: class StLinkUtilGdbServerProviderConfigWidget final : public GdbServerProviderConfigWidget { - Q_OBJECT - public: - explicit StLinkUtilGdbServerProviderConfigWidget( - StLinkUtilGdbServerProvider *provider); + explicit StLinkUtilGdbServerProviderConfigWidget(StLinkUtilGdbServerProvider *provider); private: void apply() final; @@ -90,5 +86,4 @@ private: QPlainTextEdit *m_resetCommandsTextEdit = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp index 6a9ead2ca9f..17ef097e8c3 100644 --- a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -25,8 +26,7 @@ using namespace Debugger; using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { using namespace Uv; @@ -155,7 +155,7 @@ bool JLinkUvscAdapterOptions::operator==(const JLinkUvscAdapterOptions &other) c JLinkUvscServerProvider::JLinkUvscServerProvider() : UvscServerProvider(Constants::UVSC_JLINK_PROVIDER_ID) { - setTypeDisplayName(UvscServerProvider::tr("uVision JLink")); + setTypeDisplayName(Tr::tr("uVision JLink")); setConfigurationWidgetCreator([this] { return new JLinkUvscServerProviderConfigWidget(this); }); setSupportedDrivers({"Segger\\JL2CM3.dll"}); } @@ -192,8 +192,7 @@ FilePath JLinkUvscServerProvider::optionsFilePath(DebuggerRunTool *runTool, Uv::ProjectOptionsWriter writer(&ofs); const JLinkUvProjectOptions projectOptions(this); if (!writer.write(&projectOptions)) { - errorMessage = BareMetalDebugSupport::tr( - "Unable to create a uVision project options template."); + errorMessage = Tr::tr("Unable to create a uVision project options template."); return {}; } return optionsPath; @@ -204,7 +203,7 @@ FilePath JLinkUvscServerProvider::optionsFilePath(DebuggerRunTool *runTool, JLinkUvscServerProviderFactory::JLinkUvscServerProviderFactory() { setId(Constants::UVSC_JLINK_PROVIDER_ID); - setDisplayName(UvscServerProvider::tr("uVision JLink")); + setDisplayName(Tr::tr("uVision JLink")); setCreator([] { return new JLinkUvscServerProvider; }); } @@ -217,7 +216,7 @@ JLinkUvscServerProviderConfigWidget::JLinkUvscServerProviderConfigWidget( Q_ASSERT(p); m_adapterOptionsWidget = new JLinkUvscAdapterOptionsWidget; - m_mainLayout->addRow(tr("Adapter options:"), m_adapterOptionsWidget); + m_mainLayout->addRow(Tr::tr("Adapter options:"), m_adapterOptionsWidget); setFromProvider(); @@ -265,10 +264,10 @@ JLinkUvscAdapterOptionsWidget::JLinkUvscAdapterOptionsWidget(QWidget *parent) { const auto layout = new QHBoxLayout; layout->setContentsMargins(0, 0, 0, 0); - layout->addWidget(new QLabel(tr("Port:"))); + layout->addWidget(new QLabel(Tr::tr("Port:"))); m_portBox = new QComboBox; layout->addWidget(m_portBox); - layout->addWidget(new QLabel(tr("Speed:"))); + layout->addWidget(new QLabel(Tr::tr("Speed:"))); m_speedBox = new QComboBox; layout->addWidget(m_speedBox); setLayout(layout); @@ -324,26 +323,25 @@ JLinkUvscAdapterOptions::Speed JLinkUvscAdapterOptionsWidget::speedAt(int index) void JLinkUvscAdapterOptionsWidget::populatePorts() { - m_portBox->addItem(tr("JTAG"), JLinkUvscAdapterOptions::JTAG); - m_portBox->addItem(tr("SWD"), JLinkUvscAdapterOptions::SWD); + m_portBox->addItem(Tr::tr("JTAG"), JLinkUvscAdapterOptions::JTAG); + m_portBox->addItem(Tr::tr("SWD"), JLinkUvscAdapterOptions::SWD); } void JLinkUvscAdapterOptionsWidget::populateSpeeds() { m_speedBox->clear(); - m_speedBox->addItem(tr("50MHz"), JLinkUvscAdapterOptions::Speed_50MHz); - m_speedBox->addItem(tr("33MHz"), JLinkUvscAdapterOptions::Speed_33MHz); - m_speedBox->addItem(tr("25MHz"), JLinkUvscAdapterOptions::Speed_25MHz); - m_speedBox->addItem(tr("20MHz"), JLinkUvscAdapterOptions::Speed_20MHz); - m_speedBox->addItem(tr("10MHz"), JLinkUvscAdapterOptions::Speed_10MHz); - m_speedBox->addItem(tr("5MHz"), JLinkUvscAdapterOptions::Speed_5MHz); - m_speedBox->addItem(tr("3MHz"), JLinkUvscAdapterOptions::Speed_3MHz); - m_speedBox->addItem(tr("2MHz"), JLinkUvscAdapterOptions::Speed_2MHz); - m_speedBox->addItem(tr("1MHz"), JLinkUvscAdapterOptions::Speed_1MHz); - m_speedBox->addItem(tr("500kHz"), JLinkUvscAdapterOptions::Speed_500kHz); - m_speedBox->addItem(tr("200kHz"), JLinkUvscAdapterOptions::Speed_200kHz); - m_speedBox->addItem(tr("100kHz"), JLinkUvscAdapterOptions::Speed_100kHz); + m_speedBox->addItem(Tr::tr("50MHz"), JLinkUvscAdapterOptions::Speed_50MHz); + m_speedBox->addItem(Tr::tr("33MHz"), JLinkUvscAdapterOptions::Speed_33MHz); + m_speedBox->addItem(Tr::tr("25MHz"), JLinkUvscAdapterOptions::Speed_25MHz); + m_speedBox->addItem(Tr::tr("20MHz"), JLinkUvscAdapterOptions::Speed_20MHz); + m_speedBox->addItem(Tr::tr("10MHz"), JLinkUvscAdapterOptions::Speed_10MHz); + m_speedBox->addItem(Tr::tr("5MHz"), JLinkUvscAdapterOptions::Speed_5MHz); + m_speedBox->addItem(Tr::tr("3MHz"), JLinkUvscAdapterOptions::Speed_3MHz); + m_speedBox->addItem(Tr::tr("2MHz"), JLinkUvscAdapterOptions::Speed_2MHz); + m_speedBox->addItem(Tr::tr("1MHz"), JLinkUvscAdapterOptions::Speed_1MHz); + m_speedBox->addItem(Tr::tr("500kHz"), JLinkUvscAdapterOptions::Speed_500kHz); + m_speedBox->addItem(Tr::tr("200kHz"), JLinkUvscAdapterOptions::Speed_200kHz); + m_speedBox->addItem(Tr::tr("100kHz"), JLinkUvscAdapterOptions::Speed_100kHz); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.h index f611eaa4994..9fa2c3cda7f 100644 --- a/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.h +++ b/src/plugins/baremetal/debugservers/uvsc/jlinkuvscserverprovider.h @@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE class QComboBox; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // JLinkUvscAdapterOptions @@ -66,8 +65,6 @@ public: class JLinkUvscAdapterOptionsWidget; class JLinkUvscServerProviderConfigWidget final : public UvscServerProviderConfigWidget { - Q_OBJECT - public: explicit JLinkUvscServerProviderConfigWidget(JLinkUvscServerProvider *provider); @@ -107,5 +104,4 @@ private: QComboBox *m_speedBox = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp index d1837ca24ce..e6e2150b2c5 100644 --- a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -23,8 +24,7 @@ using namespace Debugger; using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { using namespace Uv; @@ -60,7 +60,7 @@ public: SimulatorUvscServerProvider::SimulatorUvscServerProvider() : UvscServerProvider(Constants::UVSC_SIMULATOR_PROVIDER_ID) { - setTypeDisplayName(UvscServerProvider::tr("uVision Simulator")); + setTypeDisplayName(Tr::tr("uVision Simulator")); setConfigurationWidgetCreator([this] { return new SimulatorUvscServerProviderConfigWidget(this); }); setDriverSelection(defaultSimulatorDriverSelection()); } @@ -96,8 +96,7 @@ FilePath SimulatorUvscServerProvider::optionsFilePath(DebuggerRunTool *runTool, Uv::ProjectOptionsWriter writer(&ofs); const SimulatorUvProjectOptions projectOptions(this); if (!writer.write(&projectOptions)) { - errorMessage = BareMetalDebugSupport::tr( - "Unable to create a uVision project options template."); + errorMessage = Tr::tr("Unable to create a uVision project options template."); return {}; } return optionsPath; @@ -108,7 +107,7 @@ FilePath SimulatorUvscServerProvider::optionsFilePath(DebuggerRunTool *runTool, SimulatorUvscServerProviderFactory::SimulatorUvscServerProviderFactory() { setId(Constants::UVSC_SIMULATOR_PROVIDER_ID); - setDisplayName(UvscServerProvider::tr("uVision Simulator")); + setDisplayName(Tr::tr("uVision Simulator")); setCreator([] { return new SimulatorUvscServerProvider; }); } @@ -121,8 +120,8 @@ SimulatorUvscServerProviderConfigWidget::SimulatorUvscServerProviderConfigWidget Q_ASSERT(p); m_limitSpeedCheckBox = new QCheckBox; - m_limitSpeedCheckBox->setToolTip(tr("Limit speed to real-time.")); - m_mainLayout->addRow(tr("Limit speed to real-time:"), m_limitSpeedCheckBox); + m_limitSpeedCheckBox->setToolTip(Tr::tr("Limit speed to real-time.")); + m_mainLayout->addRow(Tr::tr("Limit speed to real-time:"), m_limitSpeedCheckBox); setFromProvider(); @@ -152,5 +151,4 @@ void SimulatorUvscServerProviderConfigWidget::setFromProvider() m_limitSpeedCheckBox->setChecked(p->m_limitSpeed); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h index ac9448b6aa3..619ea11ee4a 100644 --- a/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h +++ b/src/plugins/baremetal/debugservers/uvsc/simulatoruvscserverprovider.h @@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE class QCheckBox; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // SimulatorUvscServerProvider @@ -48,8 +47,6 @@ public: class SimulatorUvscServerProviderConfigWidget final : public UvscServerProviderConfigWidget { - Q_OBJECT - public: explicit SimulatorUvscServerProviderConfigWidget(SimulatorUvscServerProvider *provider); @@ -62,5 +59,4 @@ private: QCheckBox *m_limitSpeedCheckBox = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp index 0a41099fb1c..fec0d55cd76 100644 --- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.cpp @@ -7,6 +7,7 @@ #include "uvprojectwriter.h" #include +#include #include #include @@ -25,8 +26,7 @@ using namespace Debugger; using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { using namespace Uv; @@ -111,7 +111,7 @@ bool StLinkUvscAdapterOptions::operator==(const StLinkUvscAdapterOptions &other) StLinkUvscServerProvider::StLinkUvscServerProvider() : UvscServerProvider(Constants::UVSC_STLINK_PROVIDER_ID) { - setTypeDisplayName(UvscServerProvider::tr("uVision St-Link")); + setTypeDisplayName(Tr::tr("uVision St-Link")); setConfigurationWidgetCreator([this] { return new StLinkUvscServerProviderConfigWidget(this); }); setSupportedDrivers({"STLink\\ST-LINKIII-KEIL_SWO.dll"}); } @@ -148,8 +148,7 @@ FilePath StLinkUvscServerProvider::optionsFilePath(DebuggerRunTool *runTool, Uv::ProjectOptionsWriter writer(&ofs); const StLinkUvProjectOptions projectOptions(this); if (!writer.write(&projectOptions)) { - errorMessage = BareMetalDebugSupport::tr( - "Unable to create a uVision project options template."); + errorMessage = Tr::tr("Unable to create a uVision project options template."); return {}; } return optionsPath; @@ -160,7 +159,7 @@ FilePath StLinkUvscServerProvider::optionsFilePath(DebuggerRunTool *runTool, StLinkUvscServerProviderFactory::StLinkUvscServerProviderFactory() { setId(Constants::UVSC_STLINK_PROVIDER_ID); - setDisplayName(UvscServerProvider::tr("uVision St-Link")); + setDisplayName(Tr::tr("uVision St-Link")); setCreator([] { return new StLinkUvscServerProvider; }); } @@ -173,7 +172,7 @@ StLinkUvscServerProviderConfigWidget::StLinkUvscServerProviderConfigWidget( Q_ASSERT(p); m_adapterOptionsWidget = new StLinkUvscAdapterOptionsWidget; - m_mainLayout->addRow(tr("Adapter options:"), m_adapterOptionsWidget); + m_mainLayout->addRow(Tr::tr("Adapter options:"), m_adapterOptionsWidget); setFromProvider(); @@ -221,10 +220,10 @@ StLinkUvscAdapterOptionsWidget::StLinkUvscAdapterOptionsWidget(QWidget *parent) { const auto layout = new QHBoxLayout; layout->setContentsMargins(0, 0, 0, 0); - layout->addWidget(new QLabel(tr("Port:"))); + layout->addWidget(new QLabel(Tr::tr("Port:"))); m_portBox = new QComboBox; layout->addWidget(m_portBox); - layout->addWidget(new QLabel(tr("Speed:"))); + layout->addWidget(new QLabel(Tr::tr("Speed:"))); m_speedBox = new QComboBox; layout->addWidget(m_speedBox); setLayout(layout); @@ -280,8 +279,8 @@ StLinkUvscAdapterOptions::Speed StLinkUvscAdapterOptionsWidget::speedAt(int inde void StLinkUvscAdapterOptionsWidget::populatePorts() { - m_portBox->addItem(tr("JTAG"), StLinkUvscAdapterOptions::JTAG); - m_portBox->addItem(tr("SWD"), StLinkUvscAdapterOptions::SWD); + m_portBox->addItem(Tr::tr("JTAG"), StLinkUvscAdapterOptions::JTAG); + m_portBox->addItem(Tr::tr("SWD"), StLinkUvscAdapterOptions::SWD); } void StLinkUvscAdapterOptionsWidget::populateSpeeds() @@ -290,27 +289,26 @@ void StLinkUvscAdapterOptionsWidget::populateSpeeds() const auto port = portAt(m_portBox->currentIndex()); if (port == StLinkUvscAdapterOptions::JTAG) { - m_speedBox->addItem(tr("9MHz"), StLinkUvscAdapterOptions::Speed_9MHz); - m_speedBox->addItem(tr("4.5MHz"), StLinkUvscAdapterOptions::Speed_4_5MHz); - m_speedBox->addItem(tr("2.25MHz"), StLinkUvscAdapterOptions::Speed_2_25MHz); - m_speedBox->addItem(tr("1.12MHz"), StLinkUvscAdapterOptions::Speed_1_12MHz); - m_speedBox->addItem(tr("560kHz"), StLinkUvscAdapterOptions::Speed_560kHz); - m_speedBox->addItem(tr("280kHz"), StLinkUvscAdapterOptions::Speed_280kHz); - m_speedBox->addItem(tr("140kHz"), StLinkUvscAdapterOptions::Speed_140kHz); + m_speedBox->addItem(Tr::tr("9MHz"), StLinkUvscAdapterOptions::Speed_9MHz); + m_speedBox->addItem(Tr::tr("4.5MHz"), StLinkUvscAdapterOptions::Speed_4_5MHz); + m_speedBox->addItem(Tr::tr("2.25MHz"), StLinkUvscAdapterOptions::Speed_2_25MHz); + m_speedBox->addItem(Tr::tr("1.12MHz"), StLinkUvscAdapterOptions::Speed_1_12MHz); + m_speedBox->addItem(Tr::tr("560kHz"), StLinkUvscAdapterOptions::Speed_560kHz); + m_speedBox->addItem(Tr::tr("280kHz"), StLinkUvscAdapterOptions::Speed_280kHz); + m_speedBox->addItem(Tr::tr("140kHz"), StLinkUvscAdapterOptions::Speed_140kHz); } else if (port == StLinkUvscAdapterOptions::SWD) { - m_speedBox->addItem(tr("4MHz"), StLinkUvscAdapterOptions::Speed_4MHz); - m_speedBox->addItem(tr("1.8MHz"), StLinkUvscAdapterOptions::Speed_1_8MHz); - m_speedBox->addItem(tr("950kHz"), StLinkUvscAdapterOptions::Speed_950kHz); - m_speedBox->addItem(tr("480kHz"), StLinkUvscAdapterOptions::Speed_480kHz); - m_speedBox->addItem(tr("240kHz"), StLinkUvscAdapterOptions::Speed_240kHz); - m_speedBox->addItem(tr("125kHz"), StLinkUvscAdapterOptions::Speed_125kHz); - m_speedBox->addItem(tr("100kHz"), StLinkUvscAdapterOptions::Speed_100kHz); - m_speedBox->addItem(tr("50kHz"), StLinkUvscAdapterOptions::Speed_50kHz); - m_speedBox->addItem(tr("25kHz"), StLinkUvscAdapterOptions::Speed_25kHz); - m_speedBox->addItem(tr("15kHz"), StLinkUvscAdapterOptions::Speed_15kHz); - m_speedBox->addItem(tr("5kHz"), StLinkUvscAdapterOptions::Speed_5kHz); + m_speedBox->addItem(Tr::tr("4MHz"), StLinkUvscAdapterOptions::Speed_4MHz); + m_speedBox->addItem(Tr::tr("1.8MHz"), StLinkUvscAdapterOptions::Speed_1_8MHz); + m_speedBox->addItem(Tr::tr("950kHz"), StLinkUvscAdapterOptions::Speed_950kHz); + m_speedBox->addItem(Tr::tr("480kHz"), StLinkUvscAdapterOptions::Speed_480kHz); + m_speedBox->addItem(Tr::tr("240kHz"), StLinkUvscAdapterOptions::Speed_240kHz); + m_speedBox->addItem(Tr::tr("125kHz"), StLinkUvscAdapterOptions::Speed_125kHz); + m_speedBox->addItem(Tr::tr("100kHz"), StLinkUvscAdapterOptions::Speed_100kHz); + m_speedBox->addItem(Tr::tr("50kHz"), StLinkUvscAdapterOptions::Speed_50kHz); + m_speedBox->addItem(Tr::tr("25kHz"), StLinkUvscAdapterOptions::Speed_25kHz); + m_speedBox->addItem(Tr::tr("15kHz"), StLinkUvscAdapterOptions::Speed_15kHz); + m_speedBox->addItem(Tr::tr("5kHz"), StLinkUvscAdapterOptions::Speed_5kHz); } } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.h index 481ab83c1ed..5adf5fca214 100644 --- a/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.h +++ b/src/plugins/baremetal/debugservers/uvsc/stlinkuvscserverprovider.h @@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE class QComboBox; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // StLinkUvscAdapterOptions @@ -69,8 +68,6 @@ public: class StLinkUvscAdapterOptionsWidget; class StLinkUvscServerProviderConfigWidget final : public UvscServerProviderConfigWidget { - Q_OBJECT - public: explicit StLinkUvscServerProviderConfigWidget(StLinkUvscServerProvider *provider); @@ -110,5 +107,4 @@ private: QComboBox *m_speedBox = nullptr; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp index 8f09294ec3c..0fad93729ae 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvproject.cpp @@ -21,9 +21,7 @@ using namespace Debugger; using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { const char kProjectSchema[] = "2.1"; @@ -238,6 +236,4 @@ ProjectOptions::ProjectOptions(const UvscServerProvider *provider) m_debugOpt->appendProperty("uTrg", int(!useSimulator)); } -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // namespace BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvproject.h b/src/plugins/baremetal/debugservers/uvsc/uvproject.h index 8152c447e38..201a3e3a044 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvproject.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvproject.h @@ -10,8 +10,7 @@ namespace Debugger { class DebuggerRunTool; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { class UvscServerProvider; @@ -49,6 +48,6 @@ protected: Gen::Xml::PropertyGroup *m_debugOpt = nullptr; }; -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // Uv + +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/uvsc/uvprojectwriter.cpp b/src/plugins/baremetal/debugservers/uvsc/uvprojectwriter.cpp index ff212793ae4..b2e9cee6399 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvprojectwriter.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvprojectwriter.cpp @@ -3,9 +3,7 @@ #include "uvprojectwriter.h" -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // ProjectWriter @@ -51,6 +49,4 @@ void ProjectOptionsWriter::visitProjectOptionsEnd( writer()->writeEndElement(); } -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvprojectwriter.h b/src/plugins/baremetal/debugservers/uvsc/uvprojectwriter.h index 32e4cb0fa12..f0c8a13fa15 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvprojectwriter.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvprojectwriter.h @@ -5,9 +5,7 @@ #include "xmlprojectwriter.h" -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // ProjectWriter @@ -35,6 +33,4 @@ private: void visitProjectOptionsEnd(const Gen::Xml::ProjectOptions *projectOptions) final; }; -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp index c3630807725..28d80726bf4 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.cpp @@ -1,15 +1,16 @@ // Copyright (C) 2020 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "uvscserverprovider.h" + #include "uvproject.h" #include "uvprojectwriter.h" #include "uvtargetdeviceviewer.h" #include "uvtargetdriverviewer.h" -#include "uvscserverprovider.h" - #include #include +#include #include #include @@ -30,8 +31,7 @@ using namespace Debugger; using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { using namespace Uv; @@ -174,10 +174,10 @@ bool UvscServerProvider::aboutToRun(DebuggerRunTool *runTool, QString &errorMess const FilePath bin = exeAspect->executable; if (bin.isEmpty()) { - errorMessage = BareMetalDebugSupport::tr("Cannot debug: Local executable is not set."); + errorMessage = Tr::tr("Cannot debug: Local executable is not set."); return false; } else if (!bin.exists()) { - errorMessage = BareMetalDebugSupport::tr( + errorMessage = Tr::tr( "Cannot debug: Could not find executable for \"%1\".").arg(bin.toString()); return false; } @@ -236,8 +236,7 @@ FilePath UvscServerProvider::projectFilePath(DebuggerRunTool *runTool, QString & Uv::ProjectWriter writer(&ofs); const Uv::Project project(this, runTool); if (!writer.write(&project)) { - errorMessage = BareMetalDebugSupport::tr( - "Unable to create a uVision project template."); + errorMessage = Tr::tr("Unable to create a uVision project template."); return {}; } return projectPath; @@ -262,16 +261,16 @@ UvscServerProviderConfigWidget::UvscServerProviderConfigWidget(UvscServerProvide : IDebugServerProviderConfigWidget(provider) { m_hostWidget = new HostWidget; - m_mainLayout->addRow(tr("Host:"), m_hostWidget); + m_mainLayout->addRow(Tr::tr("Host:"), m_hostWidget); m_toolsIniChooser = new PathChooser; m_toolsIniChooser->setExpectedKind(PathChooser::File); m_toolsIniChooser->setPromptDialogFilter("tools.ini"); - m_toolsIniChooser->setPromptDialogTitle(tr("Choose Keil Toolset Configuration File")); - m_mainLayout->addRow(tr("Tools file path:"), m_toolsIniChooser); + m_toolsIniChooser->setPromptDialogTitle(Tr::tr("Choose Keil Toolset Configuration File")); + m_mainLayout->addRow(Tr::tr("Tools file path:"), m_toolsIniChooser); m_deviceSelector = new DeviceSelector; - m_mainLayout->addRow(tr("Target device:"), m_deviceSelector); + m_mainLayout->addRow(Tr::tr("Target device:"), m_deviceSelector); m_driverSelector = new DriverSelector(provider->supportedDrivers()); - m_mainLayout->addRow(tr("Target driver:"), m_driverSelector); + m_mainLayout->addRow(Tr::tr("Target driver:"), m_driverSelector); setFromProvider(); @@ -371,7 +370,8 @@ UvscServerProviderRunner::UvscServerProviderRunner(ProjectExplorer::RunControl * void UvscServerProviderRunner::start() { - const QString msg = RunControl::tr("Starting %1 ...").arg(m_process.commandLine().displayName()); + const QString msg = Tr::tr("Starting %1 ...") + .arg(m_process.commandLine().displayName()); appendMessage(msg, NormalMessageFormat); m_process.start(); @@ -382,5 +382,4 @@ void UvscServerProviderRunner::stop() m_process.terminate(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h index 469ac421eea..266cf27d172 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvscserverprovider.h @@ -28,8 +28,6 @@ class DriverSelector; class UvscServerProvider : public IDebugServerProvider { - Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::UvscServerProvider) - public: enum ToolsetNumber { UnknownToolsetNumber = -1, diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp index 32b1d3fad66..017d410f56a 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.cpp @@ -3,6 +3,8 @@ #include "uvtargetdevicemodel.h" +#include + #include #include @@ -12,9 +14,7 @@ using namespace Utils; -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { static QString extractPacksPath(const FilePath &toolsIniFile) { @@ -188,7 +188,7 @@ public: DeviceSelectionModel::DeviceSelectionModel(QObject *parent) : TreeModel(parent) { - setHeader({tr("Name"), tr("Version"), tr("Vendor")}); + setHeader({Tr::tr("Name"), Tr::tr("Version"), Tr::tr("Vendor")}); } void DeviceSelectionModel::fillAllPacks(const FilePath &toolsIniFile) @@ -478,6 +478,4 @@ DeviceSelection DeviceSelectionView::buildSelection(const DeviceSelectionItem *i return selection; } -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.h index d450595a73f..b171cede316 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdevicemodel.h @@ -13,9 +13,7 @@ QT_BEGIN_NAMESPACE class QXmlStreamReader; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // DeviceSelectionModel @@ -56,6 +54,4 @@ private: DeviceSelection buildSelection(const DeviceSelectionItem *item) const; }; -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp index 66cc3aaafcb..8f46069721b 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.cpp @@ -3,6 +3,8 @@ #include "uvtargetdeviceselection.h" +#include + #include #include #include @@ -11,9 +13,7 @@ using namespace Utils; -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // Software package data keys. constexpr char packageDescrKeyC[] = "PackageDescription"; @@ -243,7 +243,7 @@ private: DeviceSelectionMemoryModel::DeviceSelectionMemoryModel(DeviceSelection &selection, QObject *parent) : TreeModel(parent), m_selection(selection) { - setHeader({tr("ID"), tr("Start"), tr("Size")}); + setHeader({Tr::tr("ID"), Tr::tr("Start"), Tr::tr("Size")}); refresh(); } @@ -347,7 +347,7 @@ DeviceSelectionAlgorithmModel::DeviceSelectionAlgorithmModel(DeviceSelection &se QObject *parent) : TreeModel(parent), m_selection(selection) { - setHeader({tr("Name"), tr("FLASH Start"), tr("FLASH Size"), tr("RAM Start"), tr("RAM Size")}); + setHeader({Tr::tr("Name"), Tr::tr("FLASH Start"), Tr::tr("FLASH Size"), Tr::tr("RAM Start"), Tr::tr("RAM Size")}); refresh(); } @@ -373,27 +373,27 @@ DeviceSelectionAlgorithmView::DeviceSelectionAlgorithmView(DeviceSelection &sele const auto layout = new QGridLayout; layout->setContentsMargins(0, 0, 0, 0); m_comboBox = new QComboBox; - m_comboBox->setToolTip(tr("Algorithm path.")); + m_comboBox->setToolTip(Tr::tr("Algorithm path.")); m_comboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents); m_comboBox->setModel(model); layout->addWidget(m_comboBox, 0, 0, 1, 0); // Add FLASH area settings. - const auto flashLabel = new QLabel(tr("FLASH:")); + const auto flashLabel = new QLabel(Tr::tr("FLASH:")); layout->addWidget(flashLabel, 1, 0); const auto flashStartEdit = new QLineEdit; - flashStartEdit->setToolTip(tr("Start address.")); + flashStartEdit->setToolTip(Tr::tr("Start address.")); layout->addWidget(flashStartEdit, 1, 1); const auto flashSizeEdit = new QLineEdit; - flashSizeEdit->setToolTip(tr("Size.")); + flashSizeEdit->setToolTip(Tr::tr("Size.")); layout->addWidget(flashSizeEdit, 1, 2); // Add RAM area settings. - const auto ramLabel = new QLabel(tr("RAM:")); + const auto ramLabel = new QLabel(Tr::tr("RAM:")); layout->addWidget(ramLabel, 2, 0); const auto ramStartEdit = new QLineEdit; - ramStartEdit->setToolTip(tr("Start address.")); + ramStartEdit->setToolTip(Tr::tr("Start address.")); layout->addWidget(ramStartEdit, 2, 1); const auto ramSizeEdit = new QLineEdit; - ramSizeEdit->setToolTip(tr("Size.")); + ramSizeEdit->setToolTip(Tr::tr("Size.")); layout->addWidget(ramSizeEdit, 2, 2); setLayout(layout); @@ -431,6 +431,4 @@ void DeviceSelectionAlgorithmView::refresh() qobject_cast(m_comboBox->model())->refresh(); } -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.h index 11eb8a35bac..6db74052d39 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceselection.h @@ -10,9 +10,7 @@ QT_BEGIN_NAMESPACE class QComboBox; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // DeviceSelection @@ -142,8 +140,6 @@ private: QComboBox *m_comboBox = nullptr; }; -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv Q_DECLARE_METATYPE(BareMetal::Internal::Uv::DeviceSelection) diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp index 93f4f2a72fc..88e52e7df61 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.cpp @@ -1,9 +1,12 @@ // Copyright (C) 2020 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 +#include "uvtargetdeviceviewer.h" + #include "uvproject.h" // for buildPackageId() #include "uvtargetdevicemodel.h" -#include "uvtargetdeviceviewer.h" + +#include #include @@ -16,9 +19,7 @@ #include #include -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // DeviceSelectorToolPanel @@ -27,7 +28,7 @@ DeviceSelectorToolPanel::DeviceSelectorToolPanel(QWidget *parent) { const auto layout = new QHBoxLayout; layout->setContentsMargins(0, 0, 0, 0); - const auto button = new QPushButton(tr("Manage...")); + const auto button = new QPushButton(Tr::tr("Manage...")); layout->addWidget(button); setLayout(layout); connect(button, &QPushButton::clicked, this, &DeviceSelectorToolPanel::clicked); @@ -52,24 +53,24 @@ DeviceSelectorDetailsPanel::DeviceSelectorDetailsPanel(DeviceSelection &selectio const auto layout = new QFormLayout; m_vendorEdit = new QLineEdit; m_vendorEdit->setReadOnly(true); - layout->addRow(tr("Vendor:"), m_vendorEdit); + layout->addRow(Tr::tr("Vendor:"), m_vendorEdit); m_packageEdit = new QLineEdit; m_packageEdit->setReadOnly(true); - layout->addRow(tr("Package:"), m_packageEdit); + layout->addRow(Tr::tr("Package:"), m_packageEdit); m_descEdit = new QPlainTextEdit; m_descEdit->setReadOnly(true); - layout->addRow(tr("Description:"), m_descEdit); + layout->addRow(Tr::tr("Description:"), m_descEdit); m_memoryView = new DeviceSelectionMemoryView(m_selection); - layout->addRow(tr("Memory:"), m_memoryView); + layout->addRow(Tr::tr("Memory:"), m_memoryView); m_algorithmView = new DeviceSelectionAlgorithmView(m_selection); - layout->addRow(tr("Flash algorithm:"), m_algorithmView); + layout->addRow(Tr::tr("Flash algorithm:"), m_algorithmView); m_peripheralDescriptionFileChooser = new Utils::PathChooser(this); m_peripheralDescriptionFileChooser->setExpectedKind(Utils::PathChooser::File); m_peripheralDescriptionFileChooser->setPromptDialogFilter( - tr("Peripheral description files (*.svd)")); + Tr::tr("Peripheral description files (*.svd)")); m_peripheralDescriptionFileChooser->setPromptDialogTitle( - tr("Select Peripheral Description File")); - layout->addRow(tr("Peripheral description file:"), + Tr::tr("Select Peripheral Description File")); + layout->addRow(Tr::tr("Peripheral description file:"), m_peripheralDescriptionFileChooser); setLayout(layout); @@ -142,8 +143,8 @@ Utils::FilePath DeviceSelector::toolsIniFile() const void DeviceSelector::setSelection(const DeviceSelection &selection) { m_selection = selection; - const auto summary = m_selection.name.isEmpty() - ? tr("Target device not selected.") : m_selection.name; + const QString summary = m_selection.name.isEmpty() + ? Tr::tr("Target device not selected.") : m_selection.name; setSummaryText(summary); setExpandable(!m_selection.name.isEmpty()); @@ -163,7 +164,7 @@ DeviceSelection DeviceSelector::selection() const DeviceSelectionDialog::DeviceSelectionDialog(const Utils::FilePath &toolsIniFile, QWidget *parent) : QDialog(parent), m_model(new DeviceSelectionModel(this)), m_view(new DeviceSelectionView(this)) { - setWindowTitle(tr("Available Target Devices")); + setWindowTitle(Tr::tr("Available Target Devices")); const auto layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); @@ -194,6 +195,4 @@ DeviceSelection DeviceSelectionDialog::selection() const return m_selection; } -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h index 00b53fdf232..dae289f8c6d 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdeviceviewer.h @@ -18,9 +18,7 @@ QT_END_NAMESPACE namespace Utils { class PathChooser; } -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { class DeviceSelectionModel; class DeviceSelectionView; @@ -108,6 +106,4 @@ private: DeviceSelectionView *m_view = nullptr; }; -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.cpp index 50cbf216d6f..6bdc67ab592 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.cpp @@ -3,14 +3,14 @@ #include "uvtargetdrivermodel.h" +#include + #include #include using namespace Utils; -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { constexpr char cpuDllKey[] = "CPUDLL"; constexpr char driverKey[] = "TDRV"; @@ -106,7 +106,7 @@ public: DriverSelectionModel::DriverSelectionModel(QObject *parent) : TreeModel(parent) { - setHeader({tr("Path")}); + setHeader({Tr::tr("Path")}); } void DriverSelectionModel::fillDrivers(const FilePath &toolsIniFile, @@ -181,6 +181,4 @@ void DriverSelectionView::currentChanged(const QModelIndex ¤t, const QMode emit driverSelected(selection); } -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.h index b9a075688e1..0d1f1bf1f50 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdrivermodel.h @@ -9,9 +9,7 @@ #include #include -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // DriverSelectionModel @@ -41,6 +39,4 @@ private: void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) final; }; -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp index 1803dacb959..c3356eee64a 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.cpp @@ -3,15 +3,15 @@ #include "uvtargetdriverselection.h" +#include + #include #include #include using namespace Utils; -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // Driver data keys. constexpr char driverIndexKeyC[] = "DriverIndex"; @@ -79,7 +79,7 @@ private: DriverSelectionCpuDllModel::DriverSelectionCpuDllModel(DriverSelection &selection, QObject *parent) : TreeModel(parent), m_selection(selection) { - setHeader({tr("Name")}); + setHeader({Tr::tr("Name")}); refresh(); } @@ -104,7 +104,7 @@ DriverSelectionCpuDllView::DriverSelectionCpuDllView(DriverSelection &selection, const auto layout = new QHBoxLayout; layout->setContentsMargins(0, 0, 0, 0); m_comboBox = new QComboBox; - m_comboBox->setToolTip(tr("Debugger CPU library (depends on a CPU core).")); + m_comboBox->setToolTip(Tr::tr("Debugger CPU library (depends on a CPU core).")); m_comboBox->setSizeAdjustPolicy(QComboBox::AdjustToContents); m_comboBox->setModel(model); layout->addWidget(m_comboBox); @@ -125,6 +125,4 @@ void DriverSelectionCpuDllView::refresh() qobject_cast(m_comboBox->model())->refresh(); } -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.h index fdd62a8354a..bfb254446f6 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverselection.h @@ -10,9 +10,7 @@ QT_BEGIN_NAMESPACE class QComboBox; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // DriverSelection @@ -65,8 +63,6 @@ private: QComboBox *m_comboBox = nullptr; }; -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv Q_DECLARE_METATYPE(BareMetal::Internal::Uv::DriverSelection) diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverviewer.cpp b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverviewer.cpp index d33e35bb64f..581b204f199 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverviewer.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverviewer.cpp @@ -1,10 +1,11 @@ // Copyright (C) 2020 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "uvproject.h" // for targetUVisionPath() #include "uvtargetdrivermodel.h" #include "uvtargetdriverviewer.h" +#include + #include #include #include @@ -14,9 +15,7 @@ #include #include -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { // DriverSelectorToolPanel @@ -25,7 +24,7 @@ DriverSelectorToolPanel::DriverSelectorToolPanel(QWidget *parent) { const auto layout = new QHBoxLayout; layout->setContentsMargins(0, 0, 0, 0); - const auto button = new QPushButton(tr("Manage...")); + const auto button = new QPushButton(Tr::tr("Manage...")); layout->addWidget(button); setLayout(layout); connect(button, &QPushButton::clicked, this, &DriverSelectorToolPanel::clicked); @@ -49,10 +48,10 @@ DriverSelectorDetailsPanel::DriverSelectorDetailsPanel(DriverSelection &selectio const auto layout = new QFormLayout; m_dllEdit = new QLineEdit;; m_dllEdit->setReadOnly(true); - m_dllEdit->setToolTip(tr("Debugger driver library.")); - layout->addRow(tr("Driver library:"), m_dllEdit); + m_dllEdit->setToolTip(Tr::tr("Debugger driver library.")); + layout->addRow(Tr::tr("Driver library:"), m_dllEdit); m_cpuDllView = new DriverSelectionCpuDllView(m_selection); - layout->addRow(tr("CPU library:"), m_cpuDllView); + layout->addRow(Tr::tr("CPU library:"), m_cpuDllView); setLayout(layout); refresh(); @@ -111,7 +110,7 @@ void DriverSelector::setSelection(const DriverSelection &selection) { m_selection = selection; const auto summary = m_selection.name.isEmpty() - ? tr("Target driver not selected.") : m_selection.name; + ? Tr::tr("Target driver not selected.") : m_selection.name; setSummaryText(summary); setExpandable(!m_selection.name.isEmpty()); @@ -134,7 +133,7 @@ DriverSelectionDialog::DriverSelectionDialog(const Utils::FilePath &toolsIniFile : QDialog(parent), m_model(new DriverSelectionModel(this)), m_view(new DriverSelectionView(this)) { - setWindowTitle(tr("Available Target Drivers")); + setWindowTitle(Tr::tr("Available Target Drivers")); const auto layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); @@ -165,6 +164,4 @@ DriverSelection DriverSelectionDialog::selection() const return m_selection; } -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverviewer.h b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverviewer.h index 35b32c97581..779d6a7b53a 100644 --- a/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverviewer.h +++ b/src/plugins/baremetal/debugservers/uvsc/uvtargetdriverviewer.h @@ -15,9 +15,7 @@ QT_BEGIN_NAMESPACE class QLineEdit; QT_END_NAMESPACE -namespace BareMetal { -namespace Internal { -namespace Uv { +namespace BareMetal::Internal::Uv { class DriverSelectionModel; class DriverSelectionView; @@ -102,6 +100,4 @@ private: DriverSelectionView *m_view = nullptr; }; -} // namespace Uv -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal::Uv diff --git a/src/plugins/baremetal/debugservers/uvsc/xmlnodevisitor.h b/src/plugins/baremetal/debugservers/uvsc/xmlnodevisitor.h index f3806c76fb7..c1fd8519746 100644 --- a/src/plugins/baremetal/debugservers/uvsc/xmlnodevisitor.h +++ b/src/plugins/baremetal/debugservers/uvsc/xmlnodevisitor.h @@ -5,9 +5,7 @@ #include -namespace BareMetal { -namespace Gen { -namespace Xml { +namespace BareMetal::Gen::Xml { class Project; class ProjectOptions; @@ -34,6 +32,4 @@ public: virtual void visitPropertyGroupEnd(const PropertyGroup *propertyGroup) = 0; }; -} // namespace Xml -} // namespace Gen -} // namespace BareMetal +} // BareMetal::Gen::Xml diff --git a/src/plugins/baremetal/debugservers/uvsc/xmlproject.cpp b/src/plugins/baremetal/debugservers/uvsc/xmlproject.cpp index c260f37c51c..f36c1ccb6d1 100644 --- a/src/plugins/baremetal/debugservers/uvsc/xmlproject.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/xmlproject.cpp @@ -4,9 +4,7 @@ #include "xmlnodevisitor.h" #include "xmlproject.h" -namespace BareMetal { -namespace Gen { -namespace Xml { +namespace BareMetal::Gen::Xml { // Project @@ -32,6 +30,4 @@ void ProjectOptions::accept(INodeVisitor *visitor) const visitor->visitProjectOptionsEnd(this); } -} // namespace Xml -} // namespace Gen -} // namespace BareMetal +} // BareMetal::Gen::Xml diff --git a/src/plugins/baremetal/debugservers/uvsc/xmlproject.h b/src/plugins/baremetal/debugservers/uvsc/xmlproject.h index 7acbcfc100f..5d3385d8690 100644 --- a/src/plugins/baremetal/debugservers/uvsc/xmlproject.h +++ b/src/plugins/baremetal/debugservers/uvsc/xmlproject.h @@ -7,9 +7,7 @@ #include -namespace BareMetal { -namespace Gen { -namespace Xml { +namespace BareMetal::Gen::Xml { // Project @@ -27,6 +25,4 @@ public: void accept(INodeVisitor *visitor) const final; }; -} // namespace Xml -} // namespace Gen -} // namespace BareMetal +} // BareMetal::Gen::Xml diff --git a/src/plugins/baremetal/debugservers/uvsc/xmlprojectwriter.cpp b/src/plugins/baremetal/debugservers/uvsc/xmlprojectwriter.cpp index b04b953778f..7053e399ba2 100644 --- a/src/plugins/baremetal/debugservers/uvsc/xmlprojectwriter.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/xmlprojectwriter.cpp @@ -8,9 +8,7 @@ #include -namespace BareMetal { -namespace Gen { -namespace Xml { +namespace BareMetal::Gen::Xml { // ProjectWriter @@ -114,6 +112,4 @@ QXmlStreamWriter *ProjectOptionsWriter::writer() const return m_writer.get(); } -} // namespace Xml -} // namespace Gen -} // namespace BareMetal +} // BareMetal::Gen::Xml diff --git a/src/plugins/baremetal/debugservers/uvsc/xmlprojectwriter.h b/src/plugins/baremetal/debugservers/uvsc/xmlprojectwriter.h index 8e0fbe2cfa5..569adf3b5b4 100644 --- a/src/plugins/baremetal/debugservers/uvsc/xmlprojectwriter.h +++ b/src/plugins/baremetal/debugservers/uvsc/xmlprojectwriter.h @@ -7,9 +7,7 @@ #include -namespace BareMetal { -namespace Gen { -namespace Xml { +namespace BareMetal::Gen::Xml { // ProjectWriter @@ -59,6 +57,4 @@ private: std::unique_ptr m_writer; }; -} // namespace Xml -} // namespace Gen -} // namespace BareMetal +} // BareMetal::Gen::Xml diff --git a/src/plugins/baremetal/debugservers/uvsc/xmlproperty.cpp b/src/plugins/baremetal/debugservers/uvsc/xmlproperty.cpp index b1221f61560..0f613dac3de 100644 --- a/src/plugins/baremetal/debugservers/uvsc/xmlproperty.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/xmlproperty.cpp @@ -4,9 +4,7 @@ #include "xmlnodevisitor.h" #include "xmlproperty.h" -namespace BareMetal { -namespace Gen { -namespace Xml { +namespace BareMetal::Gen::Xml { Property::Property(QByteArray name, QVariant value) { @@ -35,6 +33,4 @@ void Property::accept(INodeVisitor *visitor) const visitor->visitPropertyEnd(this); } -} // namespace Xml -} // namespace Gen -} // namespace BareMetal +} // BareMetal::Gen::Xml diff --git a/src/plugins/baremetal/debugservers/uvsc/xmlproperty.h b/src/plugins/baremetal/debugservers/uvsc/xmlproperty.h index bb7c0ef75e1..c9da23883c7 100644 --- a/src/plugins/baremetal/debugservers/uvsc/xmlproperty.h +++ b/src/plugins/baremetal/debugservers/uvsc/xmlproperty.h @@ -7,9 +7,7 @@ #include -namespace BareMetal { -namespace Gen { -namespace Xml { +namespace BareMetal::Gen::Xml { class INodeVisitor; @@ -55,6 +53,4 @@ private: std::vector> m_children; }; -} // namespace Xml -} // namespace Gen -} // namespace BareMetal +} // BareMetal::Gen::Xml diff --git a/src/plugins/baremetal/debugservers/uvsc/xmlpropertygroup.cpp b/src/plugins/baremetal/debugservers/uvsc/xmlpropertygroup.cpp index 39bed14701e..6b1f594073b 100644 --- a/src/plugins/baremetal/debugservers/uvsc/xmlpropertygroup.cpp +++ b/src/plugins/baremetal/debugservers/uvsc/xmlpropertygroup.cpp @@ -4,9 +4,7 @@ #include "xmlnodevisitor.h" #include "xmlpropertygroup.h" -namespace BareMetal { -namespace Gen { -namespace Xml { +namespace BareMetal::Gen::Xml { PropertyGroup::PropertyGroup(QByteArray name) { @@ -28,6 +26,4 @@ void PropertyGroup::accept(INodeVisitor *visitor) const visitor->visitPropertyGroupEnd(this); } -} // namespace Xml -} // namespace Gen -} // namespace BareMetal +} // BareMetal::Gen::Xml diff --git a/src/plugins/baremetal/iarewparser.cpp b/src/plugins/baremetal/iarewparser.cpp index e837298140f..a334acff8f1 100644 --- a/src/plugins/baremetal/iarewparser.cpp +++ b/src/plugins/baremetal/iarewparser.cpp @@ -11,8 +11,7 @@ using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // Helpers: @@ -222,8 +221,7 @@ void IarParser::flush() m_lines = 0; } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal // Unit tests: diff --git a/src/plugins/baremetal/iarewparser.h b/src/plugins/baremetal/iarewparser.h index 5d27f2466e7..8df76280ce0 100644 --- a/src/plugins/baremetal/iarewparser.h +++ b/src/plugins/baremetal/iarewparser.h @@ -6,15 +6,10 @@ #include #include -namespace BareMetal { -namespace Internal { - -// IarParser +namespace BareMetal::Internal { class IarParser final : public ProjectExplorer::OutputTaskParser { - Q_OBJECT - public: explicit IarParser(); static Utils::Id id(); @@ -43,5 +38,4 @@ private: QStringList m_descriptionParts; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 7337fafd5c8..6972a92bd9b 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -1,11 +1,12 @@ // Copyright (C) 2019 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "baremetalconstants.h" - -#include "iarewparser.h" #include "iarewtoolchain.h" +#include "baremetalconstants.h" +#include "baremetaltr.h" +#include "iarewparser.h" + #include #include #include @@ -30,8 +31,7 @@ using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // Helpers: @@ -259,7 +259,7 @@ static QString buildDisplayName(Abi::Architecture arch, Utils::Id language, { const auto archName = Abi::toString(arch); const auto langName = ToolChainManager::displayNameOfLanguageId(language); - return IarToolChain::tr("IAREW %1 (%2, %3)").arg(version, langName, archName); + return Tr::tr("IAREW %1 (%2, %3)").arg(version, langName, archName); } // IarToolChain @@ -267,7 +267,7 @@ static QString buildDisplayName(Abi::Architecture arch, Utils::Id language, IarToolChain::IarToolChain() : ToolChain(Constants::IAREW_TOOLCHAIN_TYPEID) { - setTypeDisplayName(Internal::IarToolChain::tr("IAREW")); + setTypeDisplayName(Tr::tr("IAREW")); setTargetAbiKey("TargetAbi"); setCompilerCommandKey("CompilerPath"); } @@ -401,7 +401,7 @@ FilePath IarToolChain::makeCommand(const Environment &env) const IarToolChainFactory::IarToolChainFactory() { - setDisplayName(IarToolChain::tr("IAREW")); + setDisplayName(Tr::tr("IAREW")); setSupportedToolChainType(Constants::IAREW_TOOLCHAIN_TYPEID); setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID, ProjectExplorer::Constants::CXX_LANGUAGE_ID}); @@ -545,11 +545,11 @@ IarToolChainConfigWidget::IarToolChainConfigWidget(IarToolChain *tc) : { m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand); m_compilerCommand->setHistoryCompleter("PE.IAREW.Command.History"); - m_mainLayout->addRow(tr("&Compiler path:"), m_compilerCommand); + m_mainLayout->addRow(Tr::tr("&Compiler path:"), m_compilerCommand); m_platformCodeGenFlagsLineEdit = new QLineEdit(this); m_platformCodeGenFlagsLineEdit->setText(ProcessArgs::joinArgs(tc->extraCodeModelFlags())); - m_mainLayout->addRow(tr("Platform codegen flags:"), m_platformCodeGenFlagsLineEdit); - m_mainLayout->addRow(tr("&ABI:"), m_abiWidget); + m_mainLayout->addRow(Tr::tr("Platform codegen flags:"), m_platformCodeGenFlagsLineEdit); + m_mainLayout->addRow(Tr::tr("&ABI:"), m_abiWidget); m_abiWidget->setEnabled(false); @@ -639,5 +639,4 @@ void IarToolChainConfigWidget::handlePlatformCodeGenFlagsChange() handleCompilerCommandChange(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/iarewtoolchain.h b/src/plugins/baremetal/iarewtoolchain.h index 1306f35ecb2..b6240de23f6 100644 --- a/src/plugins/baremetal/iarewtoolchain.h +++ b/src/plugins/baremetal/iarewtoolchain.h @@ -21,15 +21,12 @@ class PathChooser; namespace ProjectExplorer { class AbiWidget; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // IarToolChain class IarToolChain final : public ProjectExplorer::ToolChain { - Q_DECLARE_TR_FUNCTIONS(IarToolChain) - public: MacroInspectionRunner createMacroInspectionRunner() const final; @@ -105,5 +102,4 @@ private: ProjectExplorer::Macros m_macros; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/idebugserverprovider.cpp b/src/plugins/baremetal/idebugserverprovider.cpp index 16850d6e0da..6ce5d768b23 100644 --- a/src/plugins/baremetal/idebugserverprovider.cpp +++ b/src/plugins/baremetal/idebugserverprovider.cpp @@ -1,14 +1,15 @@ // Copyright (C) 2019 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "baremetaldevice.h" -#include "debugserverprovidermanager.h" #include "idebugserverprovider.h" +#include "baremetaldevice.h" +#include "baremetaltr.h" +#include "debugserverprovidermanager.h" + #include #include -#include #include #include #include @@ -18,8 +19,7 @@ using namespace Debugger; using namespace ProjectExplorer; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { const char idKeyC[] = "Id"; const char displayNameKeyC[] = "DisplayName"; @@ -255,8 +255,8 @@ IDebugServerProviderConfigWidget::IDebugServerProviderConfigWidget( m_mainLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); m_nameLineEdit = new QLineEdit(this); - m_nameLineEdit->setToolTip(tr("Enter the name of the debugger server provider.")); - m_mainLayout->addRow(tr("Name:"), m_nameLineEdit); + m_nameLineEdit->setToolTip(Tr::tr("Enter the name of the debugger server provider.")); + m_mainLayout->addRow(Tr::tr("Name:"), m_nameLineEdit); setFromProvider(); @@ -315,12 +315,12 @@ HostWidget::HostWidget(QWidget *parent) : QWidget(parent) { m_hostLineEdit = new QLineEdit(this); - m_hostLineEdit->setToolTip(tr("Enter TCP/IP hostname of the debug server, " - "like \"localhost\" or \"192.0.2.1\".")); + m_hostLineEdit->setToolTip(Tr::tr("Enter TCP/IP hostname of the debug server, " + "like \"localhost\" or \"192.0.2.1\".")); m_portSpinBox = new QSpinBox(this); m_portSpinBox->setRange(0, 65535); - m_portSpinBox->setToolTip(tr("Enter TCP/IP port which will be listened by " - "the debug server.")); + m_portSpinBox->setToolTip(Tr::tr("Enter TCP/IP port which will be listened by " + "the debug server.")); const auto layout = new QHBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); layout->addWidget(m_hostLineEdit); @@ -345,5 +345,4 @@ QUrl HostWidget::channel() const return url; } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/keilparser.cpp b/src/plugins/baremetal/keilparser.cpp index 2b3267782ad..11554cf2547 100644 --- a/src/plugins/baremetal/keilparser.cpp +++ b/src/plugins/baremetal/keilparser.cpp @@ -11,8 +11,7 @@ using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // Helpers: @@ -243,8 +242,7 @@ void KeilParser::flush() m_lines = 0; } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal // Unit tests: @@ -253,8 +251,7 @@ void KeilParser::flush() #include #include -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { void BareMetalPlugin::testKeilOutputParsers_data() { @@ -523,7 +520,6 @@ void BareMetalPlugin::testKeilOutputParsers() outputLines); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal #endif // WITH_TESTS diff --git a/src/plugins/baremetal/keilparser.h b/src/plugins/baremetal/keilparser.h index 49bdc5aec54..bc0deb49b4d 100644 --- a/src/plugins/baremetal/keilparser.h +++ b/src/plugins/baremetal/keilparser.h @@ -6,15 +6,10 @@ #include #include -namespace BareMetal { -namespace Internal { - -// KeilParser +namespace BareMetal::Internal { class KeilParser final : public ProjectExplorer::OutputTaskParser { - Q_OBJECT - public: explicit KeilParser(); static Utils::Id id(); @@ -40,5 +35,4 @@ private: QStringList m_snippets; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 387049f29a4..4e25a84edb8 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -3,6 +3,7 @@ #include "baremetalconstants.h" +#include "baremetaltr.h" #include "keilparser.h" #include "keiltoolchain.h" @@ -32,8 +33,7 @@ using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // Helpers: @@ -373,7 +373,7 @@ static Abi::BinaryFormat guessFormat(Abi::Architecture arch) static Abi guessAbi(const Macros ¯os) { - const auto arch = guessArchitecture(macros); + const Abi::Architecture arch = guessArchitecture(macros); return {arch, Abi::OS::BareMetalOS, Abi::OSFlavor::GenericFlavor, guessFormat(arch), guessWordWidth(macros, arch)}; } @@ -381,10 +381,9 @@ static Abi guessAbi(const Macros ¯os) static QString buildDisplayName(Abi::Architecture arch, Utils::Id language, const QString &version) { - const auto archName = Abi::toString(arch); - const auto langName = ToolChainManager::displayNameOfLanguageId(language); - return KeilToolChain::tr("KEIL %1 (%2, %3)") - .arg(version, langName, archName); + const QString archName = Abi::toString(arch); + const QString langName = ToolChainManager::displayNameOfLanguageId(language); + return Tr::tr("KEIL %1 (%2, %3)").arg(version, langName, archName); } static void addDefaultCpuArgs(const FilePath &compiler, QStringList &extraArgs) @@ -406,7 +405,7 @@ static void addDefaultCpuArgs(const FilePath &compiler, QStringList &extraArgs) KeilToolChain::KeilToolChain() : ToolChain(Constants::KEIL_TOOLCHAIN_TYPEID) { - setTypeDisplayName(tr("KEIL")); + setTypeDisplayName(Tr::tr("KEIL")); setTargetAbiKey("TargetAbi"); setCompilerCommandKey("CompilerPath"); } @@ -527,7 +526,7 @@ FilePath KeilToolChain::makeCommand(const Environment &env) const KeilToolChainFactory::KeilToolChainFactory() { - setDisplayName(KeilToolChain::tr("KEIL")); + setDisplayName(Tr::tr("KEIL")); setSupportedToolChainType(Constants::KEIL_TOOLCHAIN_TYPEID); setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID, ProjectExplorer::Constants::CXX_LANGUAGE_ID}); @@ -701,11 +700,11 @@ KeilToolChainConfigWidget::KeilToolChainConfigWidget(KeilToolChain *tc) : { m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand); m_compilerCommand->setHistoryCompleter("PE.KEIL.Command.History"); - m_mainLayout->addRow(tr("&Compiler path:"), m_compilerCommand); + m_mainLayout->addRow(Tr::tr("&Compiler path:"), m_compilerCommand); m_platformCodeGenFlagsLineEdit = new QLineEdit(this); m_platformCodeGenFlagsLineEdit->setText(ProcessArgs::joinArgs(tc->extraCodeModelFlags())); - m_mainLayout->addRow(tr("Platform codegen flags:"), m_platformCodeGenFlagsLineEdit); - m_mainLayout->addRow(tr("&ABI:"), m_abiWidget); + m_mainLayout->addRow(Tr::tr("Platform codegen flags:"), m_platformCodeGenFlagsLineEdit); + m_mainLayout->addRow(Tr::tr("&ABI:"), m_abiWidget); m_abiWidget->setEnabled(false); @@ -798,5 +797,4 @@ void KeilToolChainConfigWidget::handlePlatformCodeGenFlagsChange() handleCompilerCommandChange(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/keiltoolchain.h b/src/plugins/baremetal/keiltoolchain.h index 4c427b75b15..9d45dafe2b3 100644 --- a/src/plugins/baremetal/keiltoolchain.h +++ b/src/plugins/baremetal/keiltoolchain.h @@ -14,22 +14,16 @@ class QPushButton; class QTextEdit; QT_END_NAMESPACE -namespace Utils { -class FilePath; -class PathChooser; -} +namespace Utils { class PathChooser; } namespace ProjectExplorer { class AbiWidget; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // KeilToolChain class KeilToolChain final : public ProjectExplorer::ToolChain { - Q_DECLARE_TR_FUNCTIONS(KeilToolChain) - public: MacroInspectionRunner createMacroInspectionRunner() const final; @@ -83,8 +77,6 @@ private: class KeilToolChainConfigWidget final : public ProjectExplorer::ToolChainConfigWidget { - Q_OBJECT - public: explicit KeilToolChainConfigWidget(KeilToolChain *tc); @@ -104,5 +96,4 @@ private: ProjectExplorer::Macros m_macros; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/sdccparser.cpp b/src/plugins/baremetal/sdccparser.cpp index 07cd5b377eb..df677ff819e 100644 --- a/src/plugins/baremetal/sdccparser.cpp +++ b/src/plugins/baremetal/sdccparser.cpp @@ -11,8 +11,7 @@ using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // Helpers: @@ -137,8 +136,7 @@ void SdccParser::flush() m_lines = 0; } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal // Unit tests: @@ -147,8 +145,7 @@ void SdccParser::flush() #include #include -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { void BareMetalPlugin::testSdccOutputParsers_data() { @@ -310,7 +307,6 @@ void BareMetalPlugin::testSdccOutputParsers() outputLines); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal #endif // WITH_TESTS diff --git a/src/plugins/baremetal/sdccparser.h b/src/plugins/baremetal/sdccparser.h index 0fb59727a77..e13f96f8019 100644 --- a/src/plugins/baremetal/sdccparser.h +++ b/src/plugins/baremetal/sdccparser.h @@ -6,15 +6,10 @@ #include #include -namespace BareMetal { -namespace Internal { - -// SdccParser +namespace BareMetal::Internal { class SdccParser final : public ProjectExplorer::OutputTaskParser { - Q_OBJECT - public: explicit SdccParser(); static Utils::Id id(); @@ -30,5 +25,4 @@ private: int m_lines = 0; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index 0fc7eb0f925..38ef6c54770 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -1,11 +1,12 @@ // Copyright (C) 2019 Denis Shienkov // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 -#include "baremetalconstants.h" - -#include "sdccparser.h" #include "sdcctoolchain.h" +#include "baremetalconstants.h" +#include "baremetaltr.h" +#include "sdccparser.h" + #include #include #include @@ -31,8 +32,7 @@ using namespace ProjectExplorer; using namespace Utils; -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // Helpers: @@ -163,7 +163,7 @@ static Abi::BinaryFormat guessFormat(Abi::Architecture arch) static Abi guessAbi(const Macros ¯os) { - const auto arch = guessArchitecture(macros); + const Abi::Architecture arch = guessArchitecture(macros); return {arch, Abi::OS::BareMetalOS, Abi::OSFlavor::GenericFlavor, guessFormat(arch), guessWordWidth(macros)}; } @@ -171,10 +171,9 @@ static Abi guessAbi(const Macros ¯os) static QString buildDisplayName(Abi::Architecture arch, Utils::Id language, const QString &version) { - const auto archName = Abi::toString(arch); - const auto langName = ToolChainManager::displayNameOfLanguageId(language); - return SdccToolChain::tr("SDCC %1 (%2, %3)") - .arg(version, langName, archName); + const QString archName = Abi::toString(arch); + const QString langName = ToolChainManager::displayNameOfLanguageId(language); + return Tr::tr("SDCC %1 (%2, %3)").arg(version, langName, archName); } static Utils::FilePath compilerPathFromEnvironment(const QString &compilerName) @@ -188,7 +187,7 @@ static Utils::FilePath compilerPathFromEnvironment(const QString &compilerName) SdccToolChain::SdccToolChain() : ToolChain(Constants::SDCC_TOOLCHAIN_TYPEID) { - setTypeDisplayName(Internal::SdccToolChain::tr("SDCC")); + setTypeDisplayName(Tr::tr("SDCC")); setTargetAbiKey("TargetAbi"); setCompilerCommandKey("CompilerPath"); } @@ -277,7 +276,7 @@ FilePath SdccToolChain::makeCommand(const Environment &env) const SdccToolChainFactory::SdccToolChainFactory() { - setDisplayName(SdccToolChain::tr("SDCC")); + setDisplayName(Tr::tr("SDCC")); setSupportedToolChainType(Constants::SDCC_TOOLCHAIN_TYPEID); setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID}); setToolchainConstructor([] { return new SdccToolChain; }); @@ -413,8 +412,8 @@ SdccToolChainConfigWidget::SdccToolChainConfigWidget(SdccToolChain *tc) : { m_compilerCommand->setExpectedKind(PathChooser::ExistingCommand); m_compilerCommand->setHistoryCompleter("PE.SDCC.Command.History"); - m_mainLayout->addRow(tr("&Compiler path:"), m_compilerCommand); - m_mainLayout->addRow(tr("&ABI:"), m_abiWidget); + m_mainLayout->addRow(Tr::tr("&Compiler path:"), m_compilerCommand); + m_mainLayout->addRow(Tr::tr("&ABI:"), m_abiWidget); m_abiWidget->setEnabled(false); @@ -486,5 +485,4 @@ void SdccToolChainConfigWidget::handleCompilerCommandChange() emit dirty(); } -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal diff --git a/src/plugins/baremetal/sdcctoolchain.h b/src/plugins/baremetal/sdcctoolchain.h index 9403d54d078..59c59c358c9 100644 --- a/src/plugins/baremetal/sdcctoolchain.h +++ b/src/plugins/baremetal/sdcctoolchain.h @@ -13,22 +13,16 @@ class QPushButton; class QTextEdit; QT_END_NAMESPACE -namespace Utils { -class FilePath; -class PathChooser; -} +namespace Utils { class PathChooser; } namespace ProjectExplorer { class AbiWidget; } -namespace BareMetal { -namespace Internal { +namespace BareMetal::Internal { // SdccToolChain class SdccToolChain final : public ProjectExplorer::ToolChain { - Q_DECLARE_TR_FUNCTIONS(SdccToolChain) - public: MacroInspectionRunner createMacroInspectionRunner() const final; @@ -74,8 +68,6 @@ private: class SdccToolChainConfigWidget final : public ProjectExplorer::ToolChainConfigWidget { - Q_OBJECT - public: explicit SdccToolChainConfigWidget(SdccToolChain *tc); @@ -93,5 +85,4 @@ private: ProjectExplorer::Macros m_macros; }; -} // namespace Internal -} // namespace BareMetal +} // BareMetal::Internal