Replace by Virtual_String

Author: godunko

help/src/help_module.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                               GNAT Studio                                --
 --                                                                          --
---                     Copyright (C) 2001-2024, AdaCore                     --
+--                     Copyright (C) 2001-2025, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -948,14 +948,18 @@ package body Help_Module is
       begin
          Set_Unbounded_String
            (About_Text,
-            "GNAT Studio " & To_String (Config.Version)
-            & " (" & Config.Source_Date
-            & (-") hosted on ") & Config.Target & LF
-            & (-"GNAT ") & GNAT_Version (Kernel)
-            & (if Compiler_Target /= "" then
-                  " targeting " & Compiler_Target
-               else
-                  ""));
+            "GNAT Studio "
+            & To_String (Config.Version)
+            & " ("
+            & Config.Source_Date
+            & (-") hosted on ")
+            & Config.Target
+            & LF
+            & (-"GNAT ")
+            & VSS.Strings.Conversions.To_UTF_8_String (Kernel.GNAT_Version)
+            & (if Compiler_Target /= ""
+               then " targeting " & Compiler_Target
+               else ""));
       end;
 
       --  Display the version used by CodePeer and SPARK, if found in the

kernel/src/gps-kernel-project.adb

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                               GNAT Studio                                --
 --                                                                          --
---                     Copyright (C) 2001-2024, AdaCore                     --
+--                     Copyright (C) 2001-2025, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -20,18 +20,18 @@ with Ada.Containers.Indefinite_Hashed_Maps;
 with Ada.Strings.Hash;
 with Ada.Strings.Fixed;
 with Ada.Unchecked_Deallocation;
+with GNAT.OS_Lib;                      use GNAT.OS_Lib;
+pragma Warnings (Off, ".*is an internal GNAT unit");
+with GNAT.Expect.TTY.Remote;           use GNAT.Expect.TTY.Remote;
+pragma Warnings (On, ".*is an internal GNAT unit");
 
-with VSS.Strings;
+with VSS.Strings.Conversions;
 
 with GNATCOLL.JSON;
 with GNATCOLL.Projects;                use GNATCOLL.Projects;
 with GNATCOLL.Traces;                  use GNATCOLL.Traces;
 with GNATCOLL.Utils;                   use GNATCOLL.Utils;
 with GNATCOLL.VFS;                     use GNATCOLL.VFS;
-with GNAT.OS_Lib;                      use GNAT.OS_Lib;
-pragma Warnings (Off, ".*is an internal GNAT unit");
-with GNAT.Expect.TTY.Remote;           use GNAT.Expect.TTY.Remote;
-pragma Warnings (On, ".*is an internal GNAT unit");
 
 with Projects;                         use Projects;
 with Remote;                           use Remote;
@@ -280,7 +280,8 @@ package body GPS.Kernel.Project is
      (Self    : in out GPS_Project_Environment;
       Version : String) is
    begin
-      Self.Kernel.GNAT_Version := To_Unbounded_String (Version);
+      Self.Kernel.GNAT_Version_Cache :=
+        VSS.Strings.Conversions.To_Virtual_String (Version);
    end Set_GNAT_Version;
 
    ------------------

kernel/src/gps-kernel.adb

@@ -289,13 +289,12 @@ package body GPS.Kernel is
    ------------------
 
    function GNAT_Version
-     (Handle : access Kernel_Handle_Record) return String is
+     (Handle : access Kernel_Handle_Record)
+      return VSS.Strings.Virtual_String is
    begin
-      if Handle.GNAT_Version = Null_Unbounded_String then
-         return -"<unknown version>";
-      else
-         return To_String (Handle.GNAT_Version);
-      end if;
+      return
+        (if Handle.GNAT_Version_Cache.Is_Empty
+         then -"<unknown version>" else Handle.GNAT_Version_Cache);
    end GNAT_Version;
 
    -----------------------
@@ -306,7 +305,8 @@ package body GPS.Kernel is
      (Handle : access Kernel_Handle_Record;
       Date   : Date_Type) return Boolean
    is
-      Version       : constant String := GNAT_Version (Handle);
+      Version       : constant String :=
+        VSS.Strings.Conversions.To_UTF_8_String (Handle.GNAT_Version_Cache);
       Open_Index    : constant Natural := Index (Version, "(");
       Close_Index   : Natural;
       Compiler_Date : Date_Type;

kernel/src/gps-kernel.ads

@@ -1,7 +1,7 @@
 ------------------------------------------------------------------------------
 --                               GNAT Studio                                --
 --                                                                          --
---                     Copyright (C) 2001-2023, AdaCore                     --
+--                     Copyright (C) 2001-2025, AdaCore                     --
 --                                                                          --
 -- This is free software;  you can redistribute it  and/or modify it  under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -26,17 +26,19 @@ with Ada.Strings.Hash;
 with Ada.Strings.Hash_Case_Insensitive;
 with Ada.Strings.Unbounded;           use Ada.Strings.Unbounded;
 with Ada.Unchecked_Deallocation;
+with GNAT.Regpat;
+with GNAT.Strings;
 with System;
 
-with GNAT.Strings;
 with GNATCOLL.Projects;
-with GNAT.Regpat;
 with GNATCOLL.Refcount;
 with GNATCOLL.Scripts;
 with GNATCOLL.Traces;
 with GNATCOLL.Tribooleans;
 with GNATCOLL.VFS;                    use GNATCOLL.VFS;
 
+with VSS.Strings;
+
 with Glib.Main;
 with Glib;                            use Glib;
 with Glib.Object;
@@ -227,7 +229,7 @@ package GPS.Kernel is
    --  Return the language handler used by this kernel
 
    function GNAT_Version
-     (Handle : access Kernel_Handle_Record) return String;
+     (Handle : access Kernel_Handle_Record) return VSS.Strings.Virtual_String;
    --  Return a string containing the GNAT version number.
    --  The string has the form "Pro 6.4.0w (20100727-43)"
    --  See also Require_GNAT_Date below.
@@ -1240,7 +1242,7 @@ private
       --  but this gets invalid early when GNAT Studio exists, and we no
       --  longer have access to the main window while destroying its children
 
-      GNAT_Version : Unbounded_String;
+      GNAT_Version_Cache : VSS.Strings.Virtual_String;
       --  Full GNAT Version, if relevant
 
       Preferences : Default_Preferences.Preferences_Manager;