Convert rest of CStrings to Strings in unicoder. Bunch of other CString to String...

diff --git a/Src/Common/unicoder.cpp b/Src/Common/unicoder.cpp
index 54fde20..7b642b9 100644 (file)
--- a/Src/Common/unicoder.cpp
+++ b/Src/Common/unicoder.cpp
@@ -339,7 +339,7 @@ String maketchar(UINT unich, bool & lossy, UINT codepage)
                if (WideCharToMultiByte(codepage, flags, &wch, 1, &outch, 1, NULL, &defaulted)
                        && !defaulted)
                {
-                       CString s = outch;
+                       String s(1, outch);
                        return s;
                }
                lossy = TRUE;
@@ -387,7 +387,7 @@ UINT byteToUnicode (unsigned char ch, UINT codepage)
 }
 
 /**
- * @brief Return encoding used for TCHAR & CString
+ * @brief Return encoding used for TCHAR & String
  */
 void getInternalEncoding(UNICODESET * unicoding, int * codepage)
 {
@@ -475,7 +475,7 @@ String maketstring(LPCSTR lpd, UINT len, int codepage, bool * lossy)
 
 #ifdef UNICODE
        // Convert input to Unicode, using specified codepage
-       // TCHAR is wchar_t, so convert into CString (str)
+       // TCHAR is wchar_t, so convert into String (str)
        DWORD flags = MB_ERR_INVALID_CHARS;
        int wlen = len * 2 + 6;
        String str;
@@ -557,7 +557,7 @@ int CrossConvert(LPCSTR src, UINT srclen, LPSTR dest, UINT destsize, int cpin, i
        if (!n)
        {
                int nsyserr = ::GetLastError();
-               CString syserrstr = GetSysError(nsyserr);
+               String syserrstr = GetSysError(nsyserr);
                delete [] wbuff;
                dest[0] = '?';
                return 1;
@@ -586,7 +586,7 @@ int CrossConvert(LPCSTR src, UINT srclen, LPSTR dest, UINT destsize, int cpin, i
        if (!n)
        {
                int nsyserr = ::GetLastError();
-               CString syserrstr = GetSysError(nsyserr);
+               String syserrstr = GetSysError(nsyserr);
        }
        dest[n] = 0;
        delete [] wbuff;

diff --git a/Src/DiffTextBuffer.cpp b/Src/DiffTextBuffer.cpp
index 5fa5ddc..3266c3d 100644 (file)
--- a/Src/DiffTextBuffer.cpp
+++ b/Src/DiffTextBuffer.cpp
@@ -537,7 +537,7 @@ LoadFromFileExit:
  * @return SAVE_DONE or an error code (list in MergeDoc.h)
  */
 int CDiffTextBuffer::SaveToFile (LPCTSTR pszFileName,
-               BOOL bTempFile, CString & sError, PackingInfo * infoUnpacker /*= NULL*/,
+               BOOL bTempFile, String & sError, PackingInfo * infoUnpacker /*= NULL*/,
                CRLFSTYLE nCrlfStyle /*= CRLF_STYLE_AUTOMATIC*/,
                BOOL bClearModifiedFlag /*= TRUE*/ )
 {

diff --git a/Src/DiffTextBuffer.h b/Src/DiffTextBuffer.h
index e69c0e4..9b73f03 100644 (file)
--- a/Src/DiffTextBuffer.h
+++ b/Src/DiffTextBuffer.h
@@ -53,7 +53,7 @@ public :
        int LoadFromFile(LPCTSTR pszFileName, PackingInfo * infoUnpacker,
                LPCTSTR filteredFilenames, BOOL & readOnly, CRLFSTYLE nCrlfStyle,
                const FileTextEncoding & encoding, CString &sError);
-       int SaveToFile (LPCTSTR pszFileName, BOOL bTempFile, CString & sError,
+       int SaveToFile (LPCTSTR pszFileName, BOOL bTempFile, String & sError,
                PackingInfo * infoUnpacker = NULL, CRLFSTYLE nCrlfStyle = CRLF_STYLE_AUTOMATIC,
                BOOL bClearModifiedFlag = TRUE );
        ucr::UNICODESET getUnicoding() const { return m_encoding.m_unicoding; }

diff --git a/Src/Environment.cpp b/Src/Environment.cpp
index 88568b9..6b8ceca 100644 (file)
--- a/Src/Environment.cpp
+++ b/Src/Environment.cpp
@@ -37,7 +37,7 @@ LPCTSTR env_GetTempPath(int * pnerr)
                                if (pnerr)
                                        *pnerr = err;
 #ifdef _DEBUG
-                               CString sysErr = GetSysError(err); // for debugging
+                               String sysErr = GetSysError(err); // for debugging
 #endif
                                return strTempPath.c_str(); // empty
                        }
@@ -70,7 +70,7 @@ String env_GetTempFileName(LPCTSTR lpPathName, LPCTSTR lpPrefixString, int * pne
                if (pnerr)
                        *pnerr = err;
 #ifdef _DEBUG
-               CString sysErr = GetSysError(err); // for debugging
+               String sysErr = GetSysError(err); // for debugging
 #endif
                return _T("");
        }

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index 8b92f21..a563e75 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -350,7 +350,7 @@ static void SaveBuffForDiff(CDiffTextBuffer & buf, LPCTSTR filepath)
        PackingInfo * tempPacker = NULL;
 
        // write buffer out to temporary file
-       CString sError;
+       String sError;
        int retVal = buf.SaveToFile(filepath, TRUE, sError, tempPacker,
                CRLF_STYLE_AUTOMATIC, FALSE);
 
@@ -949,7 +949,7 @@ bool CMergeDoc::ListCopy(int srcPane, int dstPane, int nDiff /* = -1*/,
  * @sa CMergeDoc::DoSaveAs()
  * @sa CMergeDoc::CDiffTextBuffer::SaveToFile()
  */
-BOOL CMergeDoc::TrySaveAs(CString &strPath, int &nSaveResult, CString & sError,
+BOOL CMergeDoc::TrySaveAs(CString &strPath, int &nSaveResult, String & sError,
        int nBuffer, PackingInfo * pInfoTempUnpacker)
 {
        CString s;
@@ -984,7 +984,7 @@ BOOL CMergeDoc::TrySaveAs(CString &strPath, int &nSaveResult, CString & sError,
        }
        else
        {
-               LangFormatString2(s, IDS_FILESAVE_FAILED, strPath, sError);
+               LangFormatString2(s, IDS_FILESAVE_FAILED, strPath, sError.c_str());
        }
 
        // SAVE_NO_FILENAME is temporarily used for scratchpad.
@@ -1058,7 +1058,6 @@ BOOL CMergeDoc::DoSave(LPCTSTR szPath, BOOL &bSaveSuccess, int nBuffer)
 {
        DiffFileInfo fileInfo;
        CString strSavePath(szPath);
-       CString sError;
        BOOL bFileChanged = FALSE;
        BOOL bApplyToAll = FALSE;       
        int nRetVal = -1;
@@ -1125,6 +1124,7 @@ BOOL CMergeDoc::DoSave(LPCTSTR szPath, BOOL &bSaveSuccess, int nBuffer)
                (m_nBufferType[nBuffer] == BUFFER_UNNAMED))
                        nSaveErrorCode = SAVE_NO_FILENAME;
 
+       String sError;
        if (nSaveErrorCode == SAVE_DONE)
                // We have a filename, just try to save
                nSaveErrorCode = pBuffer->SaveToFile(strSavePath, FALSE, sError, &infoTempUnpacker);
@@ -1183,7 +1183,6 @@ BOOL CMergeDoc::DoSave(LPCTSTR szPath, BOOL &bSaveSuccess, int nBuffer)
 BOOL CMergeDoc::DoSaveAs(LPCTSTR szPath, BOOL &bSaveSuccess, int nBuffer)
 {
        CString strSavePath(szPath);
-       CString sError;
 
        // use a temp packer
        // first copy the m_pInfoUnpacker
@@ -1203,6 +1202,7 @@ BOOL CMergeDoc::DoSaveAs(LPCTSTR szPath, BOOL &bSaveSuccess, int nBuffer)
        nSaveErrorCode = SAVE_NO_FILENAME;
 
        // Loop until user succeeds saving or cancels
+       String sError;
        do
                result = TrySaveAs(strSavePath, nSaveErrorCode, sError, nBuffer, &infoTempUnpacker);
        while (!result);
@@ -2601,7 +2601,8 @@ void CMergeDoc::OnToolsGenerateReport()
        UniStdioFile file;
        if (!file.Open(s, _T("wt")))
        {
-               ResMsgBox1(IDS_REPORT_ERROR, GetSysError(GetLastError()), MB_OK | MB_ICONSTOP);
+               String errMsg = GetSysError(GetLastError());
+               ResMsgBox1(IDS_REPORT_ERROR, errMsg.c_str(), MB_OK | MB_ICONSTOP);
                return;
        }
 

diff --git a/Src/MergeDoc.h b/Src/MergeDoc.h
index 3868b65..ac7e3c2 100644 (file)
--- a/Src/MergeDoc.h
+++ b/Src/MergeDoc.h
@@ -155,7 +155,7 @@ public:
        void CopyMultipleList(int srcPane, int dstPane, int firstDiff, int lastDiff);
        BOOL SanityCheckDiff(DIFFRANGE dr);
        bool ListCopy(int srcPane, int dstPane, int nDiff = -1, bool bGroupWithPrevious = false);
-       BOOL TrySaveAs(CString &strPath, int &nLastErrorCode, CString & sError,
+       BOOL TrySaveAs(CString &strPath, int &nLastErrorCode, String & sError,
                int nBuffer, PackingInfo * pInfoTempUnpacker);
        BOOL DoSave(LPCTSTR szPath, BOOL &bSaveSuccess, int nBuffer);
        BOOL DoSaveAs(LPCTSTR szPath, BOOL &bSaveSuccess, int nBuffer);

diff --git a/Src/MergeEditView.cpp b/Src/MergeEditView.cpp
index 30694ed..ea923fe 100644 (file)
--- a/Src/MergeEditView.cpp
+++ b/Src/MergeEditView.cpp
@@ -1880,7 +1880,7 @@ static BOOL DoAppendMenu(HMENU hMenu, UINT uFlags, UINT_PTR uIDNewItem, LPCTSTR
        if (!ok)
        {
                int nerr = GetLastError();
-               CString syserr = GetSysError(nerr);
+               String syserr = GetSysError(nerr);
        }
        return ok;
 }

diff --git a/Src/StdAfx.cpp b/Src/StdAfx.cpp
index e0aec69..663067b 100644 (file)
--- a/Src/StdAfx.cpp
+++ b/Src/StdAfx.cpp
@@ -150,10 +150,10 @@ int ResMsgBox1(UINT msgid, LPCTSTR arg, UINT nType, UINT nIDHelp)
 }
 
 // Get user language description of error, if available
-CString GetSysError(int nerr)
+String GetSysError(int nerr)
 {
        LPVOID lpMsgBuf;
-       CString str = _T("?");
+       String str = _T("?");
        if (FormatMessage( 
                FORMAT_MESSAGE_ALLOCATE_BUFFER | 
                FORMAT_MESSAGE_FROM_SYSTEM | 

diff --git a/Src/StdAfx.h b/Src/StdAfx.h
index efb7ed8..ef170c9 100644 (file)
--- a/Src/StdAfx.h
+++ b/Src/StdAfx.h
@@ -126,7 +126,7 @@ int NTAPI LangMessageBox(UINT, UINT nType = MB_OK, UINT nIDHelp = (UINT)-1);
 int ResMsgBox1(UINT msgid, LPCTSTR arg, UINT nType = MB_OK, UINT nIDHelp = 0);
 
        /** @brief Retrieve error description from Windows; uses FormatMessage */
-CString GetSysError(int nerr);
+String GetSysError(int nerr);
 
        /** @brief Send message to log file (in theory; actually doesn't yet) */
 void LogErrorString(LPCTSTR sz);

diff --git a/Src/VSSHelper.cpp b/Src/VSSHelper.cpp
index e36692c..db90ab3 100644 (file)
--- a/Src/VSSHelper.cpp
+++ b/Src/VSSHelper.cpp
@@ -109,8 +109,8 @@ BOOL VSSHelper::ReLinkVCProj(CString strSavePath, CString * psError)
                                msg.Format(_T("CMainFrame::ReLinkVCProj() ")
                                        _T("- failed to open file: %s"), strSavePath);
                                LogErrorString(msg);
-                               LangFormatString2(msg, IDS_ERROR_FILEOPEN,
-                                               GetSysError(GetLastError()), strSavePath);
+                               String errMsg = GetSysError(GetLastError());
+                               LangFormatString2(msg, IDS_ERROR_FILEOPEN, errMsg.c_str(), strSavePath);
                                *psError = msg;
                        }
                        if (tfile == INVALID_HANDLE_VALUE)
@@ -118,8 +118,8 @@ BOOL VSSHelper::ReLinkVCProj(CString strSavePath, CString * psError)
                                msg.Format(_T("CMainFrame::ReLinkVCProj() ")
                                        _T("- failed to open temporary file: %s"), tempFile.c_str());
                                LogErrorString(msg);
-                               LangFormatString2(msg, IDS_ERROR_FILEOPEN,
-                                               GetSysError(GetLastError()), tempFile.c_str());
+                               String errMsg = GetSysError(GetLastError());
+                               LangFormatString2(msg, IDS_ERROR_FILEOPEN, errMsg.c_str(), tempFile.c_str());
                                *psError = msg;
                        }
                        return FALSE;
@@ -163,7 +163,7 @@ BOOL VSSHelper::ReLinkVCProj(CString strSavePath, CString * psError)
                {
                        if (!CopyFile(tempFile.c_str(), strSavePath, FALSE))
                        {
-                               *psError = GetSysError(GetLastError());
+                               *psError = GetSysError(GetLastError()).c_str();
                                DeleteFile(tempFile.c_str());
                                return FALSE;
                        }
@@ -173,8 +173,8 @@ BOOL VSSHelper::ReLinkVCProj(CString strSavePath, CString * psError)
                else
                {
                        CString msg;
-                       LangFormatString2(msg, IDS_ERROR_FILEOPEN,
-                                       strSavePath, GetSysError(GetLastError()));
+                       String errMsg = GetSysError(GetLastError());
+                       LangFormatString2(msg, IDS_ERROR_FILEOPEN, strSavePath, errMsg.c_str());
                        *psError = msg;
                        return FALSE;
                }