X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=src%2FTGitCache%2FStatusCacheEntry.h;h=f453087afa72a6e70c10d6fa79d0566b810a5c9f;hb=9834531ebabd41f77e7faad2fd48f398c0cb7634;hp=f99f38ea7cfaac595a19940de3316fb9de5ba34d;hpb=0b30c255b03bff388c349c01b97edc2e0f3e0af6;p=tortoisegit%2FTortoiseGitJp.git

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