Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename wxFileSystemWatcherBase::DoAdd() to AddAny() and make it public.

Browse Source 
Make this method public to fix compilation after the recent changes as
traverser classes can't call it otherwise (no idea why did it compile with
g++). And give it a better name just in case people decide to call it even
though it's not documented and described as private in comment (but perhaps we
could make it really public later).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-13 12:00:14 +00:00
parent 5c14ec2640
commit 3a2b37010c
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wx/fswatcher.h
View File

@@ -305,6 +305,13 @@ public:
m_owner = handler; m_owner = handler;
} }
// This is a semi-private function used by wxWidgets itself only.
//
// Delegates the real work of adding the path to wxFSWatcherImpl::Add() and
// updates m_watches if the new path was successfully added.
bool AddAny(const wxFileName& path, int events, wxFSWPathType type);
protected: protected:
static wxString GetCanonicalPath(const wxFileName& path) static wxString GetCanonicalPath(const wxFileName& path)
@@ -320,10 +327,6 @@ protected:
return path_copy.GetFullPath(); return path_copy.GetFullPath();
} }
// Delegates the real work of adding the path to wxFSWatcherImpl::Add() and
// updates m_watches if the new path was successfully added.
bool DoAdd(const wxFileName& path, int events, wxFSWPathType type);
wxFSWatchInfoMap m_watches; // path=>wxFSWatchInfo map wxFSWatchInfoMap m_watches; // path=>wxFSWatchInfo map
wxFSWatcherImpl* m_service; // file system events service wxFSWatcherImpl* m_service; // file system events service

12
src/common/fswatchercmn.cpp
View File

@@ -95,13 +95,13 @@ bool wxFileSystemWatcherBase::Add(const wxFileName& path, int events)
return false; return false;
} }
return DoAdd(path, events, type); return AddAny(path, events, type);
} }
bool bool
wxFileSystemWatcherBase::DoAdd(const wxFileName& path, wxFileSystemWatcherBase::AddAny(const wxFileName& path,
int events, int events,
wxFSWPathType type) wxFSWPathType type)
{ {
wxString canonical = GetCanonicalPath(path); wxString canonical = GetCanonicalPath(path);
if (canonical.IsEmpty()) if (canonical.IsEmpty())
@@ -163,7 +163,7 @@ bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events,
{ {
wxLogTrace(wxTRACE_FSWATCHER, wxLogTrace(wxTRACE_FSWATCHER,
"--- AddTree adding file '%s' ---", filename); "--- AddTree adding file '%s' ---", filename);
m_watcher->DoAdd(wxFileName::FileName(filename), m_watcher->AddAny(wxFileName::FileName(filename),
m_events, wxFSWPath_File); m_events, wxFSWPath_File);
return wxDIR_CONTINUE; return wxDIR_CONTINUE;
} }
@@ -173,7 +173,7 @@ bool wxFileSystemWatcherBase::AddTree(const wxFileName& path, int events,
wxLogTrace(wxTRACE_FSWATCHER, wxLogTrace(wxTRACE_FSWATCHER,
"--- AddTree adding directory '%s' ---", dirname); "--- AddTree adding directory '%s' ---", dirname);
// we add as much as possible and ignore errors // we add as much as possible and ignore errors
m_watcher->DoAdd(wxFileName::DirName(dirname), m_watcher->AddAny(wxFileName::DirName(dirname),
m_events, wxFSWPath_Dir); m_events, wxFSWPath_Dir);
return wxDIR_CONTINUE; return wxDIR_CONTINUE;
} }

2
src/msw/fswatcher.cpp
View File

@@ -431,7 +431,7 @@ wxMSWFileSystemWatcher::AddTree(const wxFileName& path,
return false; return false;
} }
return DoAdd(path, events, wxFSWPath_Tree); return AddAny(path, events, wxFSWPath_Tree);
} }
#endif // wxUSE_FSWATCHER #endif // wxUSE_FSWATCHER