Del RefLog work.

[tortoisegit/TortoiseGitJp.git] / src / TGitCache / StatusCacheEntry.h

diff --git a/src/TGitCache/StatusCacheEntry.h b/src/TGitCache/StatusCacheEntry.h
index f99f38e..f453087 100644 (file)
--- a/src/TGitCache/StatusCacheEntry.h
+++ b/src/TGitCache/StatusCacheEntry.h
@@ -22,7 +22,7 @@ struct TSVNCacheResponse;
 #define CACHETIMEOUT   0x7FFFFFFF\r
 extern DWORD cachetimeout;\r
 \r
-#include "GitStatus.h"\r
+#include "CacheInterface.h"\r
 \r
 /**\r
  * \ingroup TSVNCache\r
@@ -32,7 +32,7 @@ class CStatusCacheEntry
 {\r
 public:\r
        CStatusCacheEntry();\r
-       CStatusCacheEntry(const git_wc_status2_t* pSVNStatus, __int64 lastWriteTime, bool bReadOnly, DWORD validuntil = 0);\r
+       CStatusCacheEntry(const git_wc_status2_t* pGitStatus, __int64 lastWriteTime, bool bReadOnly, DWORD validuntil = 0);\r
        bool HasExpired(long now) const;\r
        void BuildCacheResponse(TSVNCacheResponse& response, DWORD& responseLength) const;\r
        bool IsVersioned() const;\r
@@ -40,10 +40,10 @@ public:
        bool ForceStatus(git_wc_status_kind forcedStatus);\r
        git_wc_status_kind GetEffectiveStatus() const { return m_highestPriorityLocalStatus; }\r
        bool IsKindKnown() const { return ((m_kind != git_node_none)&&(m_kind != git_node_unknown)); }\r
-       void SetStatus(const git_wc_status2_t* pSVNStatus);\r
+       void SetStatus(const git_wc_status2_t* pGitStatus);\r
        bool HasBeenSet() const;\r
        void Invalidate();\r
-       bool IsDirectory() const {return ((m_kind == git_node_dir)&&(m_highestPriorityLocalStatus != git_wc_status_ignored));}\r
+       bool IsDirectory() const { return ((m_kind == git_node_dir)&&(m_highestPriorityLocalStatus != git_wc_status_ignored)); }\r
        bool SaveToDisk(FILE * pFile);\r
        bool LoadFromDisk(FILE * pFile);\r
        void SetKind(git_node_kind_t kind) {m_kind = kind;}\r
@@ -53,7 +53,7 @@ private:
 private:\r
        long                            m_discardAtTime;\r
        git_wc_status_kind      m_highestPriorityLocalStatus;\r
-       git_wc_status2_t        m_svnStatus;\r
+       git_wc_status2_t        m_GitStatus;\r
        __int64                         m_lastWriteTime;\r
        bool                            m_bSet;\r
        git_node_kind_t         m_kind;\r
@@ -67,5 +67,5 @@ private:
        CStringA                        m_sPresentProps;\r
        git_revnum_t            m_commitRevision;\r
 \r
-//     friend class CSVNStatusCache;\r
+       friend class CGitStatusCache;\r
 };\r