CVS commit by tokoe: 

isEmpty() includes isNull(), so we are one the save side


  M +6 -6      address.cpp   1.31


--- kdelibs/kabc/address.cpp  #1.30:1.31
@@ -346,5 +346,5 @@ QString Address::formattedAddress( const
   
   // decide whether this needs special business address formatting
-  if ( orgaName.isNull() ) {
+  if ( orgaName.isEmpty() ) {
     addrTemplate = entry.readEntry( "AddressFormat" );
   } else {
@@ -528,5 +528,5 @@ QString Address::countryToISO( const QSt
     QTextStream s( &file );
     QString strbuf = s.readLine();
-    while( !strbuf.isNull() ) {
+    while( !strbuf.isEmpty() ) {
       QStringList countryInfo = QStringList::split( '\t', strbuf, true );
       if ( countryInfo[ 0 ] == cname ) {
@@ -560,5 +560,5 @@ QString Address::ISOtoCountry( const QSt
     QString strbuf = s.readLine();
     int pos;
-    while ( !strbuf.isNull() ) {
+    while ( !strbuf.isEmpty() ) {
       if ( (pos = strbuf.find( searchStr )) != -1 ) {
         file.close();