Update of /cvsroot/audacity/audacity-src/src
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv9119
Modified Files:
AudacityApp.cpp AudacityApp.h Languages.cpp LoadModules.cpp
Log Message:
Moved the flags argument on AudacityApp::FindFilesInPathList()
to the end and defaulted it to the most common usage.
Made FindFilesInPathList() actually use the argument (wasn't before).
Removed the specification on all references that matched the default.
Index: Languages.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/Languages.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Languages.cpp 20 Jan 2009 09:13:17 -0000 1.33
+++ Languages.cpp 20 May 2009 06:05:38 -0000 1.34
@@ -48,13 +48,11 @@
wxGetApp().FindFilesInPathList(wxString::Format(wxT("%s/audacity.mo"),
code.c_str()),
audacityPathList,
- wxFILE,
results);
wxGetApp().FindFilesInPathList(wxString::Format(wxT("%s/LC_MESSAGES/audacity.mo"),
code.c_str()),
audacityPathList,
- wxFILE,
results);
return (results.GetCount() > 0);
Index: AudacityApp.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- AudacityApp.h 14 Apr 2009 05:25:32 -0000 1.52
+++ AudacityApp.h 20 May 2009 06:05:38 -0000 1.53
@@ -17,6 +17,7 @@
#include "Audacity.h"
#include <wx/app.h>
+#include <wx/dir.h>
#include <wx/event.h>
#include <wx/docview.h>
#include <wx/intl.h>
@@ -144,10 +145,10 @@
wxArrayString &pathList);
static void AddMultiPathsToPathList(wxString multiPathString,
wxArrayString &pathList);
- static void FindFilesInPathList(wxString pattern,
- wxArrayString pathList,
- int flags, // wxFILE, wxDIR, or 0
- wxArrayString &results);
+ static void FindFilesInPathList(const wxString & pattern,
+ const wxArrayString & pathList,
+ wxArrayString &results,
+ int flags = wxDIR_FILES);
FileHistory *GetRecentFiles() {return mRecentFiles;}
void AddFileToHistory(const wxString & name);
Index: LoadModules.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/LoadModules.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- LoadModules.cpp 10 Feb 2009 16:04:43 -0000 1.9
+++ LoadModules.cpp 20 May 2009 06:05:38 -0000 1.10
@@ -176,9 +176,9 @@
}
#ifdef __WXMSW__
- wxGetApp().FindFilesInPathList(wxT("*.dll"), pathList, wxFILE, files);
+ wxGetApp().FindFilesInPathList(wxT("*.dll"), pathList, files);
#else
- wxGetApp().FindFilesInPathList(wxT("*.so"), pathList, wxFILE, files);
+ wxGetApp().FindFilesInPathList(wxT("*.so"), pathList, files);
#endif
for(i=0; i<files.GetCount(); i++)
@@ -294,11 +294,11 @@
}
#if defined(__WXMSW__)
- wxGetApp().FindFilesInPathList(wxT("*.dll"), pathList, wxFILE, files);
+ wxGetApp().FindFilesInPathList(wxT("*.dll"), pathList, files);
// #elif defined(__WXMAC__)
-// wxGetApp().FindFilesInPathList(wxT("*.dylib"), pathList, wxFILE, files);
+// wxGetApp().FindFilesInPathList(wxT("*.dylib"), pathList, files);
#else
- wxGetApp().FindFilesInPathList(wxT("*.so"), pathList, wxFILE, files);
+ wxGetApp().FindFilesInPathList(wxT("*.so"), pathList, files);
#endif
for (i = 0; i < files.GetCount(); i++) {
Index: AudacityApp.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudacityApp.cpp,v
retrieving revision 1.230
retrieving revision 1.231
diff -u -d -r1.230 -r1.231
--- AudacityApp.cpp 4 May 2009 21:10:20 -0000 1.230
+++ AudacityApp.cpp 20 May 2009 06:05:38 -0000 1.231
@@ -1267,21 +1267,22 @@
}
// static
-void AudacityApp::FindFilesInPathList(wxString pattern,
- wxArrayString pathList,
- int flags,
- wxArrayString &results)
+void AudacityApp::FindFilesInPathList(const wxString & pattern,
+ const wxArrayString & pathList,
+ wxArrayString & results,
+ int flags)
{
wxLogNull nolog;
- if (pattern == wxT(""))
+ if (pattern == wxT("")) {
return;
+ }
wxFileName f;
- for(unsigned i=0; i<pathList.GetCount(); i++) {
+ for(size_t i = 0; i < pathList.GetCount(); i++) {
f = pathList[i] + wxFILE_SEP_PATH + pattern;
- wxDir::GetAllFiles(f.GetPath(), &results, f.GetFullName(), wxDIR_FILES);
+ wxDir::GetAllFiles(f.GetPath(), &results, f.GetFullName(), flags);
}
}
------------------------------------------------------------------------------
Crystal Reports - New Free Runtime and 30 Day Trial
Check out the new simplified licensing option that enables
unlimited royalty-free distribution of the report engine
for externally facing server and web deployment.
http://p.sf.net/sfu/businessobjects
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
