Remove ambiguous symbols (part 7)

Relace TCHAR, generic_string & TEXT("") par wchar_t, wstring & L"" respectively. Follow up: 94af271 Close notepad-plus-plus#15381
hugok79 · Jul 1, 2024 · 88bd09e · 88bd09e
1 parent f7d9e7c
commit 88bd09e
Show file tree

Hide file tree

Showing 8 changed files with 418 additions and 418 deletions.
diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
diff --git a/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.cpp b/PowerEditor/src/TinyXml/tinyXmlA/tinyxmlA.cpp
@@ -778,7 +778,7 @@ bool TiXmlDocumentA::LoadUnicodeFilePath( const TCHAR* filename )
 
 	if ( file )
 	{
-		// Get the file size, so we can pre-allocate the generic_string. HUGE speed impact.
+		// Get the file size, so we can pre-allocate the string. HUGE speed impact.
 		long length = 0;
 		fseek( file, 0, SEEK_END );
 		length = ftell( file );

diff --git a/PowerEditor/src/TinyXml/tinystr.cpp b/PowerEditor/src/TinyXml/tinystr.cpp
@@ -28,7 +28,7 @@ distribution.
 
 #include "tinystr.h"
 
-// TiXmlString constructor, based on a C generic_string
+// TiXmlString constructor, based on a C string
 TiXmlString::TiXmlString (const TCHAR* instring)
 {
     unsigned newlen;
@@ -168,7 +168,7 @@ void TiXmlString::append( const TCHAR* str, int len )
     }
     else
     {
-        // we know we can safely append the new generic_string
+        // we know we can safely append the new string
         // strncat (cstring, str, len);
         memcpy (cstring + length (), 
                 str,
@@ -215,7 +215,7 @@ void TiXmlString::append( const TCHAR * suffix )
     }
     else
     {
-        // we know we can safely append the new generic_string
+        // we know we can safely append the new string
         memcpy (cstring + length (), 
                 suffix, 
                 lstrlen (suffix) + 1);

diff --git a/PowerEditor/src/TinyXml/tinystr.h b/PowerEditor/src/TinyXml/tinystr.h
@@ -39,12 +39,12 @@ distribution.
    Its purpose is to allow compiling TinyXML on compilers with no or poor STL support.
    Only the member functions relevant to the TinyXML project have been implemented.
    The buffer allocation is made by a simplistic power of 2 like mechanism : if we increase
-   a generic_string and there's no more room, we allocate a buffer twice as big as we need.
+   a string and there's no more room, we allocate a buffer twice as big as we need.
 */
 class TiXmlString
 {
   public :
-    // TiXmlString constructor, based on a generic_string
+    // TiXmlString constructor, based on a string
     TiXmlString (const TCHAR * instring);
 
     // TiXmlString empty constructor
@@ -126,13 +126,13 @@ class TiXmlString
         return cstring [index];
     }
 
-    // find a TCHAR in a generic_string. Return TiXmlString::notfound if not found
+    // find a char in a string. Return TiXmlString::notfound if not found
     unsigned find (TCHAR lookup) const
     {
         return find (lookup, 0);
     }
 
-    // find a TCHAR in a generic_string from an offset. Return TiXmlString::notfound if not found
+    // find a char in a string from an offset. Return TiXmlString::notfound if not found
     unsigned find (TCHAR tofind, unsigned offset) const;
 
     /*	Function to reserve a big amount of data when we know we'll need it. Be aware that this
@@ -165,11 +165,11 @@ class TiXmlString
 
   protected :
 
-    // The base generic_string
+    // The base string
     TCHAR * cstring;
     // Number of chars allocated
     unsigned allocated;
-    // Current generic_string size
+    // Current string size
     unsigned current_length;
 
     // New size computation. It is simplistic right now : it returns twice the amount