dlg.m_bDisableCancel = true;
if (!m_filePaths.GetLeft().empty())
{
- if (theApp.m_strSaveAsPath.IsEmpty())
+ if (theApp.m_strSaveAsPath.empty())
dlg.m_sLeftFile = m_filePaths.GetLeft();
else
dlg.m_sLeftFile = theApp.m_strSaveAsPath;
{
if (!m_filePaths.GetMiddle().empty())
{
- if (theApp.m_strSaveAsPath.IsEmpty())
+ if (theApp.m_strSaveAsPath.empty())
dlg.m_sMiddleFile = m_filePaths.GetMiddle();
else
dlg.m_sMiddleFile = theApp.m_strSaveAsPath;
}
if (!m_filePaths.GetRight().empty())
{
- if (theApp.m_strSaveAsPath.IsEmpty())
+ if (theApp.m_strSaveAsPath.empty())
dlg.m_sRightFile = m_filePaths.GetRight();
else
dlg.m_sRightFile = theApp.m_strSaveAsPath;
{
// Open two parsed files to WinMerge, telling WinMerge to
// save over original file (given as third filename).
- theApp.m_strSaveAsPath = conflictFile.c_str();
+ theApp.m_strSaveAsPath = conflictFile;
String theirs = _("Theirs File");
String my = _("Mine File");
theApp.m_strDescriptions[0] = theirs;
m_bExitIfNoDiff = cmdInfo.m_bExitIfNoDiff;
m_bEscShutdown = cmdInfo.m_bEscShutdown;
- m_strSaveAsPath = cmdInfo.m_sOutputpath.c_str();
+ m_strSaveAsPath = cmdInfo.m_sOutputpath;
m_strDescriptions[0] = cmdInfo.m_sLeftDesc;
if (cmdInfo.m_Files.GetSize() < 3)
std::unique_ptr<FileFilterHelper> m_pGlobalFileFilter;
std::unique_ptr<SyntaxColors> m_pSyntaxColors; /**< Syntax color container */
std::unique_ptr<SourceControl> m_pSourceControl;
- CString m_strSaveAsPath; /**< "3rd path" where output saved if given */
+ String m_strSaveAsPath; /**< "3rd path" where output saved if given */
BOOL m_bEscShutdown; /**< If commandline switch -e given ESC closes appliction */
SyntaxColors * GetMainSyntaxColors() { return m_pSyntaxColors.get(); }
BOOL m_bClearCaseTool; /**< WinMerge is executed as an external Rational ClearCase compare/merge tool. */
int information(const String& msg, int type = OK);
};
-/** @brief Load string from string resources; shortcut for CString::LoadString */
+/** @brief Load string from string resources; shortcut for String::LoadString */
String LoadResString(unsigned id);
String tr(const std::string &str);
\ No newline at end of file
bSaveSuccess = false;
// Check third arg possibly given from command-line
- if (!theApp.m_strSaveAsPath.IsEmpty())
+ if (!theApp.m_strSaveAsPath.empty())
{
- if (paths_DoesPathExist((const TCHAR *)theApp.m_strSaveAsPath) == IS_EXISTING_DIR)
+ if (paths_DoesPathExist(theApp.m_strSaveAsPath) == IS_EXISTING_DIR)
{
// third arg was a directory, so get append the filename
String sname;
dlg.m_bDisableCancel = true;
if (!m_filePaths.GetLeft().empty())
{
- if (theApp.m_strSaveAsPath.IsEmpty())
+ if (theApp.m_strSaveAsPath.empty())
dlg.m_sLeftFile = m_filePaths.GetLeft();
else
dlg.m_sLeftFile = theApp.m_strSaveAsPath;
{
if (!m_filePaths.GetMiddle().empty())
{
- if (theApp.m_strSaveAsPath.IsEmpty())
+ if (theApp.m_strSaveAsPath.empty())
dlg.m_sMiddleFile = m_filePaths.GetMiddle();
else
dlg.m_sMiddleFile = theApp.m_strSaveAsPath;
}
if (!m_filePaths.GetRight().empty())
{
- if (theApp.m_strSaveAsPath.IsEmpty())
+ if (theApp.m_strSaveAsPath.empty())
dlg.m_sRightFile = m_filePaths.GetRight();
else
dlg.m_sRightFile = theApp.m_strSaveAsPath;