summaryrefslogtreecommitdiff
authorzecke <zecke>2002-09-10 13:15:52 (UTC)
committer zecke <zecke>2002-09-10 13:15:52 (UTC)
commit4fe9ebf0faabcfdcdc0104309da59de043d9785a (patch) (side-by-side diff)
tree0cdf6b1f45df2e014c1cceb4f943779861cc2767
parent8db6dc7be6e274fe1ce762b15801052bce7bcf26 (diff)
downloadopie-4fe9ebf0faabcfdcdc0104309da59de043d9785a.zip
opie-4fe9ebf0faabcfdcdc0104309da59de043d9785a.tar.gz
opie-4fe9ebf0faabcfdcdc0104309da59de043d9785a.tar.bz2
COmpile fixes
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/addressbook.cpp2
-rw-r--r--core/pim/addressbook/contacteditor.cpp12
-rw-r--r--core/pim/todo/todotable.h11
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
@@ -529,7 +529,7 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
cnt.setFirstName( fn );
cnt.setMiddleName( mn );
cnt.setLastName( ln );
- cnt.setEmails( email );
+ cnt.insertEmails( email );
cnt.setDefaultEmail( email );
cnt.setFileAs();
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
@@ -111,7 +111,7 @@ void ContactEditor::init() {
//slDynamicEntries->remove( it );
continue;
}
-
+
if ( (*it) == tr( "Home Fax" ) ) {
slChooserNames.append( *it );
slChooserValues.append("" );
@@ -191,7 +191,7 @@ void ContactEditor::init() {
//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;
@@ -270,7 +270,7 @@ void ContactEditor::init() {
hasStreet2 = TRUE;
// slDynamicEntries->remove( it );
continue;
- }
+ }
if ( (*it).right( 8 ) == tr( "P.O. Box" ) ) {
hasPOBox = TRUE;
@@ -1034,7 +1034,7 @@ void ContactEditor::slotName() {
}
dlgName->showMaximized();
if ( dlgName->exec() ) {
-
+
tmpName = txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text();
txtFullName->setText( tmpName.simplifyWhiteSpace() );
slotFullNameChange( txtFullName->text() );
@@ -1417,7 +1417,7 @@ void ContactEditor::setEntry( const Contact &entry ) {
*itV = ent.defaultEmail();
if ( *it == tr("Emails" ))
- *itV = ent.emails();
+ *itV = ent.emailList().join(";");
if ( *it == tr("Home Phone" ))
*itV = ent.homePhone();
@@ -1618,7 +1618,7 @@ void ContactEditor::saveEntry() {
QString defaultmail;
parseEmailFrom( *itV, defaultmail, allemail );
ent.setDefaultEmail( defaultmail );
- ent.setEmails( *itV );
+ ent.insertEmails( *itV );
}
if ( *it == tr("Home 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
@@ -71,7 +71,7 @@ private:
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() ); }
@@ -192,8 +192,11 @@ private:
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() );
@@ -205,7 +208,7 @@ inline void TodoTable::insertIntoTable( ToDoEvent *todo, int row )
DueTextItem *due = new DueTextItem(this, todo );
setItem( row, 3, due);
-
+
setItem( row, 0, chk );
setItem( row, 1, cmb );
setItem( row, 2, ti );