-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index adea1a1..e74da87 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp | |||
@@ -47,19 +47,19 @@ void parseEmailFrom( const QString &txt, QString &strDefaultEmail, | |||
47 | 47 | ||
48 | // helper convert from file format to comma delimited... | 48 | // helper convert from file format to comma delimited... |
49 | void parseEmailTo( const QString &strDefaultEmail, | 49 | void parseEmailTo( const QString &strDefaultEmail, |
50 | const QString &strOtherEmail, QString &strBack ); | 50 | const QString &strOtherEmail, QString &strBack ); |
51 | 51 | ||
52 | ContactEditor::ContactEditor(const Contact &entry, | 52 | ContactEditor::ContactEditor(const Contact &entry, |
53 | const QValueList<int> *newOrderedValues, | 53 | const QValueList<int> *newOrderedValues, |
54 | QStringList *slNewOrdered, | 54 | QStringList *slNewOrdered, |
55 | QWidget *parent = 0, | 55 | QWidget *parent, |
56 | const char *name = 0, | 56 | const char *name, |
57 | WFlags fl = 0 ) | 57 | WFlags fl ) |
58 | : QDialog( parent, name, TRUE, fl ), | 58 | : QDialog( parent, name, TRUE, fl ), |
59 | orderedValues( newOrderedValues ), | 59 | orderedValues( newOrderedValues ), |
60 | slOrdered( slNewOrdered ) | 60 | slOrdered( slNewOrdered ) |
61 | { | 61 | { |
62 | 62 | ||
63 | init(); | 63 | init(); |
64 | initMap(); | 64 | initMap(); |
65 | setEntry( entry ); | 65 | setEntry( entry ); |
@@ -1120,16 +1120,17 @@ QString ContactEditor::parseName( const QString fullName, int type ) { | |||
1120 | 1120 | ||
1121 | case NAME_L: | 1121 | case NAME_L: |
1122 | return strLastName; | 1122 | return strLastName; |
1123 | 1123 | ||
1124 | case NAME_S: | 1124 | case NAME_S: |
1125 | return strSuffix; | 1125 | return strSuffix; |
1126 | 1126 | ||
1127 | } | 1127 | } |
1128 | return QString::null; | ||
1128 | } | 1129 | } |
1129 | 1130 | ||
1130 | void ContactEditor::cleanupFields() { | 1131 | void ContactEditor::cleanupFields() { |
1131 | 1132 | ||
1132 | QStringList::Iterator it = slChooserValues->begin(); | 1133 | QStringList::Iterator it = slChooserValues->begin(); |
1133 | for ( int i = 0; it != slChooserValues->end(); i++, ++it ) { | 1134 | for ( int i = 0; it != slChooserValues->end(); i++, ++it ) { |
1134 | (*it) = ""; | 1135 | (*it) = ""; |
1135 | } | 1136 | } |