From 106dcc2ceaa47cb8cfbdac9e776ac7458e23a222 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Tue, 22 Apr 2008 16:29:43 +0000 Subject: [PATCH] make wxDir::Has{Files,SubDirs}() const git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/dir.h | 4 ++-- interface/dir.h | 4 ++-- src/common/dircmn.cpp | 4 ++-- src/unix/dir.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/wx/dir.h b/include/wx/dir.h index 99b7b4acf1..9a73c6644e 100644 --- a/include/wx/dir.h +++ b/include/wx/dir.h @@ -120,10 +120,10 @@ public: bool GetNext(wxString *filename) const; // return true if this directory has any files in it - bool HasFiles(const wxString& spec = wxEmptyString); + bool HasFiles(const wxString& spec = wxEmptyString) const; // return true if this directory has any subdirectories - bool HasSubDirs(const wxString& spec = wxEmptyString); + bool HasSubDirs(const wxString& spec = wxEmptyString) const; // enumerate all files in this directory and its subdirectories // diff --git a/interface/dir.h b/interface/dir.h index 4e65800c52..82b40531ca 100644 --- a/interface/dir.h +++ b/interface/dir.h @@ -244,14 +244,14 @@ public: @a filespec. If @a filespec is empty, look for any files at all. In any case, even hidden files are taken into account. */ - bool HasFiles(const wxString& filespec = wxEmptyString); + bool HasFiles(const wxString& filespec = wxEmptyString) const; /** Returns @true if the directory contains any subdirectories (if a non empty @a filespec is given, only check for directories matching it). The hidden subdirectories are taken into account as well. */ - bool HasSubDirs(const wxString& dirspec = wxEmptyString); + bool HasSubDirs(const wxString& dirspec = wxEmptyString) const; /** Returns @true if the directory was successfully opened by a previous diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp index 30e47dd782..6154cb60a1 100644 --- a/src/common/dircmn.cpp +++ b/src/common/dircmn.cpp @@ -55,7 +55,7 @@ wxDirTraverser::OnOpenError(const wxString& WXUNUSED(dirname)) // dumb generic implementation -bool wxDir::HasFiles(const wxString& spec) +bool wxDir::HasFiles(const wxString& spec) const { wxString s; return GetFirst(&s, spec, wxDIR_FILES | wxDIR_HIDDEN); @@ -64,7 +64,7 @@ bool wxDir::HasFiles(const wxString& spec) // we have a (much) faster version for Unix #if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__) -bool wxDir::HasSubDirs(const wxString& spec) +bool wxDir::HasSubDirs(const wxString& spec) const { wxString s; return GetFirst(&s, spec, wxDIR_DIRS | wxDIR_HIDDEN); diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp index 7743d9b064..16f0b36503 100644 --- a/src/unix/dir.cpp +++ b/src/unix/dir.cpp @@ -290,7 +290,7 @@ bool wxDir::GetNext(wxString *filename) const return M_DIR->Read(filename); } -bool wxDir::HasSubDirs(const wxString& spec) +bool wxDir::HasSubDirs(const wxString& spec) const { wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );