summaryrefslogtreecommitdiff
path: root/core
authorzecke <zecke>2002-09-10 13:15:52 (UTC)
committer zecke <zecke>2002-09-10 13:15:52 (UTC)
commit4fe9ebf0faabcfdcdc0104309da59de043d9785a (patch) (unidiff)
tree0cdf6b1f45df2e014c1cceb4f943779861cc2767 /core
parent8db6dc7be6e274fe1ce762b15801052bce7bcf26 (diff)
downloadopie-4fe9ebf0faabcfdcdc0104309da59de043d9785a.zip
opie-4fe9ebf0faabcfdcdc0104309da59de043d9785a.tar.gz
opie-4fe9ebf0faabcfdcdc0104309da59de043d9785a.tar.bz2
COmpile fixes
Diffstat (limited to 'core') (more/less context) (show whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.cpp2
-rw-r--r--core/pim/addressbook/contacteditor.cpp4
-rw-r--r--core/pim/todo/todotable.h3
3 files changed, 6 insertions, 3 deletions
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index e11cf4c..3255269 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -526,13 +526,13 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
526 QString fn, mn, ln; 526 QString fn, mn, ln;
527 parseName( name, &fn, &mn, &ln ); 527 parseName( name, &fn, &mn, &ln );
528 // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() ); 528 // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
529 cnt.setFirstName( fn ); 529 cnt.setFirstName( fn );
530 cnt.setMiddleName( mn ); 530 cnt.setMiddleName( mn );
531 cnt.setLastName( ln ); 531 cnt.setLastName( ln );
532 cnt.setEmails( email ); 532 cnt.insertEmails( email );
533 cnt.setDefaultEmail( email ); 533 cnt.setDefaultEmail( email );
534 cnt.setFileAs(); 534 cnt.setFileAs();
535 535
536 if ( bAbEditFirstTime ) { 536 if ( bAbEditFirstTime ) {
537 abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields, 537 abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields,
538 this, "editor" ); 538 this, "editor" );
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 39bd63c..ae86ed0 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -1414,13 +1414,13 @@ void ContactEditor::setEntry( const Contact &entry ) {
1414 *itV = ent.companyPhone(); 1414 *itV = ent.companyPhone();
1415*/ 1415*/
1416 if ( *it == tr("Default Email" )) 1416 if ( *it == tr("Default Email" ))
1417 *itV = ent.defaultEmail(); 1417 *itV = ent.defaultEmail();
1418 1418
1419 if ( *it == tr("Emails" )) 1419 if ( *it == tr("Emails" ))
1420 *itV = ent.emails(); 1420 *itV = ent.emailList().join(";");
1421 1421
1422 if ( *it == tr("Home Phone" )) 1422 if ( *it == tr("Home Phone" ))
1423 *itV = ent.homePhone(); 1423 *itV = ent.homePhone();
1424/* 1424/*
1425 if ( *it == "Home 2 Phone" ) 1425 if ( *it == "Home 2 Phone" )
1426 *itV = ent.home2Phone(); 1426 *itV = ent.home2Phone();
@@ -1615,13 +1615,13 @@ void ContactEditor::saveEntry() {
1615 1615
1616 if ( *it == tr("Emails" )) { 1616 if ( *it == tr("Emails" )) {
1617 QString allemail; 1617 QString allemail;
1618 QString defaultmail; 1618 QString defaultmail;
1619 parseEmailFrom( *itV, defaultmail, allemail ); 1619 parseEmailFrom( *itV, defaultmail, allemail );
1620 ent.setDefaultEmail( defaultmail ); 1620 ent.setDefaultEmail( defaultmail );
1621 ent.setEmails( *itV ); 1621 ent.insertEmails( *itV );
1622 } 1622 }
1623 1623
1624 if ( *it == tr("Home Phone" )) 1624 if ( *it == tr("Home Phone" ))
1625 ent.setHomePhone( *itV ); 1625 ent.setHomePhone( *itV );
1626/* 1626/*
1627 if ( *it == "Home 2 Phone" ) 1627 if ( *it == "Home 2 Phone" )
diff --git a/core/pim/todo/todotable.h b/core/pim/todo/todotable.h
index 39e00d1..7539df1 100644
--- a/core/pim/todo/todotable.h
+++ b/core/pim/todo/todotable.h
@@ -189,12 +189,15 @@ private:
189 bool showDeadl:1; 189 bool showDeadl:1;
190}; 190};
191 191
192 192
193inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) 193inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
194{ 194{
195 int rows = numRows();
196 ++rows;
197 setNumRows( rows );
195 QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') 198 QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A')
196 + todo->priority() ) 199 + todo->priority() )
197 + Qtopia::buildSortKey( todo->description() ); 200 + Qtopia::buildSortKey( todo->description() );
198 CheckItem *chk = new CheckItem( this, sortKey ); 201 CheckItem *chk = new CheckItem( this, sortKey );
199 chk->setChecked( todo->isCompleted() ); 202 chk->setChecked( todo->isCompleted() );
200 ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent ); 203 ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent );