From d154f855a0ab13af3c890390a02f41a51ff81e29 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sat, 25 Oct 2014 20:11:20 +0200 Subject: [PATCH] Drop unused code Signed-off-by: Sven Strickroth --- src/Git/GitStatus.cpp | 54 --------------------------------------------------- src/Git/GitStatus.h | 29 --------------------------- 2 files changed, 83 deletions(-) diff --git a/src/Git/GitStatus.cpp b/src/Git/GitStatus.cpp index 205610875..81882f6e0 100644 --- a/src/Git/GitStatus.cpp +++ b/src/Git/GitStatus.cpp @@ -193,60 +193,6 @@ void GitStatus::GetStatus(const CTGitPath& path, bool /*update*/ /* = false */, status = &m_status; } -void GitStatus::GetStatusString(git_wc_status_kind status, size_t buflen, TCHAR * string) -{ - TCHAR * buf; - switch (status) - { - case git_wc_status_none: - buf = _T("none\0"); - break; - case git_wc_status_unversioned: - buf = _T("unversioned\0"); - break; - case git_wc_status_normal: - buf = _T("normal\0"); - break; - case git_wc_status_added: - buf = _T("added\0"); - break; - case git_wc_status_missing: - buf = _T("missing\0"); - break; - case git_wc_status_deleted: - buf = _T("deleted\0"); - break; - case git_wc_status_replaced: - buf = _T("replaced\0"); - break; - case git_wc_status_modified: - buf = _T("modified\0"); - break; - case git_wc_status_merged: - buf = _T("merged\0"); - break; - case git_wc_status_conflicted: - buf = _T("conflicted\0"); - break; - case git_wc_status_obstructed: - buf = _T("obstructed\0"); - break; - case git_wc_status_ignored: - buf = _T("ignored"); - break; - case git_wc_status_external: - buf = _T("external"); - break; - case git_wc_status_incomplete: - buf = _T("incomplete\0"); - break; - default: - buf = _T("\0"); - break; - } - _stprintf_s(string, buflen, _T("%s"), buf); -} - typedef CComCritSecLock CAutoLocker; int GitStatus::GetFileStatus(const CString &gitdir, const CString &pathParam, git_wc_status_kind * status,BOOL IsFull, BOOL /*IsRecursive*/,BOOL IsIgnore, FILL_STATUS_CALLBACK callback, void *pData, bool * assumeValid, bool * skipWorktree) diff --git a/src/Git/GitStatus.h b/src/Git/GitStatus.h index 17ac43a29..a7b5ba228 100644 --- a/src/Git/GitStatus.h +++ b/src/Git/GitStatus.h @@ -156,27 +156,10 @@ public: void GetStatus(const CTGitPath& path, bool update = false, bool noignore = false, bool noexternals = false); /** - * Returns a string representation of a git status. - * \param status the status enum - * \param string a string representation - */ - static void GetStatusString(git_wc_status_kind status, size_t buflen, TCHAR * string); - - /** * This member variable hold the status of the last call to GetStatus(). */ git_wc_status2_t * status; ///< the status result of GetStatus() -#ifdef _MFC_VER -friend class Git; // So that Git can get to our m_err - /** - * Set a list of paths which will be considered when calling GetFirstFileStatus. - * If a filter is set, then GetFirstFileStatus/GetNextFileStatus will only return items which are in the filter list - */ - void SetFilter(const CTGitPathList& fileList); - void ClearFilter(); -#endif - private: git_wc_status_kind m_allstatus; ///< used by GetAllStatus and GetAllStatusRecursive @@ -187,16 +170,4 @@ private: * A higher number indicates a more important status. */ static int GetStatusRanking(git_wc_status_kind status); - -#pragma warning(push) -#pragma warning(disable: 4200) - struct STRINGRESOURCEIMAGE - { - WORD nLength; - WCHAR achString[]; - }; -#pragma warning(pop) // C4200 - - static int LoadStringEx(HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax, WORD wLanguage); }; - -- 2.11.4.GIT