Update of /cvsroot/mahogany/M/src/adb
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10764/src/adb
Modified Files:
ImportEudora.cpp ImportMailrc.cpp ImportPine.cpp
ImportXFMail.cpp ProvFC.cpp ProvLine.cpp
Log Message:
isspace->wxIsspace, isalnum->wxIsalnum, and fixing warning "Filters.cpp:2051: warning:
comparison is always true due to limited range of data type"
Index: ImportEudora.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportEudora.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -b -u -2 -r1.8 -r1.9
--- ImportEudora.cpp 18 Sep 2003 16:30:47 -0000 1.8
+++ ImportEudora.cpp 16 Mar 2004 00:00:57 -0000 1.9
@@ -205,10 +205,10 @@
// skip spaces (normally only one, but be careful)
const char *pc = line.c_str() + lenAlias;
- while( isspace(*pc) )
+ while( wxIsspace(*pc) )
pc++;
// next goes the nickname
nickname->Empty();
- while ( *pc && !isspace(*pc) )
+ while ( *pc && !wxIsspace(*pc) )
*nickname += *pc++;
@@ -218,9 +218,9 @@
// next is the address (don't know whether multiple addresses are
// allowed)
- while ( isspace(*pc) )
+ while ( wxIsspace(*pc) )
pc++;
wxString address;
- while ( *pc && !isspace(*pc) )
+ while ( *pc && !wxIsspace(*pc) )
address += *pc++;
@@ -235,15 +235,15 @@
{
pc = line.c_str() + lenNote;
- while( isspace(*pc) )
+ while( wxIsspace(*pc) )
pc++;
// next goes the nickname (again)
wxString nick2;
- while ( *pc && !isspace(*pc) )
+ while ( *pc && !wxIsspace(*pc) )
nick2 += *pc++;
if ( nick2 == *nickname )
{
- while ( isspace(*pc) )
+ while ( wxIsspace(*pc) )
pc++;
Index: ImportMailrc.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportMailrc.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -2 -r1.10 -r1.11
--- ImportMailrc.cpp 12 Oct 2003 22:03:37 -0000 1.10
+++ ImportMailrc.cpp 16 Mar 2004 00:00:57 -0000 1.11
@@ -107,5 +107,5 @@
{
const wxChar *pc = line.c_str() + lenAlias;
- while ( isspace(*pc) )
+ while ( wxIsspace(*pc) )
pc++;
@@ -164,5 +164,5 @@
if ( addresses )
{
- while ( isspace(*pc) )
+ while ( wxIsspace(*pc) )
pc++;
Index: ImportPine.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportPine.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- ImportPine.cpp 12 Oct 2003 22:03:37 -0000 1.11
+++ ImportPine.cpp 16 Mar 2004 00:00:57 -0000 1.12
@@ -275,5 +275,5 @@
const wxChar *pc = line.c_str();
- if ( !*pc || isspace(*pc) )
+ if ( !*pc || wxIsspace(*pc) )
{
// this is not the start of an entry
Index: ImportXFMail.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ImportXFMail.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- ImportXFMail.cpp 12 Oct 2003 22:03:37 -0000 1.11
+++ ImportXFMail.cpp 16 Mar 2004 00:00:57 -0000 1.12
@@ -176,5 +176,5 @@
// skip the spaces in the start of line
- while ( isspace(*pc) )
+ while ( wxIsspace(*pc) )
pc++;
Index: ProvFC.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvFC.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -b -u -2 -r1.48 -r1.49
--- ProvFC.cpp 6 Nov 2003 01:07:34 -0000 1.48
+++ ProvFC.cpp 16 Mar 2004 00:00:57 -0000 1.49
@@ -801,5 +801,5 @@
while ( fgets(buf, WXSIZEOF(buf), fp) ) {
const char *pc = buf;
- while ( isspace(*pc) )
+ while ( wxIsspace(*pc) )
pc++;
Index: ProvLine.cpp
===================================================================
RCS file: /cvsroot/mahogany/M/src/adb/ProvLine.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -b -u -2 -r1.11 -r1.12
--- ProvLine.cpp 24 Oct 2003 15:00:07 -0000 1.11
+++ ProvLine.cpp 16 Mar 2004 00:00:57 -0000 1.12
@@ -464,5 +464,5 @@
for ( size_t character = 0; character < address.size(); ++character )
{
- if ( !isspace(address[character]) )
+ if ( !wxIsspace(address[character]) )
nonspace.append(1, address[character]);
}
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Mahogany-cvsupdates mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/mahogany-cvsupdates
