Update of /cvsroot/mahogany/M/src/adb
In directory sc8-pr-cvs1:/tmp/cvs-serv7670/src/adb
Modified Files:
AdbEntry.cpp ProvBbdb.cpp ProvDummy.cpp ProvFC.cpp
ProvPasswd.cpp
Log Message:
Whitelist now searches subgroups too
Index: AdbEntry.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/AdbEntry.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- AdbEntry.cpp 13 Sep 2002 01:27:46 -0000 1.11
+++ AdbEntry.cpp 16 Oct 2003 15:56:00 -0000 1.12
@@ -30,4 +30,5 @@
#include "Address.h"
+#include "pointers.h"
// ============================================================================
@@ -78,4 +79,33 @@
*pstr = pstr->AfterLast(' ');
}
+}
+
+// ----------------------------------------------------------------------------
+// AdbEntryGroupCommon
+// ----------------------------------------------------------------------------
+
+int AdbEntryGroupCommon::Matches(const wxChar *str, int where, int how)
+{
+ wxArrayString names;
+ size_t each;
+ int result = 0;
+
+ GetEntryNames(names);
+ for( each = 0; each < names.GetCount(); ++each )
+ {
+ RefCounter<AdbEntry> entry(GetEntry(names[each]));
+
+ result |= entry->Matches(str,where,how);
+ }
+
+ GetGroupNames(names);
+ for( each = 0; each < names.GetCount(); ++each )
+ {
+ RefCounter<AdbEntryGroup> group(GetGroup(names[each]));
+
+ result |= group->Matches(str,where,how);
+ }
+
+ return result;
}
Index: ProvBbdb.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvBbdb.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -b -u -2 -r1.37 -r1.38
--- ProvBbdb.cpp 16 Oct 2003 10:29:23 -0000 1.37
+++ ProvBbdb.cpp 16 Oct 2003 15:56:00 -0000 1.38
@@ -165,5 +165,5 @@
// our AdbEntryGroup implementation
-class BbdbEntryGroup : public AdbEntryGroup
+class BbdbEntryGroup : public AdbEntryGroupCommon
{
public:
Index: ProvDummy.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvDummy.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -b -u -2 -r1.27 -r1.28
--- ProvDummy.cpp 16 Oct 2003 10:29:23 -0000 1.27
+++ ProvDummy.cpp 16 Oct 2003 15:56:00 -0000 1.28
@@ -91,5 +91,5 @@
// our AdbEntryGroup implementation
-class DummyEntryGroup : public AdbEntryGroup
+class DummyEntryGroup : public AdbEntryGroupCommon
{
public:
Index: ProvFC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvFC.cpp,v
retrieving revision 1.45
retrieving revision 1.46
diff -b -u -2 -r1.45 -r1.46
--- ProvFC.cpp 16 Oct 2003 10:29:23 -0000 1.45
+++ ProvFC.cpp 16 Oct 2003 15:56:00 -0000 1.46
@@ -123,5 +123,5 @@
// our AdbEntryGroup implementation: it maps on a wxFileConfig group
-class FCEntryGroup : public AdbEntryGroup
+class FCEntryGroup : public AdbEntryGroupCommon
{
public:
Index: ProvPasswd.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvPasswd.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -u -2 -r1.16 -r1.17
--- ProvPasswd.cpp 16 Oct 2003 10:29:23 -0000 1.16
+++ ProvPasswd.cpp 16 Oct 2003 15:56:00 -0000 1.17
@@ -98,5 +98,5 @@
// our AdbEntryGroup implementation
-class PasswdEntryGroup : public AdbEntryGroup
+class PasswdEntryGroup : public AdbEntryGroupCommon
{
public:
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
