author | eilers <eilers> | 2003-08-30 15:28:26 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-08-30 15:28:26 (UTC) |
commit | 9f07321949f8baf1a64db0e4caec58041d3f775f (patch) (unidiff) | |
tree | c80bf99717bd81ce4393aa40bbbdf11fbb3f7457 /libopie/pim | |
parent | d9b5fcc45b1fef5ac11ef549a47561c7382ff451 (diff) | |
download | opie-9f07321949f8baf1a64db0e4caec58041d3f775f.zip opie-9f07321949f8baf1a64db0e4caec58041d3f775f.tar.gz opie-9f07321949f8baf1a64db0e4caec58041d3f775f.tar.bz2 |
Removed some unimportant debug output which causes slow down..
-rw-r--r-- | libopie/pim/ocontact.cpp | 4 | ||||
-rw-r--r-- | libopie/pim/ocontactaccessbackend_xml.cpp | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp index e34feeb..0f05b65 100644 --- a/libopie/pim/ocontact.cpp +++ b/libopie/pim/ocontact.cpp | |||
@@ -1098,40 +1098,40 @@ void OContact::setAnniversary( const QDate &v ) | |||
1098 | } | 1098 | } |
1099 | 1099 | ||
1100 | if ( v.isValid() ) | 1100 | if ( v.isValid() ) |
1101 | replace( Qtopia::Anniversary, OConversion::dateToString( v ) ); | 1101 | replace( Qtopia::Anniversary, OConversion::dateToString( v ) ); |
1102 | } | 1102 | } |
1103 | 1103 | ||
1104 | /*! \fn QDate OContact::birthday() const | 1104 | /*! \fn QDate OContact::birthday() const |
1105 | Returns the birthday of the contact. | 1105 | Returns the birthday of the contact. |
1106 | */ | 1106 | */ |
1107 | QDate OContact::birthday() const | 1107 | QDate OContact::birthday() const |
1108 | { | 1108 | { |
1109 | QString str = find( Qtopia::Birthday ); | 1109 | QString str = find( Qtopia::Birthday ); |
1110 | qWarning ("Birthday %s", str.latin1() ); | 1110 | // qWarning ("Birthday %s", str.latin1() ); |
1111 | if ( !str.isEmpty() ) | 1111 | if ( !str.isEmpty() ) |
1112 | return OConversion::dateFromString ( str ); | 1112 | return OConversion::dateFromString ( str ); |
1113 | else | 1113 | else |
1114 | return QDate(); | 1114 | return QDate(); |
1115 | } | 1115 | } |
1116 | 1116 | ||
1117 | 1117 | ||
1118 | /*! \fn QDate OContact::anniversary() const | 1118 | /*! \fn QDate OContact::anniversary() const |
1119 | Returns the anniversary of the contact. | 1119 | Returns the anniversary of the contact. |
1120 | */ | 1120 | */ |
1121 | QDate OContact::anniversary() const | 1121 | QDate OContact::anniversary() const |
1122 | { | 1122 | { |
1123 | QDate empty; | 1123 | QDate empty; |
1124 | QString str = find( Qtopia::Anniversary ); | 1124 | QString str = find( Qtopia::Anniversary ); |
1125 | qWarning ("Anniversary %s", str.latin1() ); | 1125 | // qWarning ("Anniversary %s", str.latin1() ); |
1126 | if ( !str.isEmpty() ) | 1126 | if ( !str.isEmpty() ) |
1127 | return OConversion::dateFromString ( str ); | 1127 | return OConversion::dateFromString ( str ); |
1128 | else | 1128 | else |
1129 | return empty; | 1129 | return empty; |
1130 | } | 1130 | } |
1131 | 1131 | ||
1132 | 1132 | ||
1133 | void OContact::insertEmail( const QString &v ) | 1133 | void OContact::insertEmail( const QString &v ) |
1134 | { | 1134 | { |
1135 | //qDebug("insertEmail %s", v.latin1()); | 1135 | //qDebug("insertEmail %s", v.latin1()); |
1136 | QString e = v.simplifyWhiteSpace(); | 1136 | QString e = v.simplifyWhiteSpace(); |
1137 | QString def = defaultEmail(); | 1137 | QString def = defaultEmail(); |
diff --git a/libopie/pim/ocontactaccessbackend_xml.cpp b/libopie/pim/ocontactaccessbackend_xml.cpp index 1c21619..1b5af2f 100644 --- a/libopie/pim/ocontactaccessbackend_xml.cpp +++ b/libopie/pim/ocontactaccessbackend_xml.cpp | |||
@@ -8,24 +8,27 @@ | |||
8 | *modify it under the terms of the GNU Library General Public | 8 | *modify it under the terms of the GNU Library General Public |
9 | * License as published by the Free Software Foundation; either | 9 | * License as published by the Free Software Foundation; either |
10 | * version 2 of the License, or (at your option) any later version. | 10 | * version 2 of the License, or (at your option) any later version. |
11 | * ===================================================================== | 11 | * ===================================================================== |
12 | * ToDo: XML-Backend: Automatic reload if something was changed... | 12 | * ToDo: XML-Backend: Automatic reload if something was changed... |
13 | * | 13 | * |
14 | * | 14 | * |
15 | * ===================================================================== | 15 | * ===================================================================== |
16 | * Version: $Id$ | 16 | * Version: $Id$ |
17 | * ===================================================================== | 17 | * ===================================================================== |
18 | * History: | 18 | * History: |
19 | * $Log$ | 19 | * $Log$ |
20 | * Revision 1.8 2003/08/30 15:28:26 eilers | ||
21 | * Removed some unimportant debug output which causes slow down.. | ||
22 | * | ||
20 | * Revision 1.7 2003/08/01 12:30:16 eilers | 23 | * Revision 1.7 2003/08/01 12:30:16 eilers |
21 | * Merging changes from BRANCH_1_0 to HEAD | 24 | * Merging changes from BRANCH_1_0 to HEAD |
22 | * | 25 | * |
23 | * Revision 1.6 2003/07/07 16:19:47 eilers | 26 | * Revision 1.6 2003/07/07 16:19:47 eilers |
24 | * Fixing serious bug in hasQuerySettings() | 27 | * Fixing serious bug in hasQuerySettings() |
25 | * | 28 | * |
26 | * Revision 1.5 2003/04/13 18:07:10 zecke | 29 | * Revision 1.5 2003/04/13 18:07:10 zecke |
27 | * More API doc | 30 | * More API doc |
28 | * QString -> const QString& | 31 | * QString -> const QString& |
29 | * QString = 0l -> QString::null | 32 | * QString = 0l -> QString::null |
30 | * | 33 | * |
31 | * Revision 1.4 2003/03/21 14:32:54 mickeyl | 34 | * Revision 1.4 2003/03/21 14:32:54 mickeyl |
@@ -161,25 +164,25 @@ bool OContactAccessBackend_XML::save() | |||
161 | out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>\n" | 164 | out = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE Addressbook ><AddressBook>\n" |
162 | " <Groups>\n" | 165 | " <Groups>\n" |
163 | " </Groups>\n" | 166 | " </Groups>\n" |
164 | " <Contacts>\n"; | 167 | " <Contacts>\n"; |
165 | QCString cstr = out.utf8(); | 168 | QCString cstr = out.utf8(); |
166 | f.writeBlock( cstr.data(), cstr.length() ); | 169 | f.writeBlock( cstr.data(), cstr.length() ); |
167 | idx_offset += cstr.length(); | 170 | idx_offset += cstr.length(); |
168 | out = ""; | 171 | out = ""; |
169 | 172 | ||
170 | // Write all contacts | 173 | // Write all contacts |
171 | QListIterator<OContact> it( m_contactList ); | 174 | QListIterator<OContact> it( m_contactList ); |
172 | for ( ; it.current(); ++it ) { | 175 | for ( ; it.current(); ++it ) { |
173 | qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset ); | 176 | // qWarning(" Uid %d at Offset: %x", (*it)->uid(), idx_offset ); |
174 | out += "<Contact "; | 177 | out += "<Contact "; |
175 | (*it)->save( out ); | 178 | (*it)->save( out ); |
176 | out += "/>\n"; | 179 | out += "/>\n"; |
177 | cstr = out.utf8(); | 180 | cstr = out.utf8(); |
178 | total_written = f.writeBlock( cstr.data(), cstr.length() ); | 181 | total_written = f.writeBlock( cstr.data(), cstr.length() ); |
179 | idx_offset += cstr.length(); | 182 | idx_offset += cstr.length(); |
180 | if ( total_written != int(cstr.length()) ) { | 183 | if ( total_written != int(cstr.length()) ) { |
181 | f.close(); | 184 | f.close(); |
182 | QFile::remove( strNewFile ); | 185 | QFile::remove( strNewFile ); |
183 | return false; | 186 | return false; |
184 | } | 187 | } |
185 | out = ""; | 188 | out = ""; |
@@ -693,25 +696,25 @@ bool OContactAccessBackend_XML::load( const QString filename, bool isJournal ) | |||
693 | foundAction = false; | 696 | foundAction = false; |
694 | 697 | ||
695 | XMLElement::AttributeMap aMap = element->attributes(); | 698 | XMLElement::AttributeMap aMap = element->attributes(); |
696 | XMLElement::AttributeMap::Iterator it; | 699 | XMLElement::AttributeMap::Iterator it; |
697 | contactMap.clear(); | 700 | contactMap.clear(); |
698 | customMap.clear(); | 701 | customMap.clear(); |
699 | for( it = aMap.begin(); it != aMap.end(); ++it ){ | 702 | for( it = aMap.begin(); it != aMap.end(); ++it ){ |
700 | // qWarning ("Read Attribute: %s=%s", it.key().latin1(),it.data().latin1()); | 703 | // qWarning ("Read Attribute: %s=%s", it.key().latin1(),it.data().latin1()); |
701 | 704 | ||
702 | int *find = dict[ it.key() ]; | 705 | int *find = dict[ it.key() ]; |
703 | /* Unknown attributes will be stored as "Custom" elements */ | 706 | /* Unknown attributes will be stored as "Custom" elements */ |
704 | if ( !find ) { | 707 | if ( !find ) { |
705 | qWarning("Attribute %s not known.", it.key().latin1()); | 708 | // qWarning("Attribute %s not known.", it.key().latin1()); |
706 | //contact.setCustomField(it.key(), it.data()); | 709 | //contact.setCustomField(it.key(), it.data()); |
707 | customMap.insert( it.key(), it.data() ); | 710 | customMap.insert( it.key(), it.data() ); |
708 | continue; | 711 | continue; |
709 | } | 712 | } |
710 | 713 | ||
711 | /* Check if special conversion is needed and add attribute | 714 | /* Check if special conversion is needed and add attribute |
712 | * into Contact class | 715 | * into Contact class |
713 | */ | 716 | */ |
714 | switch( *find ) { | 717 | switch( *find ) { |
715 | /* | 718 | /* |
716 | case Qtopia::AddressUid: | 719 | case Qtopia::AddressUid: |
717 | contact.setUid( it.data().toInt() ); | 720 | contact.setUid( it.data().toInt() ); |