Fix string conversion compile warning by converting encoding string to String.

diff --git a/Src/FileTextEncoding.cpp b/Src/FileTextEncoding.cpp
index 280a3ad..a674522 100644 (file)
--- a/Src/FileTextEncoding.cpp
+++ b/Src/FileTextEncoding.cpp
@@ -3,7 +3,7 @@
  *
  * @brief Implementation of FileTextEncoding structure
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #include "stdafx.h"
@@ -55,7 +55,7 @@ void FileTextEncoding::SetUnicoding(int unicoding)
 /**
  * @brief Return string representation of encoding, eg "UCS-2LE", or "1252"
  */
-CString FileTextEncoding::GetName() const
+String FileTextEncoding::GetName() const
 {
        if (m_unicoding == ucr::UCS2LE)
                return _T("UCS-2LE");
@@ -64,12 +64,13 @@ CString FileTextEncoding::GetName() const
        if (m_unicoding == ucr::UTF8)
                return _T("UTF-8");
 
-       CString str;
+       String str;
        if (m_codepage > -1)
        {
-               LPTSTR s = str.GetBuffer(32);
-               _sntprintf(s, 32, _T("%d"), m_codepage);
-               str.ReleaseBuffer();
+               str.resize(32);
+               LPTSTR s = &*str.begin(); //GetBuffer(32);
+               int len = _sntprintf(s, 32, _T("%d"), m_codepage);
+               str.resize(len);
        }
        return str;
 }

diff --git a/Src/FileTextEncoding.h b/Src/FileTextEncoding.h
index fea2ddf..31a80e8 100644 (file)
--- a/Src/FileTextEncoding.h
+++ b/Src/FileTextEncoding.h
@@ -3,7 +3,7 @@
  *
  * @brief Declaration of FileTextEncoding structure
  */
-// RCS ID line follows -- this is updated by CVS
+// ID line follows -- this is updated by SVN
 // $Id$
 
 #ifndef FileTextEncoding_h_included
@@ -23,7 +23,7 @@ struct FileTextEncoding
        void Clear();
        void SetCodepage(int codepage);
        void SetUnicoding(int unicoding);
-       CString GetName() const;
+       String GetName() const;
 
        static int Collate(const FileTextEncoding & fte1, const FileTextEncoding & fte2);
 };

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 4ac68e7..36c8b98 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -695,10 +695,10 @@ int CMainFrame::ShowMergeDoc(CDirDoc * pDirDoc,
                }
                else if (filelocLeft.encoding.m_unicoding != filelocRight.encoding.m_unicoding)
                {
-                       CString leftEncoding = filelocLeft.encoding.GetName();
-                       CString rightEnicoding = filelocRight.encoding.GetName();
+                       String leftEncoding = filelocLeft.encoding.GetName();
+                       String rightEncoding = filelocRight.encoding.GetName();
                        CString msg;
-                       msg.Format(IDS_DIFFERENT_UNICODINGS, leftEncoding, rightEnicoding);
+                       msg.Format(IDS_DIFFERENT_UNICODINGS, leftEncoding.c_str(), rightEncoding.c_str());
                        int msgflags = MB_OK | MB_ICONWARNING | MB_DONT_ASK_AGAIN;
                        // Two files with different codepages
                        // Warn and propose to use the default codepage for both