Fix some TGitCache build error

[tortoisegit/TortoiseGitJp.git] / src / TGitCache / ShellUpdater.cpp

diff --git a/src/TGitCache/ShellUpdater.cpp b/src/TGitCache/ShellUpdater.cpp
index 593f64e..7d409c8 100644 (file)
--- a/src/TGitCache/ShellUpdater.cpp
+++ b/src/TGitCache/ShellUpdater.cpp
@@ -19,7 +19,7 @@
 \r
 #include "StdAfx.h"\r
 #include "shlobj.h"\r
-#include "SVNStatusCache.h"\r
+#include "GitStatusCache.h"\r
 \r
 CShellUpdater::CShellUpdater(void)\r
 {\r
@@ -70,7 +70,7 @@ void CShellUpdater::Initialise()
        SetThreadPriority(m_hThread, THREAD_PRIORITY_LOWEST);\r
 }\r
 \r
-void CShellUpdater::AddPathForUpdate(const CTSVNPath& path)\r
+void CShellUpdater::AddPathForUpdate(const CTGitPath& path)\r
 {\r
        {\r
                AutoLocker lock(m_critSec);\r
@@ -113,7 +113,7 @@ void CShellUpdater::WorkerThread()
                Sleep(50);\r
                for(;;)\r
                {\r
-                       CTSVNPath workingPath;\r
+                       CTGitPath workingPath;\r
                        if (!m_bRunning)\r
                                return;\r
                        Sleep(0);\r
@@ -127,7 +127,7 @@ void CShellUpdater::WorkerThread()
 \r
                                if(m_bItemsAddedSinceLastUpdate)\r
                                {\r
-                                       m_pathsToUpdate.erase(std::unique(m_pathsToUpdate.begin(), m_pathsToUpdate.end(), &CTSVNPath::PredLeftEquivalentToRight), m_pathsToUpdate.end());\r
+                                       m_pathsToUpdate.erase(std::unique(m_pathsToUpdate.begin(), m_pathsToUpdate.end(), &CTGitPath::PredLeftEquivalentToRight), m_pathsToUpdate.end());\r
                                        m_bItemsAddedSinceLastUpdate = false;\r
                                }\r
 \r
@@ -141,15 +141,15 @@ void CShellUpdater::WorkerThread()
                        {\r
                                // check if the path is monitored by the watcher. If it isn't, then we have to invalidate the cache\r
                                // for that path and add it to the watcher.\r
-                               if (!CSVNStatusCache::Instance().IsPathWatched(workingPath))\r
+                               if (!CGitStatusCache::Instance().IsPathWatched(workingPath))\r
                                {\r
                                        if (workingPath.HasAdminDir())\r
-                                               CSVNStatusCache::Instance().AddPathToWatch(workingPath);\r
+                                               CGitStatusCache::Instance().AddPathToWatch(workingPath);\r
                                }\r
                                // first send a notification about a sub folder change, so explorer doesn't discard\r
                                // the folder notification. Since we only know for sure that the subversion admin\r
                                // dir is present, we send a notification for that folder.\r
-                               CString admindir = workingPath.GetWinPathString() + _T("\\") + g_SVNAdminDir.GetAdminDirName();\r
+                               CString admindir = workingPath.GetWinPathString() + _T("\\") + g_GitAdminDir.GetAdminDirName();\r
                                SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH | SHCNF_FLUSHNOWAIT, (LPCTSTR)admindir, NULL);\r
                                SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATH | SHCNF_FLUSHNOWAIT, workingPath.GetWinPath(), NULL);\r
                                // Sending an UPDATEDIR notification somehow overwrites/deletes the UPDATEITEM message. And without\r