- no default arguments in method implementations

- don't return void in non-void functions

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
@@ -43,27 +43,27 @@ static inline bool constainsWhiteSpace( const QString &str );
 // helper functions, convert our comma delimited list to proper
 // file format...
 void parseEmailFrom( const QString &txt, QString &strDefaultEmail,
                      QString &strAll );
 
 // helper convert from file format to comma delimited...
 void parseEmailTo( const QString &strDefaultEmail,
                    const QString &strOtherEmail, QString &strBack );
 
         ContactEditor::ContactEditor(const Contact &entry,
                                 const QValueList<int> *newOrderedValues,
                                 QStringList *slNewOrdered,
-                                QWidget *parent = 0,
-                                const char *name = 0,
-                                WFlags fl = 0 )
+                                QWidget *parent,
+                                const char *name,
+                                WFlags fl )
         : QDialog( parent, name, TRUE, fl ),
           orderedValues( newOrderedValues ),
           slOrdered( slNewOrdered )
 {
         
         init();
         initMap();
         setEntry( entry );
         qDebug("finish");
 }
 
 ContactEditor::~ContactEditor() {
@@ -1116,24 +1116,25 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                         return strFirstName;
 
                 case NAME_M:
                         return strMiddleName;
 
                 case NAME_L:
                         return strLastName;
 
                 case NAME_S:
                         return strSuffix;
 
         }
+        return QString::null;
 }
 
 void ContactEditor::cleanupFields() {
 
         QStringList::Iterator it = slChooserValues->begin();
         for ( int i = 0; it != slChooserValues->end(); i++, ++it ) {
                 (*it) = "";
         }
 
         for ( int i = 0; i < 7; i++ ) {
                 (*slHomeAddress)[i] = "";
                 (*slBusinessAddress)[i] = "";