author | zecke <zecke> | 2002-09-10 13:15:52 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 13:15:52 (UTC) |
commit | 4fe9ebf0faabcfdcdc0104309da59de043d9785a (patch) (side-by-side diff) | |
tree | 0cdf6b1f45df2e014c1cceb4f943779861cc2767 | |
parent | 8db6dc7be6e274fe1ce762b15801052bce7bcf26 (diff) | |
download | opie-4fe9ebf0faabcfdcdc0104309da59de043d9785a.zip opie-4fe9ebf0faabcfdcdc0104309da59de043d9785a.tar.gz opie-4fe9ebf0faabcfdcdc0104309da59de043d9785a.tar.bz2 |
COmpile fixes
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 2 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 12 | ||||
-rw-r--r-- | core/pim/todo/todotable.h | 11 |
3 files changed, 14 insertions, 11 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 @@ -524,17 +524,17 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) Contact cnt; QString fn, mn, ln; parseName( name, &fn, &mn, &ln ); // qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() ); cnt.setFirstName( fn ); cnt.setMiddleName( mn ); cnt.setLastName( ln ); - cnt.setEmails( email ); + cnt.insertEmails( email ); cnt.setDefaultEmail( email ); cnt.setFileAs(); if ( bAbEditFirstTime ) { abEditor = new ContactEditor( cnt, &orderedFields, &slOrderedFields, this, "editor" ); bAbEditFirstTime = FALSE; } else { 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 @@ -106,17 +106,17 @@ void ContactEditor::init() { for ( i = 0; it != slOrdered.end(); i++, ++it ) { if ( (*it) == tr( "Business Fax" ) ) { slChooserNames.append( *it ); slChooserValues.append("" ); //slDynamicEntries->remove( it ); continue; } - + if ( (*it) == tr( "Home Fax" ) ) { slChooserNames.append( *it ); slChooserValues.append("" ); //slDynamicEntries->remove( it ); continue; } @@ -186,17 +186,17 @@ void ContactEditor::init() { } if ( *it == tr( "Emails" ) ) { slChooserNames.append( *it ); slChooserValues.append( "" ); //slDynamicEntries->remove( it ); continue; } - + if ( *it == "Name Title" || *it == "First Name" || *it == "Middle Name" || *it == "Last Name" || *it == "File As" || *it == "Default Email" || *it == "Emails" || *it == "Groups" ) continue; if ( *it == tr( "Name Title" ) ) { //slDynamicEntries->remove( it ); continue; } @@ -265,17 +265,17 @@ void ContactEditor::init() { // slDynamicEntries->remove( it ); continue; } /* if ( (*it).right( 8 ) == tr( "Street 2" ) ) { hasStreet2 = TRUE; // slDynamicEntries->remove( it ); continue; - } + } if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) { hasPOBox = TRUE; // slDynamicEntries->remove( it ); continue; } */ if ( (*it) == tr( "Business City" ) ) { @@ -1029,17 +1029,17 @@ void ContactEditor::slotName() { if (useFullName == TRUE) { txtFirstName->setText( parseName(txtFullName->text(), NAME_F) ); txtMiddleName->setText( parseName(txtFullName->text(), NAME_M) ); txtLastName->setText( parseName(txtFullName->text(), NAME_L) ); txtSuffix->setText( parseName(txtFullName->text(), NAME_S) ); } dlgName->showMaximized(); if ( dlgName->exec() ) { - + tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text(); txtFullName->setText( tmpName.simplifyWhiteSpace() ); slotFullNameChange( txtFullName->text() ); useFullName = FALSE; } } @@ -1412,17 +1412,17 @@ void ContactEditor::setEntry( const Contact &entry ) { /* if ( *it == "Company Phone" ) *itV = ent.companyPhone(); */ if ( *it == tr("Default Email" )) *itV = ent.defaultEmail(); if ( *it == tr("Emails" )) - *itV = ent.emails(); + *itV = ent.emailList().join(";"); if ( *it == tr("Home Phone" )) *itV = ent.homePhone(); /* if ( *it == "Home 2 Phone" ) *itV = ent.home2Phone(); */ if ( *it == tr("Home Fax" )) @@ -1613,17 +1613,17 @@ void ContactEditor::saveEntry() { //if ( *it == "Default Email" ) //ent.setDefaultEmail( *itV ); if ( *it == tr("Emails" )) { QString allemail; QString defaultmail; parseEmailFrom( *itV, defaultmail, allemail ); ent.setDefaultEmail( defaultmail ); - ent.setEmails( *itV ); + ent.insertEmails( *itV ); } if ( *it == tr("Home Phone" )) ent.setHomePhone( *itV ); /* if ( *it == "Home 2 Phone" ) ent.setHome2Phone( *itV ); */ 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 @@ -66,17 +66,17 @@ public: private: QGuardedPtr<QComboBox> cb; }; class TodoTextItem : public QTableItem { public: - TodoTextItem( QTable *t, const QString & str ) + TodoTextItem( QTable *t, const QString & str ) :QTableItem( t, QTableItem::Never, str ) {} QString key () const { return Qtopia::buildSortKey( text() ); } }; class DueTextItem : public QTableItem { public: @@ -187,30 +187,33 @@ private: Categories mCat; int currFindRow; bool showDeadl:1; }; inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row ) { - QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') - + todo->priority() ) + int rows = numRows(); + ++rows; + setNumRows( rows ); + QString sortKey = (char) ((todo->isCompleted() ? 'a' : 'A') + + todo->priority() ) + Qtopia::buildSortKey( todo->description() ); CheckItem *chk = new CheckItem( this, sortKey ); chk->setChecked( todo->isCompleted() ); ComboItem *cmb = new ComboItem( this, QTableItem::WhenCurrent ); cmb->setText( QString::number( todo->priority() ) ); QString sum = todo->summary(); QTableItem *ti = new TodoTextItem( this, sum.isEmpty() ? todo->description().left(40).simplifyWhiteSpace() : sum ); ti->setReplaceable( false ); DueTextItem *due = new DueTextItem(this, todo ); setItem( row, 3, due); - + setItem( row, 0, chk ); setItem( row, 1, cmb ); setItem( row, 2, ti ); todoList.insert( chk, todo ); } |