summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/ocontact.cpp12
-rw-r--r--libopie/pim/ocontact.h11
-rw-r--r--libopie2/opiepim/ocontact.cpp12
-rw-r--r--libopie2/opiepim/ocontact.h11
4 files changed, 26 insertions, 20 deletions
diff --git a/libopie/pim/ocontact.cpp b/libopie/pim/ocontact.cpp
index 66632f5..828a9de 100644
--- a/libopie/pim/ocontact.cpp
+++ b/libopie/pim/ocontact.cpp
@@ -1400,34 +1400,34 @@ bool OContact::match( const QRegExp &r ) const
1400 match = false; 1400 match = false;
1401 QMap<int, QString>::ConstIterator it; 1401 QMap<int, QString>::ConstIterator it;
1402 for ( it = mMap.begin(); it != mMap.end(); ++it ) { 1402 for ( it = mMap.begin(); it != mMap.end(); ++it ) {
1403 if ( (*it).find( r ) > -1 ) { 1403 if ( (*it).find( r ) > -1 ) {
1404 match = true; 1404 match = true;
1405 break; 1405 break;
1406 } 1406 }
1407 } 1407 }
1408 return match; 1408 return match;
1409} 1409}
1410 1410
1411 1411
1412// Noch nicht definiert ! :SX
1413QString OContact::toShortText() const 1412QString OContact::toShortText() const
1414{ 1413{
1415 return ( QString::fromLatin1( "Not defined!") ); 1414 return ( fullName() );
1416} 1415}
1417QString OContact::type() const 1416QString OContact::type() const
1418{ 1417{
1419 return QString::fromLatin1( "OContact" ); 1418 return QString::fromLatin1( "OContact" );
1420} 1419}
1421 1420
1422// Noch nicht definiert ! :SX 1421// Definition is missing ! (se)
1423QMap<QString,QString> OContact::toExtraMap() const 1422QMap<QString,QString> OContact::toExtraMap() const
1424{ 1423{
1424 qWarning ("Function not implemented: OContact::toExtraMap()");
1425 QMap <QString,QString> useless; 1425 QMap <QString,QString> useless;
1426 return useless; 1426 return useless;
1427} 1427}
1428 1428
1429// Noch nicht definiert ! :SX 1429class QString OContact::recordField( int pos ) const
1430class QString OContact::recordField(int) const
1431{ 1430{
1432 return QString::fromLatin1( "Noch nicht implementiert !" ); 1431 QStringList SLFIELDS = fields(); // ?? why this ? (se)
1432 return SLFIELDS[pos];
1433} 1433}
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h
index e0555c8..756c87d 100644
--- a/libopie/pim/ocontact.h
+++ b/libopie/pim/ocontact.h
@@ -199,34 +199,37 @@ public:
199 // journaling... 199 // journaling...
200 void saveJournal( journal_action action, const QString &key = QString::null ); 200 void saveJournal( journal_action action, const QString &key = QString::null );
201 void save( QString &buf ) const; 201 void save( QString &buf ) const;
202 202
203 void setUid( int i ) 203 void setUid( int i )
204{ Record::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); } 204{ Record::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); }
205 205
206 QString toShortText()const; 206 QString toShortText()const;
207 QString OContact::type()const; 207 QString OContact::type()const;
208 QMap<QString,QString> OContact::toExtraMap() const; 208 QMap<QString,QString> OContact::toExtraMap() const;
209 class QString OContact::recordField(int) const; 209 class QString OContact::recordField(int) const;
210 210
211 // Why private ? (eilers,se)
212 QString emailSeparator() const { return " "; }
213 // the emails should be seperated by a comma
214 void setEmails( const QString &v );
215 QString emails() const { return find( Qtopia::Emails ); }
216
217
211private: 218private:
212 friend class AbEditor; 219 friend class AbEditor;
213 friend class AbTable; 220 friend class AbTable;
214 friend class AddressBookAccessPrivate; 221 friend class AddressBookAccessPrivate;
215 friend class XMLIO; 222 friend class XMLIO;
216 223
217 QString emailSeparator() const { return " "; }
218 // the emails should be seperated by a comma
219 void setEmails( const QString &v );
220 QString emails() const { return find( Qtopia::Emails ); }
221 224
222 void insert( int key, const QString &value ); 225 void insert( int key, const QString &value );
223 void replace( int key, const QString &value ); 226 void replace( int key, const QString &value );
224 QString find( int key ) const; 227 QString find( int key ) const;
225 228
226 QString displayAddress( const QString &street, 229 QString displayAddress( const QString &street,
227 const QString &city, 230 const QString &city,
228 const QString &state, 231 const QString &state,
229 const QString &zip, 232 const QString &zip,
230 const QString &country ) const; 233 const QString &country ) const;
231 234
232 Qtopia::UidGen &uidGen() { return sUidGen; } 235 Qtopia::UidGen &uidGen() { return sUidGen; }
diff --git a/libopie2/opiepim/ocontact.cpp b/libopie2/opiepim/ocontact.cpp
index 66632f5..828a9de 100644
--- a/libopie2/opiepim/ocontact.cpp
+++ b/libopie2/opiepim/ocontact.cpp
@@ -1400,34 +1400,34 @@ bool OContact::match( const QRegExp &r ) const
1400 match = false; 1400 match = false;
1401 QMap<int, QString>::ConstIterator it; 1401 QMap<int, QString>::ConstIterator it;
1402 for ( it = mMap.begin(); it != mMap.end(); ++it ) { 1402 for ( it = mMap.begin(); it != mMap.end(); ++it ) {
1403 if ( (*it).find( r ) > -1 ) { 1403 if ( (*it).find( r ) > -1 ) {
1404 match = true; 1404 match = true;
1405 break; 1405 break;
1406 } 1406 }
1407 } 1407 }
1408 return match; 1408 return match;
1409} 1409}
1410 1410
1411 1411
1412// Noch nicht definiert ! :SX
1413QString OContact::toShortText() const 1412QString OContact::toShortText() const
1414{ 1413{
1415 return ( QString::fromLatin1( "Not defined!") ); 1414 return ( fullName() );
1416} 1415}
1417QString OContact::type() const 1416QString OContact::type() const
1418{ 1417{
1419 return QString::fromLatin1( "OContact" ); 1418 return QString::fromLatin1( "OContact" );
1420} 1419}
1421 1420
1422// Noch nicht definiert ! :SX 1421// Definition is missing ! (se)
1423QMap<QString,QString> OContact::toExtraMap() const 1422QMap<QString,QString> OContact::toExtraMap() const
1424{ 1423{
1424 qWarning ("Function not implemented: OContact::toExtraMap()");
1425 QMap <QString,QString> useless; 1425 QMap <QString,QString> useless;
1426 return useless; 1426 return useless;
1427} 1427}
1428 1428
1429// Noch nicht definiert ! :SX 1429class QString OContact::recordField( int pos ) const
1430class QString OContact::recordField(int) const
1431{ 1430{
1432 return QString::fromLatin1( "Noch nicht implementiert !" ); 1431 QStringList SLFIELDS = fields(); // ?? why this ? (se)
1432 return SLFIELDS[pos];
1433} 1433}
diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h
index e0555c8..756c87d 100644
--- a/libopie2/opiepim/ocontact.h
+++ b/libopie2/opiepim/ocontact.h
@@ -199,34 +199,37 @@ public:
199 // journaling... 199 // journaling...
200 void saveJournal( journal_action action, const QString &key = QString::null ); 200 void saveJournal( journal_action action, const QString &key = QString::null );
201 void save( QString &buf ) const; 201 void save( QString &buf ) const;
202 202
203 void setUid( int i ) 203 void setUid( int i )
204{ Record::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); } 204{ Record::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); }
205 205
206 QString toShortText()const; 206 QString toShortText()const;
207 QString OContact::type()const; 207 QString OContact::type()const;
208 QMap<QString,QString> OContact::toExtraMap() const; 208 QMap<QString,QString> OContact::toExtraMap() const;
209 class QString OContact::recordField(int) const; 209 class QString OContact::recordField(int) const;
210 210
211 // Why private ? (eilers,se)
212 QString emailSeparator() const { return " "; }
213 // the emails should be seperated by a comma
214 void setEmails( const QString &v );
215 QString emails() const { return find( Qtopia::Emails ); }
216
217
211private: 218private:
212 friend class AbEditor; 219 friend class AbEditor;
213 friend class AbTable; 220 friend class AbTable;
214 friend class AddressBookAccessPrivate; 221 friend class AddressBookAccessPrivate;
215 friend class XMLIO; 222 friend class XMLIO;
216 223
217 QString emailSeparator() const { return " "; }
218 // the emails should be seperated by a comma
219 void setEmails( const QString &v );
220 QString emails() const { return find( Qtopia::Emails ); }
221 224
222 void insert( int key, const QString &value ); 225 void insert( int key, const QString &value );
223 void replace( int key, const QString &value ); 226 void replace( int key, const QString &value );
224 QString find( int key ) const; 227 QString find( int key ) const;
225 228
226 QString displayAddress( const QString &street, 229 QString displayAddress( const QString &street,
227 const QString &city, 230 const QString &city,
228 const QString &state, 231 const QString &state,
229 const QString &zip, 232 const QString &zip,
230 const QString &country ) const; 233 const QString &country ) const;
231 234
232 Qtopia::UidGen &uidGen() { return sUidGen; } 235 Qtopia::UidGen &uidGen() { return sUidGen; }