Remove useless c_str()

diff --git a/Src/7zCommon.cpp b/Src/7zCommon.cpp
index 76ce2aa..53cedcd 100644 (file)
--- a/Src/7zCommon.cpp
+++ b/Src/7zCommon.cpp
@@ -626,7 +626,7 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files)
                USES_CONVERSION;\r
                // Handle archives using 7-zip\r
                Merge7z::Format *piHandler;\r
-               if (piHandler = ArchiveGuessFormat(res.files[0].c_str()))\r
+               if (piHandler = ArchiveGuessFormat(res.files[0]))\r
                {\r
                        res.pTempPathContext = new CTempPathContext;\r
                        path = env_GetTempChildPath();\r
@@ -647,10 +647,10 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files)
                                SysFreeString(pTmp);\r
                                res.files[0].insert(0, _T("\\"));\r
                                res.files[0].insert(0, path);\r
-                       } while (piHandler = ArchiveGuessFormat(res.files[0].c_str()));\r
+                       } while (piHandler = ArchiveGuessFormat(res.files[0]));\r
                        res.files[0] = path;\r
                }\r
-               if (!res.files[1].empty() && (piHandler = ArchiveGuessFormat(res.files[1].c_str())))\r
+               if (!res.files[1].empty() && (piHandler = ArchiveGuessFormat(res.files[1])))\r
                {\r
                        if (!res.pTempPathContext)\r
                        {\r
@@ -672,10 +672,10 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files)
                                SysFreeString(pTmp);\r
                                res.files[1].insert(0, _T("\\"));\r
                                res.files[1].insert(0, path);\r
-                       } while (piHandler = ArchiveGuessFormat(res.files[1].c_str()));\r
+                       } while (piHandler = ArchiveGuessFormat(res.files[1]));\r
                        res.files[1] = path;\r
                }\r
-               if (res.files.GetSize() > 2 && (piHandler = ArchiveGuessFormat(res.files[2].c_str())))\r
+               if (res.files.GetSize() > 2 && (piHandler = ArchiveGuessFormat(res.files[2])))\r
                {\r
                        if (!res.pTempPathContext)\r
                        {\r
@@ -697,7 +697,7 @@ DecompressResult DecompressArchive(HWND hWnd, const PathContext& files)
                                SysFreeString(pTmp);\r
                                res.files[2].insert(0, _T("\\"));\r
                                res.files[2].insert(0, path);\r
-                       } while (piHandler = ArchiveGuessFormat(res.files[2].c_str()));\r
+                       } while (piHandler = ArchiveGuessFormat(res.files[2]));\r
                        res.files[2] = path;\r
                }\r
                if (res.files[1].empty())\r

