merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseGitBlame / TortoiseGitBlameView.h

diff --git a/src/TortoiseGitBlame/TortoiseGitBlameView.h b/src/TortoiseGitBlame/TortoiseGitBlameView.h
index 48082fd..1e4cec4 100644 (file)
--- a/src/TortoiseGitBlame/TortoiseGitBlameView.h
+++ b/src/TortoiseGitBlame/TortoiseGitBlameView.h
@@ -110,8 +110,8 @@ protected:
        afx_msg void OnViewNext();\r
        afx_msg void OnViewPrev();\r
        \r
-       int FindNextLine(CString commithash, bool bUpOrDown=false);\r
-       int FindFirstLine(CString commithash, int line)\r
+       int FindNextLine(CGitHash commithash, bool bUpOrDown=false);\r
+       int FindFirstLine(CGitHash commithash, int line)\r
        {\r
                while(line>=0)\r
                {\r
@@ -189,8 +189,8 @@ public:
        LONG                                            m_MouseLine;\r
        LONG                                            m_selectedrev;\r
        LONG                                            m_selectedorigrev;\r
-       CString                                         m_SelectedHash;\r
-       CString                                         m_selecteddate;\r
+       CGitHash                                        m_SelectedHash;\r
+       CGitHash                                        m_selecteddate;\r
        static long                                     m_gotoline;\r
        long                                            m_lowestrev;\r
        long                                            m_highestrev;\r
@@ -202,7 +202,7 @@ public:
 //     std::vector<LONG>               m_Origrevs;\r
        std::vector<CString>    m_Dates;\r
        std::vector<CString>    m_Authors;\r
-       std::vector<CString>    m_CommitHash;\r
+       std::vector<CGitHash>   m_CommitHash;\r
 \r
        std::map<CString,GitRev> m_NoListCommit;\r
 \r