From 4aa0aaea643612e003914f2aff121d3edd8dc665 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 8 Aug 2015 17:50:55 +0200 Subject: [PATCH] No need to explicitly initialize CString and use Empty() for clearing CString Signed-off-by: Sven Strickroth --- src/TortoiseMerge/BaseView.cpp | 2 +- src/TortoiseMerge/OpenDlg.cpp | 5 ----- src/TortoiseMerge/RegexFilterDlg.cpp | 3 --- src/TortoiseMerge/WorkingFile.cpp | 2 +- src/TortoiseProc/AddRemoteDlg.cpp | 4 +--- src/TortoiseProc/AppUtils.cpp | 8 ++++---- src/TortoiseProc/AutoTextTestDlg.cpp | 3 --- src/TortoiseProc/BrowseRefsDlg.cpp | 4 ++-- src/TortoiseProc/CloneDlg.cpp | 1 - src/TortoiseProc/Commands/CloneCommand.cpp | 4 ---- src/TortoiseProc/Commands/RequestPullCommand.cpp | 6 +++--- src/TortoiseProc/CreateChangelistDlg.cpp | 1 - src/TortoiseProc/DeleteConflictDlg.cpp | 3 --- src/TortoiseProc/ExportDlg.cpp | 1 - src/TortoiseProc/GitLogListBase.cpp | 7 +++---- src/TortoiseProc/InputDlg.cpp | 1 - src/TortoiseProc/LogDlg.cpp | 2 -- src/TortoiseProc/MergeDlg.cpp | 4 ++-- src/TortoiseProc/PromptDlg.cpp | 2 -- src/TortoiseProc/RenameDlg.cpp | 1 - src/TortoiseProc/RevisionGraph/RevGraphFilterDlg.cpp | 4 +--- src/TortoiseProc/SendMailDlg.cpp | 3 --- src/TortoiseProc/Settings/SetDialogs.cpp | 1 - src/TortoiseProc/Settings/SetDialogs3.cpp | 4 ++-- src/TortoiseProc/Settings/SetMainPage.cpp | 1 - src/TortoiseProc/Settings/SetOverlayPage.cpp | 4 +--- src/TortoiseProc/Settings/SetProgsAdvDlg.cpp | 2 -- src/TortoiseProc/Settings/SetProxyPage.cpp | 6 +----- src/TortoiseProc/Settings/SettingGitConfig.cpp | 3 --- src/TortoiseProc/Settings/SettingGitCredential.cpp | 3 --- src/TortoiseProc/Settings/SettingGitRemote.cpp | 3 --- src/TortoiseProc/Settings/SettingsProgsAlternativeEditor.cpp | 1 - src/TortoiseProc/Settings/SettingsProgsDiff.cpp | 2 -- src/TortoiseProc/Settings/SettingsProgsMerge.cpp | 1 - src/TortoiseProc/Settings/SettingsTBlame.cpp | 3 +-- src/TortoiseProc/Settings/SettingsTUDiff.cpp | 3 +-- src/TortoiseProc/Settings/ToolAssocDlg.cpp | 2 -- src/TortoiseProc/SimplePrompt.cpp | 3 --- src/TortoiseProc/SubmoduleAddDlg.cpp | 3 +-- src/TortoiseProc/UserPassword.cpp | 2 -- src/Utils/ACListWnd.cpp | 2 +- src/Utils/MiscUI/HTMLFormatter.cpp | 12 ++++++------ 42 files changed, 32 insertions(+), 100 deletions(-) diff --git a/src/TortoiseMerge/BaseView.cpp b/src/TortoiseMerge/BaseView.cpp index b660987c3..23b3a421b 100644 --- a/src/TortoiseMerge/BaseView.cpp +++ b/src/TortoiseMerge/BaseView.cpp @@ -2069,7 +2069,7 @@ void CBaseView::ExpandChars(const CString &sLine, int nOffset, int nCount, CStri { if (nCount <= 0) { - line = _T(""); + line.Empty(); return; } diff --git a/src/TortoiseMerge/OpenDlg.cpp b/src/TortoiseMerge/OpenDlg.cpp index 4a167beb0..7db329b1c 100644 --- a/src/TortoiseMerge/OpenDlg.cpp +++ b/src/TortoiseMerge/OpenDlg.cpp @@ -29,11 +29,6 @@ IMPLEMENT_DYNAMIC(COpenDlg, CStandAloneDialog) COpenDlg::COpenDlg(CWnd* pParent /*=NULL*/) : CStandAloneDialog(COpenDlg::IDD, pParent) - , m_sBaseFile(_T("")) - , m_sTheirFile(_T("")) - , m_sYourFile(_T("")) - , m_sUnifiedDiffFile(_T("")) - , m_sPatchDirectory(_T("")) , m_bFromClipboard(FALSE) , m_cFormat(0) , m_nextViewer(NULL) diff --git a/src/TortoiseMerge/RegexFilterDlg.cpp b/src/TortoiseMerge/RegexFilterDlg.cpp index 38da4fc31..ef1877a04 100644 --- a/src/TortoiseMerge/RegexFilterDlg.cpp +++ b/src/TortoiseMerge/RegexFilterDlg.cpp @@ -29,9 +29,6 @@ IMPLEMENT_DYNAMIC(CRegexFilterDlg, CDialogEx) CRegexFilterDlg::CRegexFilterDlg(CWnd* pParent /*=NULL*/) : CDialogEx(CRegexFilterDlg::IDD, pParent) - , m_sName(_T("")) - , m_sRegex(_T("")) - , m_sReplace(_T("")) { } diff --git a/src/TortoiseMerge/WorkingFile.cpp b/src/TortoiseMerge/WorkingFile.cpp index 534dfca34..c89a7fada 100644 --- a/src/TortoiseMerge/WorkingFile.cpp +++ b/src/TortoiseMerge/WorkingFile.cpp @@ -90,7 +90,7 @@ void CWorkingFile::TransferDetailsFrom(CWorkingFile& rightHandFile) CString CWorkingFile::GetWindowName() const { - CString sErrMsg = _T(""); + CString sErrMsg; // TortoiseMerge allows non-existing files to be used in a merge // Inform the user (in a non-intrusive way) if a file is absent if (! this->Exists()) diff --git a/src/TortoiseProc/AddRemoteDlg.cpp b/src/TortoiseProc/AddRemoteDlg.cpp index de9ac553f..f186b5725 100644 --- a/src/TortoiseProc/AddRemoteDlg.cpp +++ b/src/TortoiseProc/AddRemoteDlg.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2009 - TortoiseGit +// Copyright (C) 2009, 2015 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -30,8 +30,6 @@ IMPLEMENT_DYNAMIC(CAddRemoteDlg, CDialog) CAddRemoteDlg::CAddRemoteDlg(CWnd* pParent /*=NULL*/) : CDialog(CAddRemoteDlg::IDD, pParent) - , m_Name(_T("")) - , m_Url(_T("")) { } diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 4c9f0aeb9..c574536e4 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -1397,7 +1397,7 @@ public: void ResetState() { m_Items.clear(); - m_eol = _T(""); + m_eol.Empty(); } }; @@ -2224,7 +2224,7 @@ CString CAppUtils::GetClipboardLink(const CString &skipGitPrefix, int paramsCoun } } - return CString(_T("")); + return CString(); } CString CAppUtils::ChooseRepository(const CString* path) @@ -2480,7 +2480,7 @@ bool CAppUtils::Pull(bool showPush, bool showStashPop) } if (showPush) - postCmdList.push_back(PostCmd(IDI_PUSH, IDS_MENUPUSH, []{ Push(_T("")); })); + postCmdList.push_back(PostCmd(IDI_PUSH, IDS_MENUPUSH, []{ Push(); })); CTGitPath gitPath = g_Git.m_CurrentDir; if (gitPath.HasSubmodules()) @@ -3099,7 +3099,7 @@ BOOL CAppUtils::SVNDCommit() { CSVNDCommitDlg dcommitdlg; CString gitSetting = g_Git.GetConfigValue(_T("svn.rmdir")); - if (gitSetting == _T("")) { + if (gitSetting.IsEmpty()) { if (dcommitdlg.DoModal() != IDOK) { return false; diff --git a/src/TortoiseProc/AutoTextTestDlg.cpp b/src/TortoiseProc/AutoTextTestDlg.cpp index 2236535d5..44769b51b 100644 --- a/src/TortoiseProc/AutoTextTestDlg.cpp +++ b/src/TortoiseProc/AutoTextTestDlg.cpp @@ -30,9 +30,6 @@ IMPLEMENT_DYNAMIC(CAutoTextTestDlg, CDialog) CAutoTextTestDlg::CAutoTextTestDlg(CWnd* pParent /*=NULL*/) : CDialog(CAutoTextTestDlg::IDD, pParent) - , m_sRegex(_T("")) - , m_sResult(_T("")) - , m_sTimingLabel(_T("")) { } diff --git a/src/TortoiseProc/BrowseRefsDlg.cpp b/src/TortoiseProc/BrowseRefsDlg.cpp index 743ca4dfa..8f4547ff6 100644 --- a/src/TortoiseProc/BrowseRefsDlg.cpp +++ b/src/TortoiseProc/BrowseRefsDlg.cpp @@ -61,7 +61,7 @@ static int SplitRemoteBranchName(CString ref, CString &remote, CString &branch) if (ref == list[i]) { remote = list[i]; - branch = _T(""); + branch.Empty(); return 0; } } @@ -1041,7 +1041,7 @@ void CBrowseRefsDlg::ShowContextMenu(CPoint point, HTREEITEM hTreePos, VectorPSh { CString remoteBranch; if (SplitRemoteBranchName(pTree->GetRefName(), remoteName, remoteBranch)) - remoteName = _T(""); + remoteName.Empty(); int pos = findVectorPosition(remotes, remoteName); if (pos >= 0) { diff --git a/src/TortoiseProc/CloneDlg.cpp b/src/TortoiseProc/CloneDlg.cpp index 2171a8b06..18b425143 100644 --- a/src/TortoiseProc/CloneDlg.cpp +++ b/src/TortoiseProc/CloneDlg.cpp @@ -31,7 +31,6 @@ IMPLEMENT_DYNCREATE(CCloneDlg, CHorizontalResizableStandAloneDialog) CCloneDlg::CCloneDlg(CWnd* pParent /*=NULL*/) : CHorizontalResizableStandAloneDialog(CCloneDlg::IDD, pParent) - , m_Directory(_T("")) { m_bRecursive = FALSE; m_bBare = FALSE; diff --git a/src/TortoiseProc/Commands/CloneCommand.cpp b/src/TortoiseProc/Commands/CloneCommand.cpp index 06117695d..afc0bf8e2 100644 --- a/src/TortoiseProc/Commands/CloneCommand.cpp +++ b/src/TortoiseProc/Commands/CloneCommand.cpp @@ -103,14 +103,10 @@ bool CloneCommand::Execute() CString recursiveStr; if(dlg.m_bRecursive) recursiveStr = _T(" --recursive"); - else - recursiveStr = _T(""); CString bareStr; if(dlg.m_bBare) bareStr = _T(" --bare"); - else - bareStr = _T(""); CString nocheckoutStr; if (dlg.m_bNoCheckout) diff --git a/src/TortoiseProc/Commands/RequestPullCommand.cpp b/src/TortoiseProc/Commands/RequestPullCommand.cpp index 72b810de9..794e00a5d 100644 --- a/src/TortoiseProc/Commands/RequestPullCommand.cpp +++ b/src/TortoiseProc/Commands/RequestPullCommand.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2011 - Sven Strickroth +// Copyright (C) 2011, 2015 - Sven Strickroth // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -23,8 +23,8 @@ bool RequestPullCommand::Execute() { - CString endrevision = _T("");; - CString reposirotyurl = _T("");; + CString endrevision; + CString reposirotyurl; if (parser.HasVal(_T("endrev"))) endrevision = parser.GetVal(_T("endrev")); if (parser.HasVal(_T("url"))) diff --git a/src/TortoiseProc/CreateChangelistDlg.cpp b/src/TortoiseProc/CreateChangelistDlg.cpp index f838d5de1..36a450872 100644 --- a/src/TortoiseProc/CreateChangelistDlg.cpp +++ b/src/TortoiseProc/CreateChangelistDlg.cpp @@ -27,7 +27,6 @@ IMPLEMENT_DYNAMIC(CCreateChangelistDlg, CDialog) CCreateChangelistDlg::CCreateChangelistDlg(CWnd* pParent /*=NULL*/) : CDialog(CCreateChangelistDlg::IDD, pParent) - , m_sName(_T("")) { } diff --git a/src/TortoiseProc/DeleteConflictDlg.cpp b/src/TortoiseProc/DeleteConflictDlg.cpp index 42d5f0b2c..bc4189517 100644 --- a/src/TortoiseProc/DeleteConflictDlg.cpp +++ b/src/TortoiseProc/DeleteConflictDlg.cpp @@ -31,9 +31,6 @@ IMPLEMENT_DYNAMIC(CDeleteConflictDlg, CStandAloneDialog) CDeleteConflictDlg::CDeleteConflictDlg(CWnd* pParent /*=NULL*/) : CStandAloneDialog(CDeleteConflictDlg::IDD, pParent) - - , m_LocalStatus(_T("")) - , m_RemoteStatus(_T("")) { m_bShowModifiedButton = FALSE; m_bIsDelete =FALSE; diff --git a/src/TortoiseProc/ExportDlg.cpp b/src/TortoiseProc/ExportDlg.cpp index fb5e0bbcb..35876fea8 100644 --- a/src/TortoiseProc/ExportDlg.cpp +++ b/src/TortoiseProc/ExportDlg.cpp @@ -31,7 +31,6 @@ CExportDlg::CExportDlg(CWnd* pParent /*=NULL*/) , CChooseVersion(this) , m_bWholeProject(FALSE) , m_Revision(_T("HEAD")) - , m_strFile(_T("")) { } diff --git a/src/TortoiseProc/GitLogListBase.cpp b/src/TortoiseProc/GitLogListBase.cpp index b6bc57660..f9d558295 100644 --- a/src/TortoiseProc/GitLogListBase.cpp +++ b/src/TortoiseProc/GitLogListBase.cpp @@ -3088,10 +3088,9 @@ UINT CGitLogListBase::LogThread() void CGitLogListBase::FetchRemoteList() { STRING_VECTOR remoteList; - if (!g_Git.GetRemoteList(remoteList)) - m_SingleRemote = remoteList.size() == 1 ? remoteList[0] : _T(""); - else - m_SingleRemote = _T(""); + m_SingleRemote.Empty(); + if (!g_Git.GetRemoteList(remoteList) && remoteList.size() == 1) + m_SingleRemote = remoteList[0]; } void CGitLogListBase::FetchTrackingBranchList() diff --git a/src/TortoiseProc/InputDlg.cpp b/src/TortoiseProc/InputDlg.cpp index 430a5e2d3..c501b5976 100644 --- a/src/TortoiseProc/InputDlg.cpp +++ b/src/TortoiseProc/InputDlg.cpp @@ -25,7 +25,6 @@ IMPLEMENT_DYNAMIC(CInputDlg, CResizableStandAloneDialog) CInputDlg::CInputDlg(CWnd* pParent /*=NULL*/) : CResizableStandAloneDialog(CInputDlg::IDD, pParent) - , m_sInputText(_T("")) , m_pProjectProperties(NULL) , m_iCheck(0) , m_bUseLogWidth(true) diff --git a/src/TortoiseProc/LogDlg.cpp b/src/TortoiseProc/LogDlg.cpp index c0bb8ccc0..cd14ed52a 100644 --- a/src/TortoiseProc/LogDlg.cpp +++ b/src/TortoiseProc/LogDlg.cpp @@ -57,8 +57,6 @@ CLogDlg::CLogDlg(CWnd* pParent /*=NULL*/) , m_bSelectionMustBeContinuous(false) - , m_sLogInfo(_T("")) - , m_bCancelled(FALSE) , m_pNotifyWindow(NULL) diff --git a/src/TortoiseProc/MergeDlg.cpp b/src/TortoiseProc/MergeDlg.cpp index 0f5f28fa0..f4930e91a 100644 --- a/src/TortoiseProc/MergeDlg.cpp +++ b/src/TortoiseProc/MergeDlg.cpp @@ -173,9 +173,9 @@ void CMergeDlg::OnBnClickedOk() } if (m_MergeStrategy != _T("recursive")) - m_StrategyOption = _T(""); + m_StrategyOption.Empty(); if (m_StrategyOption != _T("rename-threshold") && m_StrategyOption != _T("subtree")) - m_StrategyParam = _T(""); + m_StrategyParam.Empty(); OnOK(); } diff --git a/src/TortoiseProc/PromptDlg.cpp b/src/TortoiseProc/PromptDlg.cpp index 9f750ed24..0baee6403 100644 --- a/src/TortoiseProc/PromptDlg.cpp +++ b/src/TortoiseProc/PromptDlg.cpp @@ -24,8 +24,6 @@ IMPLEMENT_DYNAMIC(CPromptDlg, CDialog) CPromptDlg::CPromptDlg(CWnd* pParent /*=NULL*/) : CDialog(CPromptDlg::IDD, pParent) - , m_info(_T("")) - , m_sPass(_T("")) , m_saveCheck(FALSE) , m_hide(FALSE) , m_hParentWnd(NULL) diff --git a/src/TortoiseProc/RenameDlg.cpp b/src/TortoiseProc/RenameDlg.cpp index 0c76fd91b..4e1ee5ff3 100644 --- a/src/TortoiseProc/RenameDlg.cpp +++ b/src/TortoiseProc/RenameDlg.cpp @@ -27,7 +27,6 @@ IMPLEMENT_DYNAMIC(CRenameDlg, CHorizontalResizableStandAloneDialog) CRenameDlg::CRenameDlg(CWnd* pParent /*=NULL*/) : CHorizontalResizableStandAloneDialog(CRenameDlg::IDD, pParent) - , m_name(_T("")) , m_renameRequired(true) , m_pInputValidator(NULL) , m_bBalloonVisible(false) diff --git a/src/TortoiseProc/RevisionGraph/RevGraphFilterDlg.cpp b/src/TortoiseProc/RevisionGraph/RevGraphFilterDlg.cpp index fa04f4c0b..420384efe 100644 --- a/src/TortoiseProc/RevisionGraph/RevGraphFilterDlg.cpp +++ b/src/TortoiseProc/RevisionGraph/RevGraphFilterDlg.cpp @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2003-2006 - Stefan Kueng -// Copyright (C) 2012-2014 - TortoiseGit +// Copyright (C) 2012-2015 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -28,8 +28,6 @@ IMPLEMENT_DYNAMIC(CRevGraphFilterDlg, CDialog) CRevGraphFilterDlg::CRevGraphFilterDlg(CWnd* pParent /*=NULL*/) : CDialog(CRevGraphFilterDlg::IDD, pParent) - , m_sFromRev(_T("")) - , m_sToRev(_T("")) , m_bCurrentBranch(FALSE) , m_bLocalBranches(FALSE) { diff --git a/src/TortoiseProc/SendMailDlg.cpp b/src/TortoiseProc/SendMailDlg.cpp index ecfa68af0..22ae1b9b9 100644 --- a/src/TortoiseProc/SendMailDlg.cpp +++ b/src/TortoiseProc/SendMailDlg.cpp @@ -32,9 +32,6 @@ IMPLEMENT_DYNAMIC(CSendMailDlg, CResizableStandAloneDialog) CSendMailDlg::CSendMailDlg(CWnd* pParent /*=NULL*/) : CResizableStandAloneDialog(CSendMailDlg::IDD, pParent) - , m_To(_T("")) - , m_CC(_T("")) - , m_Subject(_T("")) , m_bCustomSubject(FALSE) , m_regAttach(_T("Software\\TortoiseGit\\TortoiseProc\\SendMail\\Attach"),0) diff --git a/src/TortoiseProc/Settings/SetDialogs.cpp b/src/TortoiseProc/Settings/SetDialogs.cpp index ca2b22152..af5ae2907 100644 --- a/src/TortoiseProc/Settings/SetDialogs.cpp +++ b/src/TortoiseProc/Settings/SetDialogs.cpp @@ -31,7 +31,6 @@ CSetDialogs::CSetDialogs() , m_bRelativeTimes(FALSE) , m_bAsteriskLogPrefix(TRUE) , m_dwFontSize(0) - , m_sFontName(_T("")) , m_bDiffByDoubleClick(FALSE) , m_bUseSystemLocaleForDates(FALSE) , m_bAbbreviateRenamings(FALSE) diff --git a/src/TortoiseProc/Settings/SetDialogs3.cpp b/src/TortoiseProc/Settings/SetDialogs3.cpp index 1673d31fe..4e259b59b 100644 --- a/src/TortoiseProc/Settings/SetDialogs3.cpp +++ b/src/TortoiseProc/Settings/SetDialogs3.cpp @@ -136,7 +136,7 @@ void CSetDialogs3::LoadDataImpl(CAutoConfig& config) } { - m_LogMinSize = _T(""); + m_LogMinSize.Empty(); CString value; m_bInheritLogMinSize = (config.GetString(PROJECTPROPNAME_LOGMINSIZE, value) == GIT_ENOTFOUND); if (!value.IsEmpty() || m_iConfigSource == 0) @@ -148,7 +148,7 @@ void CSetDialogs3::LoadDataImpl(CAutoConfig& config) } { - m_Border = _T(""); + m_Border.Empty(); CString value; m_bInheritBorder = (config.GetString(PROJECTPROPNAME_LOGWIDTHLINE, value) == GIT_ENOTFOUND); if (!value.IsEmpty() || m_iConfigSource == 0) diff --git a/src/TortoiseProc/Settings/SetMainPage.cpp b/src/TortoiseProc/Settings/SetMainPage.cpp index c4877e1b3..aac5cc4d2 100644 --- a/src/TortoiseProc/Settings/SetMainPage.cpp +++ b/src/TortoiseProc/Settings/SetMainPage.cpp @@ -35,7 +35,6 @@ IMPLEMENT_DYNAMIC(CSetMainPage, ISettingsPropPage) CSetMainPage::CSetMainPage() : ISettingsPropPage(CSetMainPage::IDD) - , m_sMsysGitPath(_T("")) , m_bCheckNewer(TRUE) , m_dwLanguage(0) { diff --git a/src/TortoiseProc/Settings/SetOverlayPage.cpp b/src/TortoiseProc/Settings/SetOverlayPage.cpp index 5eeea00f3..83c788dbc 100644 --- a/src/TortoiseProc/Settings/SetOverlayPage.cpp +++ b/src/TortoiseProc/Settings/SetOverlayPage.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2009,2011,2013-2014 - TortoiseGit +// Copyright (C) 2008-2009,2011,2013-2015 - TortoiseGit // Copyright (C) 2003-2008,2011 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -36,8 +36,6 @@ CSetOverlayPage::CSetOverlayPage() , m_bRAM(FALSE) , m_bUnknown(FALSE) , m_bOnlyExplorer(FALSE) - , m_sExcludePaths(_T("")) - , m_sIncludePaths(_T("")) , m_bUnversionedAsModified(FALSE) , m_bRecurseSubmodules(FALSE) , m_bFloppy(FALSE) diff --git a/src/TortoiseProc/Settings/SetProgsAdvDlg.cpp b/src/TortoiseProc/Settings/SetProgsAdvDlg.cpp index da1b75a08..eab40bc88 100644 --- a/src/TortoiseProc/Settings/SetProgsAdvDlg.cpp +++ b/src/TortoiseProc/Settings/SetProgsAdvDlg.cpp @@ -211,8 +211,6 @@ void CSetProgsAdvDlg::EnableBtns() void CSetProgsAdvDlg::OnBnClickedAddtool() { CToolAssocDlg dlg(m_sType, true); - dlg.m_sExtension = _T(""); - dlg.m_sTool = _T(""); if (dlg.DoModal() == IDOK) { int index = AddExtension(dlg.m_sExtension, dlg.m_sTool); diff --git a/src/TortoiseProc/Settings/SetProxyPage.cpp b/src/TortoiseProc/Settings/SetProxyPage.cpp index 120e1d583..deaf4a330 100644 --- a/src/TortoiseProc/Settings/SetProxyPage.cpp +++ b/src/TortoiseProc/Settings/SetProxyPage.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2010-2014 - TortoiseGit +// Copyright (C) 2010-2015 - TortoiseGit // Copyright (C) 2003-2007 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -29,12 +29,8 @@ IMPLEMENT_DYNAMIC(CSetProxyPage, ISettingsPropPage) CSetProxyPage::CSetProxyPage() : ISettingsPropPage(CSetProxyPage::IDD) - , m_serveraddress(_T("")) , m_serverport(0) - , m_username(_T("")) - , m_password(_T("")) , m_isEnabled(FALSE) - , m_SSHClient(_T("")) { m_regServeraddress = CRegString(_T("Software\\TortoiseGit\\Git\\Servers\\global\\http-proxy-host"), _T("")); m_regServerport = CRegString(_T("Software\\TortoiseGit\\Git\\Servers\\global\\http-proxy-port"), _T("")); diff --git a/src/TortoiseProc/Settings/SettingGitConfig.cpp b/src/TortoiseProc/Settings/SettingGitConfig.cpp index 8a88fdc72..6510c9377 100644 --- a/src/TortoiseProc/Settings/SettingGitConfig.cpp +++ b/src/TortoiseProc/Settings/SettingGitConfig.cpp @@ -31,9 +31,6 @@ IMPLEMENT_DYNAMIC(CSettingGitConfig, ISettingsPropPage) CSettingGitConfig::CSettingGitConfig() : ISettingsPropPage(CSettingGitConfig::IDD) - , m_UserName(_T("")) - , m_UserEmail(_T("")) - , m_UserSigningKey(_T("")) , m_bAutoCrlf(FALSE) , m_bNeedSave(false) , m_bQuotePath(TRUE) diff --git a/src/TortoiseProc/Settings/SettingGitCredential.cpp b/src/TortoiseProc/Settings/SettingGitCredential.cpp index 475138fcb..1a7639923 100644 --- a/src/TortoiseProc/Settings/SettingGitCredential.cpp +++ b/src/TortoiseProc/Settings/SettingGitCredential.cpp @@ -71,9 +71,6 @@ IMPLEMENT_DYNAMIC(CSettingGitCredential, ISettingsPropPage) CSettingGitCredential::CSettingGitCredential() : ISettingsPropPage(CSettingGitCredential::IDD) - , m_strUrl(_T("")) - , m_strHelper(_T("")) - , m_strUsername(_T("")) , m_bUseHttpPath(FALSE) { diff --git a/src/TortoiseProc/Settings/SettingGitRemote.cpp b/src/TortoiseProc/Settings/SettingGitRemote.cpp index c2d0673e4..0bfaec8cd 100644 --- a/src/TortoiseProc/Settings/SettingGitRemote.cpp +++ b/src/TortoiseProc/Settings/SettingGitRemote.cpp @@ -35,9 +35,6 @@ IMPLEMENT_DYNAMIC(CSettingGitRemote, ISettingsPropPage) CSettingGitRemote::CSettingGitRemote() : ISettingsPropPage(CSettingGitRemote::IDD) - , m_strRemote(_T("")) - , m_strUrl(_T("")) - , m_strPuttyKeyfile(_T("")) , m_bNoFetch(false) , m_bPrune(2) , m_bPruneAll(FALSE) diff --git a/src/TortoiseProc/Settings/SettingsProgsAlternativeEditor.cpp b/src/TortoiseProc/Settings/SettingsProgsAlternativeEditor.cpp index 51f14677c..f98af41d2 100644 --- a/src/TortoiseProc/Settings/SettingsProgsAlternativeEditor.cpp +++ b/src/TortoiseProc/Settings/SettingsProgsAlternativeEditor.cpp @@ -26,7 +26,6 @@ IMPLEMENT_DYNAMIC(CSettingsProgsAlternativeEditor, ISettingsPropPage) CSettingsProgsAlternativeEditor::CSettingsProgsAlternativeEditor() : ISettingsPropPage(CSettingsProgsAlternativeEditor::IDD) - , m_sAlternativeEditorPath(_T("")) , m_iAlternativeEditor(0) { m_regAlternativeEditorPath = CRegString(_T("Software\\TortoiseGit\\AlternativeEditor")); diff --git a/src/TortoiseProc/Settings/SettingsProgsDiff.cpp b/src/TortoiseProc/Settings/SettingsProgsDiff.cpp index e62eb5fce..345efa1e0 100644 --- a/src/TortoiseProc/Settings/SettingsProgsDiff.cpp +++ b/src/TortoiseProc/Settings/SettingsProgsDiff.cpp @@ -28,8 +28,6 @@ CSettingsProgsDiff::CSettingsProgsDiff() : ISettingsPropPage(CSettingsProgsDiff::IDD) , m_dlgAdvDiff(_T("Diff")) , m_iExtDiff(0) - , m_sDiffPath(_T("")) - , m_sDiffViewerPath(_T("")) , m_iDiffViewer(0) { m_regDiffPath = CRegString(_T("Software\\TortoiseGit\\Diff")); diff --git a/src/TortoiseProc/Settings/SettingsProgsMerge.cpp b/src/TortoiseProc/Settings/SettingsProgsMerge.cpp index d990a8cff..8aef1944f 100644 --- a/src/TortoiseProc/Settings/SettingsProgsMerge.cpp +++ b/src/TortoiseProc/Settings/SettingsProgsMerge.cpp @@ -25,7 +25,6 @@ IMPLEMENT_DYNAMIC(CSettingsProgsMerge, ISettingsPropPage) CSettingsProgsMerge::CSettingsProgsMerge() : ISettingsPropPage(CSettingsProgsMerge::IDD) - , m_sMergePath(_T("")) , m_iExtMerge(0) , m_dlgAdvMerge(_T("Merge")) { diff --git a/src/TortoiseProc/Settings/SettingsTBlame.cpp b/src/TortoiseProc/Settings/SettingsTBlame.cpp index 7eb621003..63cf600ae 100644 --- a/src/TortoiseProc/Settings/SettingsTBlame.cpp +++ b/src/TortoiseProc/Settings/SettingsTBlame.cpp @@ -1,7 +1,7 @@ // TortoiseGit - a Windows shell extension for easy version control // Copyright (C) 2007-2008 - TortoiseSVN -// Copyright (C) 2011-2014 - TortoiseGit +// Copyright (C) 2011-2015 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -32,7 +32,6 @@ CSettingsTBlame::CSettingsTBlame() : ISettingsPropPage(CSettingsTBlame::IDD) , m_dwFontSize(0) - , m_sFontName(_T("")) , m_dwTabSize(4) , m_dwDetectMovedOrCopiedLines(BLAME_DETECT_MOVED_OR_COPIED_LINES_DISABLED) , m_dwDetectMovedOrCopiedLinesNumCharactersWithinFile(BLAME_DETECT_MOVED_OR_COPIED_LINES_NUM_CHARACTERS_WITHIN_FILE_DEFAULT) diff --git a/src/TortoiseProc/Settings/SettingsTUDiff.cpp b/src/TortoiseProc/Settings/SettingsTUDiff.cpp index 6ba24e3dd..e641b2e90 100644 --- a/src/TortoiseProc/Settings/SettingsTUDiff.cpp +++ b/src/TortoiseProc/Settings/SettingsTUDiff.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2014 - TortoiseGit +// Copyright (C) 2014-2015 - TortoiseGit // Copyright (C) 2014 - TortoiseSVN // This program is free software; you can redistribute it and/or @@ -28,7 +28,6 @@ IMPLEMENT_DYNAMIC(CSettingsUDiff, ISettingsPropPage) CSettingsUDiff::CSettingsUDiff() : ISettingsPropPage(CSettingsUDiff::IDD) , m_dwFontSize(0) -, m_sFontName(L"") , m_dwTabSize(4) { m_regForeCommandColor = CRegDWORD(L"Software\\TortoiseGit\\UDiffForeCommandColor", UDIFF_COLORFORECOMMAND); diff --git a/src/TortoiseProc/Settings/ToolAssocDlg.cpp b/src/TortoiseProc/Settings/ToolAssocDlg.cpp index 2d41371ba..ae43e09af 100644 --- a/src/TortoiseProc/Settings/ToolAssocDlg.cpp +++ b/src/TortoiseProc/Settings/ToolAssocDlg.cpp @@ -26,8 +26,6 @@ CToolAssocDlg::CToolAssocDlg(const CString& type, bool add, CWnd* pParent /*=NUL : CDialog(CToolAssocDlg::IDD, pParent) , m_sType(type) , m_bAdd(add) - , m_sExtension(_T("")) - , m_sTool(_T("")) { } diff --git a/src/TortoiseProc/SimplePrompt.cpp b/src/TortoiseProc/SimplePrompt.cpp index e5f994729..0ada4d7ee 100644 --- a/src/TortoiseProc/SimplePrompt.cpp +++ b/src/TortoiseProc/SimplePrompt.cpp @@ -23,10 +23,7 @@ IMPLEMENT_DYNAMIC(CSimplePrompt, CDialog) CSimplePrompt::CSimplePrompt(CWnd* pParent /*=NULL*/) : CDialog(CSimplePrompt::IDD, pParent) - , m_sUsername(_T("")) - , m_sPassword(_T("")) , m_bSaveAuthentication(FALSE) - , m_sRealm(_T("")) , m_hParentWnd(NULL) { } diff --git a/src/TortoiseProc/SubmoduleAddDlg.cpp b/src/TortoiseProc/SubmoduleAddDlg.cpp index 43fa71c03..4035bf9bd 100644 --- a/src/TortoiseProc/SubmoduleAddDlg.cpp +++ b/src/TortoiseProc/SubmoduleAddDlg.cpp @@ -1,6 +1,6 @@ // TortoiseGit - a Windows shell extension for easy version control -// Copyright (C) 2008-2013 - TortoiseGit +// Copyright (C) 2008-2013, 2015 - TortoiseGit // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -34,7 +34,6 @@ IMPLEMENT_DYNAMIC(CSubmoduleAddDlg, CHorizontalResizableStandAloneDialog) CSubmoduleAddDlg::CSubmoduleAddDlg(CWnd* pParent /*=NULL*/) : CHorizontalResizableStandAloneDialog(CSubmoduleAddDlg::IDD, pParent) , m_bBranch(FALSE) - , m_strBranch(_T("")) , m_bForce(FALSE) { m_bAutoloadPuttyKeyFile = CAppUtils::IsSSHPutty(); diff --git a/src/TortoiseProc/UserPassword.cpp b/src/TortoiseProc/UserPassword.cpp index 9f5727405..afc1f2983 100644 --- a/src/TortoiseProc/UserPassword.cpp +++ b/src/TortoiseProc/UserPassword.cpp @@ -28,8 +28,6 @@ IMPLEMENT_DYNAMIC(CUserPassword, CDialog) CUserPassword::CUserPassword(CWnd* pParent /*=NULL*/) : CDialog(CUserPassword::IDD, pParent) - , m_UserName(_T("")) - , m_Password(_T("")) { } diff --git a/src/Utils/ACListWnd.cpp b/src/Utils/ACListWnd.cpp index e1e4758b1..73766e7c3 100644 --- a/src/Utils/ACListWnd.cpp +++ b/src/Utils/ACListWnd.cpp @@ -594,7 +594,7 @@ int CACListWnd::FindString(int nStartAfter, LPCTSTR lpszString, bool m_bDisplayO if(m_PrefixChar) m_Str1 = m_PrefixChar; else - m_Str1 = _T(""); + m_Str1.Empty(); m_Str1 += m_SearchList.GetAt(i); diff --git a/src/Utils/MiscUI/HTMLFormatter.cpp b/src/Utils/MiscUI/HTMLFormatter.cpp index eb922968b..77bd2e3e5 100644 --- a/src/Utils/MiscUI/HTMLFormatter.cpp +++ b/src/Utils/MiscUI/HTMLFormatter.cpp @@ -64,8 +64,8 @@ CSize CHTMLFormatter::DrawHTML(CDC * pDC, CRect rect, CString str, LOGFONT font, int nHeight = textMetric.tmHeight; int nWidth = textMetric.tmAveCharWidth; - CString strTag = _T(""); - CString strText = _T(""); + CString strTag; + CString strText; UINT nParam = 0; CRect linkRect; @@ -92,7 +92,7 @@ CSize CHTMLFormatter::DrawHTML(CDC * pDC, CRect rect, CString str, LOGFONT font, case _T('<'): nState = TEXT_TAG; //statemachine to 'waiting for the tag' bCloseTag = FALSE; //opening bracket - strTag = _T(""); + strTag.Empty(); break; case _T('\n'): nCmd = NEW_LINE; @@ -224,7 +224,7 @@ CSize CHTMLFormatter::DrawHTML(CDC * pDC, CRect rect, CString str, LOGFONT font, //waiting for the start of a number if (str.GetAt(i) == _T('=')) { - strTag = _T(""); + strTag.Empty(); nState = TEXT_NUMBER; } else if (str.GetAt(i) == _T('>')) @@ -234,7 +234,7 @@ CSize CHTMLFormatter::DrawHTML(CDC * pDC, CRect rect, CString str, LOGFONT font, //waiting for the start of a number if (str.GetAt(i) == _T('=')) { - strTag = _T(""); + strTag.Empty(); nState = TEXT_URL; } else if (str.GetAt(i) == _T('>')) @@ -307,7 +307,7 @@ CSize CHTMLFormatter::DrawHTML(CDC * pDC, CRect rect, CString str, LOGFONT font, linkRect.right = linkRect.left + s.cx; linkRect.bottom = linkRect.top + s.cy; ptCur.x += s.cx; - strText = _T(""); + strText.Empty(); bFirstOutput = FALSE; } -- 2.11.4.GIT