diff --git a/Src/DiffTextBuffer.cpp b/Src/DiffTextBuffer.cpp
index 8a94c00..02b51e5 100644 (file)
--- a/Src/DiffTextBuffer.cpp
+++ b/Src/DiffTextBuffer.cpp
@@ -531,7 +531,7 @@ int CDiffTextBuffer::SaveToFile (const String& pszFileName,
                UniFile::UniError uniErr = file.GetLastUniError();
                if (uniErr.HasError())
                {
-                       sError = uniErr.GetError().c_str();
+                       sError = uniErr.GetError();
                        if (bTempFile)
                                LogErrorString(string_format(_T("Opening file %s failed: %s"),
                                        pszFileName.c_str(), sError.c_str()));

diff --git a/Src/DirActions.cpp b/Src/DirActions.cpp
index b559717..98e25be 100644 (file)
--- a/Src/DirActions.cpp
+++ b/Src/DirActions.cpp
@@ -108,7 +108,7 @@ static void ThrowConfirmationNeededException(const CDiffContext& ctxt, const Str
        String sOrig;
        String sDest;
        
-       exp.m_caption = caption.c_str();
+       exp.m_caption = caption;
        
        if (origin == 0)
                sOrig = _("From left:");
@@ -888,9 +888,9 @@ bool GetOpenThreeItems(const CDiffContext& ctxt, uintptr_t pos1, uintptr_t pos2,
        pathsTemp = GetItemFileNames(ctxt, *pdi[2]);
        pathRight = pathsTemp[2];
 
-       paths.SetLeft(pathLeft.c_str());
-       paths.SetMiddle(pathMiddle.c_str());
-       paths.SetRight(pathRight.c_str());
+       paths.SetLeft(pathLeft);
+       paths.SetMiddle(pathMiddle);
+       paths.SetRight(pathRight);
 
        if (pdi[0]->diffcode.isDirectory())
        {

diff --git a/Src/DirDoc.cpp b/Src/DirDoc.cpp
index bdd7b07..938a15c 100644 (file)
--- a/Src/DirDoc.cpp
+++ b/Src/DirDoc.cpp
@@ -575,7 +575,7 @@ void CDirDoc::ApplyDisplayRoot(int nIndex, String &sText)
        if (m_pTempPathContext)
        {
                sText.erase(0, m_pTempPathContext->m_strRoot[nIndex].length());
-               sText.insert(0, m_pTempPathContext->m_strDisplayRoot[nIndex].c_str());
+               sText.insert(0, m_pTempPathContext->m_strDisplayRoot[nIndex]);
        }
 }
 

diff --git a/Src/DirViewColItems.cpp b/Src/DirViewColItems.cpp
index 4ee9f47..dba1eb9 100644 (file)
--- a/Src/DirViewColItems.cpp
+++ b/Src/DirViewColItems.cpp
@@ -239,7 +239,7 @@ static String ColPathGet(const CDiffContext *, const void *p)
                {
                        String u(t.c_str() + j, length_t + 1);
                        u[length_t] = '|';
-                       s.insert(i, u.c_str());
+                       s.insert(i, u);
                        i_ahead += u.length();
                }
                i = i_ahead + 1;

diff --git a/Src/FileActionScript.cpp b/Src/FileActionScript.cpp
index eeda557..68beed4 100644 (file)
--- a/Src/FileActionScript.cpp
+++ b/Src/FileActionScript.cpp
@@ -173,7 +173,7 @@ int FileActionScript::CreateOperationsScripts()
 
                        if (bContinue)
                        {
-                               if (!theApp.CreateBackup(TRUE, (*iter).dest.c_str()))
+                               if (!theApp.CreateBackup(TRUE, (*iter).dest))
                                {
                                        String strErr = _("Error backing up file");
                                        AfxMessageBox(strErr.c_str(), MB_OK | MB_ICONERROR);

diff --git a/Src/FileFiltersDlg.cpp b/Src/FileFiltersDlg.cpp
index 3210665..8685a5b 100644 (file)
--- a/Src/FileFiltersDlg.cpp
+++ b/Src/FileFiltersDlg.cpp
@@ -456,7 +456,7 @@ void FileFiltersDlg::OnBnClickedFilterfileNewbutton()
                }
                EditFileFilter(s);
                FileFilterMgr *pMgr = theApp.m_pGlobalFileFilter->GetManager();
-               int retval = pMgr->AddFilter(s.c_str());
+               int retval = pMgr->AddFilter(s);
                if (retval == FILTER_OK)
                {
                        // Remove all from filterslist and re-add so we can update UI
@@ -582,7 +582,7 @@ void FileFiltersDlg::OnBnClickedFilterfileInstall()
                else
                {
                        FileFilterMgr *pMgr = theApp.m_pGlobalFileFilter->GetManager();
-                       pMgr->AddFilter(userPath.c_str());
+                       pMgr->AddFilter(userPath);
 
                        // Remove all from filterslist and re-add so we can update UI
                        String selected;

diff --git a/Src/ImgMergeFrm.cpp b/Src/ImgMergeFrm.cpp
index 69b9786..9dedf05 100644 (file)
--- a/Src/ImgMergeFrm.cpp
+++ b/Src/ImgMergeFrm.cpp
@@ -891,11 +891,11 @@ void CImgMergeFrame::SetTitle(LPCTSTR lpszTitle)
                                String file;
                                String ext;
                                paths_SplitFilename(m_filePaths[nBuffer], NULL, &file, &ext);
-                               sFileName[nBuffer] += file.c_str();
+                               sFileName[nBuffer] += file;
                                if (!ext.empty())
                                {
                                        sFileName[nBuffer] += _T(".");
-                                       sFileName[nBuffer] += ext.c_str();
+                                       sFileName[nBuffer] += ext;
                                }
                        }
                }
@@ -1008,33 +1008,33 @@ bool CImgMergeFrame::PromptAndSaveIfNeeded(bool bAllowCancel)
        if (!m_filePaths.GetLeft().empty())
        {
                if (theApp.m_strSaveAsPath.IsEmpty())
-                       dlg.m_sLeftFile = m_filePaths.GetLeft().c_str();
+                       dlg.m_sLeftFile = m_filePaths.GetLeft();
                else
                        dlg.m_sLeftFile = theApp.m_strSaveAsPath;
        }
        else
-               dlg.m_sLeftFile = m_strDesc[0].c_str();
+               dlg.m_sLeftFile = m_strDesc[0];
        if (m_pImgMergeWindow->GetPaneCount() == 3)
        {
                if (!m_filePaths.GetMiddle().empty())
                {
                        if (theApp.m_strSaveAsPath.IsEmpty())
-                               dlg.m_sMiddleFile = m_filePaths.GetMiddle().c_str();
+                               dlg.m_sMiddleFile = m_filePaths.GetMiddle();
                        else
                                dlg.m_sMiddleFile = theApp.m_strSaveAsPath;
                }
                else
-                       dlg.m_sMiddleFile = m_strDesc[1].c_str();
+                       dlg.m_sMiddleFile = m_strDesc[1];
        }
        if (!m_filePaths.GetRight().empty())
        {
                if (theApp.m_strSaveAsPath.IsEmpty())
-                       dlg.m_sRightFile = m_filePaths.GetRight().c_str();
+                       dlg.m_sRightFile = m_filePaths.GetRight();
                else
                        dlg.m_sRightFile = theApp.m_strSaveAsPath;
        }
        else
-               dlg.m_sRightFile = m_strDesc[m_pImgMergeWindow->GetPaneCount() - 1].c_str();
+               dlg.m_sRightFile = m_strDesc[m_pImgMergeWindow->GetPaneCount() - 1];
 
        if (dlg.DoModal() == IDOK)
        {

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index e9159ef..95deeb6 100644 (file)
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -1426,9 +1426,9 @@ void CMainFrame::OnDropFiles(const std::vector<String>& dropped_files)
        DWORD dwFlags[3] = {FFILEOPEN_NONE, FFILEOPEN_NONE, FFILEOPEN_NONE};
        if (fileCount == 1)
        {
-               if (theApp.IsProjectFile(files[0].c_str()))
+               if (theApp.IsProjectFile(files[0]))
                {
-                       theApp.LoadAndOpenProjectFile(files[0].c_str());
+                       theApp.LoadAndOpenProjectFile(files[0]);
                        return;
                }
                if (IsConflictFile(files[0]))
@@ -2435,10 +2435,10 @@ BOOL CMainFrame::DoOpenConflict(const String& conflictFile, bool checked)
        // from where they get deleted when MainFrame is deleted.
        String ext = paths_FindExtension(conflictFile);
        TempFilePtr wTemp(new TempFile());
-       String workFile = wTemp->Create(_T("confw_"), ext.c_str());
+       String workFile = wTemp->Create(_T("confw_"), ext);
        m_tempFiles.push_back(wTemp);
        TempFilePtr vTemp(new TempFile());
-       String revFile = vTemp->Create(_T("confv_"), ext.c_str());
+       String revFile = vTemp->Create(_T("confv_"), ext);
        m_tempFiles.push_back(vTemp);
 
        // Parse conflict file into two files.

diff --git a/Src/Merge.cpp b/Src/Merge.cpp
index a41297c..b215888 100644 (file)
--- a/Src/Merge.cpp
+++ b/Src/Merge.cpp
@@ -347,7 +347,7 @@ BOOL CMergeApp::InitInstance()
        // Read last used filter from registry
        // If filter fails to set, reset to default
        const String filterString = m_pOptions->GetString(OPT_FILEFILTER_CURRENT);
-       BOOL bFilterSet = m_pGlobalFileFilter->SetFilter(filterString.c_str());
+       BOOL bFilterSet = m_pGlobalFileFilter->SetFilter(filterString);
        if (!bFilterSet)
        {
                String filter = m_pGlobalFileFilter->GetFilterNameOrMask();
@@ -398,7 +398,7 @@ BOOL CMergeApp::InitInstance()
                // No filter path, set it to default and make sure it exists.
                pathMyFolders = GetOptionsMgr()->GetDefault<String>(OPT_FILTER_USERPATH);
                GetOptionsMgr()->SaveOption(OPT_FILTER_USERPATH, pathMyFolders);
-               theApp.m_pGlobalFileFilter->SetUserFilterPath(pathMyFolders.c_str());
+               theApp.m_pGlobalFileFilter->SetUserFilterPath(pathMyFolders);
        }
        if (!paths_CreateIfNeeded(pathMyFolders))
        {
@@ -637,7 +637,7 @@ BOOL CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainF
        // Set the global file filter.
        if (!cmdInfo.m_sFileFilter.empty())
        {
-               m_pGlobalFileFilter->SetFilter(cmdInfo.m_sFileFilter.c_str());
+               m_pGlobalFileFilter->SetFilter(cmdInfo.m_sFileFilter);
        }
 
        // Set codepage.
@@ -681,14 +681,14 @@ BOOL CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainF
                        DWORD dwFlags[3] = {cmdInfo.m_dwLeftFlags, cmdInfo.m_dwMiddleFlags, cmdInfo.m_dwRightFlags};
                        bCompared = pMainFrame->DoFileOpen(&cmdInfo.m_Files,
                                dwFlags, cmdInfo.m_bRecurse, NULL,
-                               cmdInfo.m_sPreDiffer.c_str());
+                               cmdInfo.m_sPreDiffer);
                }
                else if (cmdInfo.m_Files.GetSize() > 1)
                {
                        DWORD dwFlags[3] = {cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, FFILEOPEN_NONE};
                        bCompared = pMainFrame->DoFileOpen(&cmdInfo.m_Files,
                                dwFlags, cmdInfo.m_bRecurse, NULL,
-                               cmdInfo.m_sPreDiffer.c_str());
+                               cmdInfo.m_sPreDiffer);
                }
                else if (cmdInfo.m_Files.GetSize() == 1)
                {
@@ -699,14 +699,14 @@ BOOL CMergeApp::ParseArgsAndDoOpen(MergeCmdLineInfo& cmdInfo, CMainFrame* pMainF
                        }
                        else if (IsConflictFile(sFilepath))
                        {
-                               bCompared = pMainFrame->DoOpenConflict(sFilepath.c_str());
+                               bCompared = pMainFrame->DoOpenConflict(sFilepath);
                        }
                        else
                        {
                                DWORD dwFlags[3] = {cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, FFILEOPEN_NONE};
                                bCompared = pMainFrame->DoFileOpen(&cmdInfo.m_Files,
                                        dwFlags, cmdInfo.m_bRecurse, NULL,
-                                       cmdInfo.m_sPreDiffer.c_str());
+                                       cmdInfo.m_sPreDiffer);
                        }
                }
                else if (cmdInfo.m_Files.GetSize() == 0) // if there are no input args, we can check the display file dialog flag

diff --git a/Src/MergeDoc.cpp b/Src/MergeDoc.cpp
index e943136..9b11197 100644 (file)
--- a/Src/MergeDoc.cpp
+++ b/Src/MergeDoc.cpp
@@ -406,7 +406,7 @@ int CMergeDoc::Rescan(bool &bBinary, IDENTLEVEL &identical,
                String temp = m_tempFiles[nBuffer].GetPath();
                if (temp.empty())
                {
-                       temp = m_tempFiles[nBuffer].CreateFromFile(m_filePaths.GetPath(nBuffer).c_str(),
+                       temp = m_tempFiles[nBuffer].CreateFromFile(m_filePaths.GetPath(nBuffer),
                                tnames[nBuffer]);
                }
                if (temp.empty())
@@ -2538,7 +2538,7 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation fileloc[],
        DWORD nSuccess[3];
        for (nBuffer = 0; nBuffer < m_nBuffers; nBuffer++)
        {
-               nSuccess[nBuffer] = LoadOneFile(nBuffer, (LPCTSTR)fileloc[nBuffer].filepath.c_str(), bRO[nBuffer],
+               nSuccess[nBuffer] = LoadOneFile(nBuffer, fileloc[nBuffer].filepath, bRO[nBuffer],
                        fileloc[nBuffer].encoding);
        }
        const bool bFiltersEnabled = GetOptionsMgr()->GetBool(OPT_PLUGINS_ENABLED);
@@ -2590,7 +2590,7 @@ OPENRESULTS_TYPE CMergeDoc::OpenDocs(FileLocation fileloc[],
                        m_pEncodingErrorBar.reset(new CEncodingErrorBar());
                        m_pEncodingErrorBar->Create(this->m_pView[0]->GetParentFrame());
                }
-               m_pEncodingErrorBar->SetText(LoadResString(idres).c_str());
+               m_pEncodingErrorBar->SetText(LoadResString(idres));
                m_pView[0]->GetParentFrame()->ShowControlBar(m_pEncodingErrorBar.get(), TRUE, FALSE);
        }
 
@@ -2825,7 +2825,7 @@ void CMergeDoc::UpdateHeaderPath(int pane)
        if (bChanges)
                sText.insert(0, _T("* "));
 
-       pf->GetHeaderInterface()->SetText(pane, sText.c_str());
+       pf->GetHeaderInterface()->SetText(pane, sText);
 
        SetTitle(NULL);
 }

diff --git a/Src/PatchDlg.cpp b/Src/PatchDlg.cpp
index b231181..13b28a7 100644 (file)
--- a/Src/PatchDlg.cpp
+++ b/Src/PatchDlg.cpp
@@ -222,9 +222,9 @@ BOOL CPatchDlg::OnInitDialog()
        if (count == 1)
        {
         const PATCHFILES& files = m_fileList.front();
-               m_file1 = files.lfile.c_str();
+               m_file1 = files.lfile;
                m_ctlFile1.SetWindowText(files.lfile.c_str());
-               m_file2 = files.rfile.c_str();
+               m_file2 = files.rfile;
                m_ctlFile2.SetWindowText(files.rfile.c_str());
        }
        else if (count > 1)     // Multiple files added, show number of files
@@ -339,7 +339,7 @@ void CPatchDlg::OnDiffBrowseResult()
        folder = m_fileResult;
        if (SelectFile(GetSafeHwnd(), s, folder.c_str(), _("Save As"), _T(""), FALSE))
        {
-               m_fileResult = s.c_str();
+               m_fileResult = s;
                m_ctlResult.SetWindowText(s.c_str());
        }
 }

diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
index 98809e9..7542731 100644 (file)
--- a/Src/Plugins.cpp
+++ b/Src/Plugins.cpp
@@ -100,7 +100,7 @@ bool IsWindowsScriptThere()
        if (!keyFile.QueryRegMachine(_T("SOFTWARE\\Classes\\scriptletfile\\AutoRegister")))
                return false;
 
-       String filename = keyFile.ReadString(_T(""), _T("")).c_str();
+       String filename = keyFile.ReadString(_T(""), _T(""));
        keyFile.Close();
        if (filename.empty())
                return false;

diff --git a/Src/PropCompareBinary.cpp b/Src/PropCompareBinary.cpp
index 0125bc1..0116bcd 100644 (file)
--- a/Src/PropCompareBinary.cpp
+++ b/Src/PropCompareBinary.cpp
@@ -117,6 +117,6 @@ void PropCompareBinary::OnCharacterSet()
  */
 void PropCompareBinary::OnDefaults()
 {
-       m_sFilePatterns = GetOptionsMgr()->GetDefault<String>(OPT_CMP_BIN_FILEPATTERNS).c_str();
+       m_sFilePatterns = GetOptionsMgr()->GetDefault<String>(OPT_CMP_BIN_FILEPATTERNS);
        UpdateData(FALSE);
 }

diff --git a/Src/PropCompareImage.cpp b/Src/PropCompareImage.cpp
index d3bd4c5..b8db80e 100644 (file)
--- a/Src/PropCompareImage.cpp
+++ b/Src/PropCompareImage.cpp
@@ -63,6 +63,6 @@ void PropCompareImage::WriteOptions()
  */
 void PropCompareImage::OnDefaults()
 {
-       m_sFilePatterns = GetOptionsMgr()->GetDefault<String>(OPT_CMP_IMG_FILEPATTERNS).c_str();
+       m_sFilePatterns = GetOptionsMgr()->GetDefault<String>(OPT_CMP_IMG_FILEPATTERNS);
        UpdateData(FALSE);
 }

diff --git a/Src/PropEditor.cpp b/Src/PropEditor.cpp
index 77eb4fb..7577a5c 100644 (file)
--- a/Src/PropEditor.cpp
+++ b/Src/PropEditor.cpp
@@ -77,7 +77,7 @@ void PropEditor::ReadOptions()
        m_bViewLineDifferences = GetOptionsMgr()->GetBool(OPT_WORDDIFF_HIGHLIGHT);
        m_bBreakOnWords = GetOptionsMgr()->GetBool(OPT_BREAK_ON_WORDS);
        m_nBreakType = GetOptionsMgr()->GetInt(OPT_BREAK_TYPE);
-       m_breakChars = GetOptionsMgr()->GetString(OPT_BREAK_SEPARATORS).c_str();
+       m_breakChars = GetOptionsMgr()->GetString(OPT_BREAK_SEPARATORS);
 }
 
 /** 

diff --git a/Src/PropRegistry.cpp b/Src/PropRegistry.cpp
index b4e2645..bc7780f 100644 (file)
--- a/Src/PropRegistry.cpp
+++ b/Src/PropRegistry.cpp
@@ -69,11 +69,11 @@ END_MESSAGE_MAP()
  */
 void PropRegistry::ReadOptions()
 {
-       m_strEditorPath = GetOptionsMgr()->GetString(OPT_EXT_EDITOR_CMD).c_str();
+       m_strEditorPath = GetOptionsMgr()->GetString(OPT_EXT_EDITOR_CMD);
        m_bUseRecycleBin = GetOptionsMgr()->GetBool(OPT_USE_RECYCLE_BIN);
-       m_strUserFilterPath = GetOptionsMgr()->GetString(OPT_FILTER_USERPATH).c_str();
+       m_strUserFilterPath = GetOptionsMgr()->GetString(OPT_FILTER_USERPATH);
        m_tempFolderType = GetOptionsMgr()->GetBool(OPT_USE_SYSTEM_TEMP_PATH) ? 0 : 1;
-       m_tempFolder = GetOptionsMgr()->GetString(OPT_CUSTOM_TEMP_PATH).c_str();
+       m_tempFolder = GetOptionsMgr()->GetString(OPT_CUSTOM_TEMP_PATH);
 }
 
 /** 

diff --git a/Src/PropVss.cpp b/Src/PropVss.cpp
index 45452c9..2132ba0 100644 (file)
--- a/Src/PropVss.cpp
+++ b/Src/PropVss.cpp
@@ -69,7 +69,7 @@ END_MESSAGE_MAP()
 void PropVss::ReadOptions()
 {
        m_nVerSys = GetOptionsMgr()->GetInt(OPT_VCS_SYSTEM);
-       m_strPath = GetOptionsMgr()->GetString(OPT_VSS_PATH).c_str();
+       m_strPath = GetOptionsMgr()->GetString(OPT_VSS_PATH);
 }
 
 /**