- 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
@@ -1,249 +1,249 @@
 /*
  * Copyright (c) 2002 Michael R. Crawford <mike@tuxnami.org>
  *
  * This file is an add-on for the OPIE Palmtop Environment
  *
  * This file may be distributed and/or modified under the terms of the
  * GNU General Public License version 2 as published by the Free Software
  * Foundation and appearing in the file LICENSE.GPL included in the pacakaging
  * of this file.
  *
  * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
  * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  *
  * This is a rewrite of the abeditor.h file, modified to provide a more
  * intuitive interface to TrollTech's original Address Book editor.  This
  * is made to operate exactly in interface with the exception of name.
  *
  */
 
 #include "contacteditor.h"
 #include "addresspicker.h"
 
 #include <qpe/categoryselect.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
 
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qscrollview.h>
 #include <qtoolbutton.h>
 #include <qpushbutton.h>
 #include <qmainwindow.h>
 #include <qvaluelist.h>
 
 static inline bool containsAlphaNum( const QString &str );
 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() {
 }
 
 void ContactEditor::init() {
 
         useFullName = TRUE;
 
         int i = 0;
 
         slHomeAddress = new QStringList;
         slBusinessAddress = new QStringList;
         slChooserNames = new QStringList;
         slChooserValues = new QStringList;
 
         slDynamicEntries = new QStringList;
 
         //*slDynamicEntries = *slOrdered;
 
         for (i = 0; i <= 6; i++) {
                 slHomeAddress->append( "" );
                 slBusinessAddress->append( "" );
         }
 
         {
                 hasGender = FALSE;
                 hasTitle = FALSE;
                 hasCompany = FALSE;
                 hasNotes = FALSE;
                 hasStreet = FALSE;
                 hasStreet2 = FALSE;
                 hasPOBox = FALSE;
                 hasCity = FALSE;
                 hasState = FALSE;
                 hasZip = FALSE;
                 hasCountry = FALSE;
                 
                 QStringList::ConstIterator it = slOrdered->begin();
                 for ( i = 0; it != slOrdered->end(); i++, ++it ) {
 
                         if ( (*it).right( 3 ) == tr( "Fax" ) ) {
                                 slChooserNames->append( *it );
                                 slChooserValues->append( tr( "" ) );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
                         if ( (*it).right( 5 ) == tr( "Phone" ) ) {
                                 slChooserNames->append( *it );
                                 slChooserValues->append( "" );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
                         if ( (*it).right( 2 ) == tr( "IM" ) ) {
                                 slChooserNames->append( *it );
                                 slChooserValues->append( ""  );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
                         if ( (*it).right( 6 ) == tr( "Mobile" ) ) {
                                 slChooserNames->append( *it );
                                 slChooserValues->append( "" );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
                         if ( (*it).right( 4 ) == tr( "Page" ) ) {
                                 slChooserNames->append( *it );
                                 slChooserValues->append( "" );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
                         if ( (*it).right( 5 ) == tr( "Pager" ) ) {
                                 slChooserNames->append( *it );
                                 slChooserValues->append( "" );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
                         if ( *it == tr( "Default Email" ) ) {
                                 slChooserNames->append( *it );
                                 slChooserValues->append( "" );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
                         if ( *it == tr( "Emails" ) ) {
                                 slChooserNames->append( *it );
                                 slChooserValues->append( "" );
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
                         if ( *it == tr( "Name Title" ) ) {
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
         
                         if ( *it == tr( "First Name" ) ) {
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
                         
                         if ( *it == tr( "Middle Name" ) ) {
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
                         
                         if ( *it == tr( "Last Name" ) ) {
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
         
                         if ( *it == tr( "Suffix" ) ) {
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
 
                         if ( *it == tr( "File As" ) ) {
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
         
                         if ( *it == tr( "Gender" ) ) {
                                 hasGender = TRUE;
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
         
                         if ( *it == tr( "Job Title" ) ) {
                                 hasTitle = TRUE;
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
         
                         if ( *it == tr( "Company" ) ) {
                                 hasCompany = TRUE;
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
         
                         if ( *it == tr( "Notes" ) ) {
                                 hasNotes = TRUE;
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
         
                         if ( *it == tr( "Groups" ) ) {
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
         
                         if ( (*it).right( 6 ) == tr( "Street" ) ) {
                                 hasStreet = TRUE;
                                 //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).right( 4 ) == tr( "City" ) ) {
                                 hasCity = TRUE;
                                 //slDynamicEntries->remove( it );
                                 continue;
                         }
         
                         if ( (*it).right( 5 ) == tr( "State" ) ) {
                                 hasState = TRUE;
                                 //slDynamicEntries->remove( it );
@@ -936,384 +936,385 @@ void ContactEditor::slotName() {
                 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() ) {
                 txtFullName->setText( txtFirstName->text() + " " + txtMiddleName->text() + " " + txtLastName->text() + " " + txtSuffix->text() );
                 slotFullNameChange( txtFullName->text() );
                 useFullName = FALSE;
         }
 
 }
 
 void ContactEditor::setNameFocus() {
 
         txtFullName->setFocus();
 
 }
 
 bool ContactEditor::isEmpty() {
         // Test and see if the record should be saved.
         // More strict than the original qtopia, needs name or fileas to save
 
         QString t = txtFullName->text();
         if ( !t.isEmpty() && containsAlphaNum( t ) ) 
                 return false;
         
         t = cmbFileAs->currentText();
         if ( !t.isEmpty() && containsAlphaNum( t ) )
                 return false;
 
         return true;
 
 }
 
 QString ContactEditor::parseName( const QString fullName, int type ) {
 
         QString simplifiedName( fullName.simplifyWhiteSpace() );
         QString strFirstName;
         QString strMiddleName;
         QString strLastName;
         QString strSuffix;
         QString strTitle;
         int commapos;
         int spCount;
         int spPos;
         int spPos2;
         
 
         commapos = simplifiedName.find( ',', 0, TRUE);
         spCount = simplifiedName.contains( ' ', TRUE );
 
         if ( commapos == -1 ) {
                 
                 switch (spCount) {
                         case 0:
                                 return simplifiedName;
 
                         case 1:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strFirstName = simplifiedName.left( spPos );
                                 strLastName = simplifiedName.mid( spPos + 1 );
                                 break;
 
                         case 2:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strFirstName = simplifiedName.left( spPos );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strMiddleName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 strLastName = simplifiedName.mid( spPos2 + 1 );
                                 break;
 
                         case 3:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strFirstName = simplifiedName.left( spPos );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strMiddleName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
                                 strLastName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
                                 strSuffix = simplifiedName.mid( spPos + 1 );
                                 break;
 
                         case 4:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strTitle = simplifiedName.left( spPos );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strFirstName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
                                 strMiddleName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strLastName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 strSuffix = simplifiedName.mid( spPos2 + 1 );
                                 break;
 
                         default:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strTitle = simplifiedName.left( spPos );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strFirstName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
                                 strMiddleName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strLastName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 strSuffix = simplifiedName.mid( spPos2 + 1 );
                                 break;
                 }
         } else {
                 simplifiedName.replace( commapos, 1, " " );
                 simplifiedName = simplifiedName.simplifyWhiteSpace();
                 
                 switch (spCount) {
                         case 0:
                                 return simplifiedName;
 
                         case 1:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strLastName = simplifiedName.left( spPos );
                                 strFirstName = simplifiedName.mid( spPos + 1 );
                                 break;
 
                         case 2:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strLastName = simplifiedName.left( spPos );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strFirstName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 strMiddleName = simplifiedName.mid( spPos2 + 1 );
                                 break;
 
                         case 3:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strLastName = simplifiedName.left( spPos );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strFirstName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
                                 strMiddleName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
                                 strSuffix = simplifiedName.mid( spPos + 1 );
                                 break;
 
                         case 4:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strLastName = simplifiedName.left( spPos );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strTitle = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
                                 strFirstName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos2 );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strMiddleName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 strSuffix = simplifiedName.mid( spPos2 + 1 );
                                 break;
 
                         default:
                                 spPos = simplifiedName.find( ' ', 0, TRUE );
                                 strLastName = simplifiedName.left( spPos );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strTitle = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 spPos = simplifiedName.find( ' ', spPos2 + 1, TRUE );
                                 strFirstName = simplifiedName.mid( spPos2 + 1, (spPos - 1) - spPos );
                                 spPos2 = simplifiedName.find( ' ', spPos + 1, TRUE );
                                 strMiddleName = simplifiedName.mid( spPos + 1, (spPos2 - 1) - spPos );
                                 strSuffix = simplifiedName.mid( spPos2 + 1 );
                                 break;
                 }
         }
         
         switch (type) {
                 case NAME_FL:
                         return strFirstName + " " + strLastName;
 
                 case NAME_LF:
                         return strLastName + ", " + strFirstName;
 
                 case NAME_LFM:
                         return strLastName + ", " + strFirstName + " " + strMiddleName;
 
                 case NAME_FMLS:
                         return strFirstName + " " + strMiddleName + " " + strLastName + " " + strSuffix;
 
                 case NAME_F:
                         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] = "";
         }
 
         QStringList::ConstIterator cit;
         QListIterator<QLineEdit> itLE( listValue );
         for ( cit = slDynamicEntries->begin(); cit != slDynamicEntries->end(); ++cit, ++itLE) {
                 (*itLE)->setText( "" );
         }
 
         txtFirstName->setText("");
         txtMiddleName->setText("");
         txtLastName->setText("");
         txtSuffix->setText("");
         txtNote->setText("");
         txtFullName->setText("");
         txtJobTitle->setText("");
         txtOrganization->setText("");
         txtChooserField1->setText("");
         txtChooserField2->setText("");
         txtChooserField3->setText("");
         txtAddress->setText("");
         //txtAddress2->setText("");
         txtCity->setText("");
         //txtPOBox->setText("");
         txtState->setText("");
         txtZip->setText("");
         QLineEdit *txtTmp = cmbCountry->lineEdit();
         txtTmp->setText("");
         txtTmp = cmbFileAs->lineEdit();
         txtTmp->setText("");
 
 }
 
 void ContactEditor::setEntry( const Contact &entry ) {
 
         cleanupFields();
 
         
         ent = entry;
 
         useFullName = FALSE;
         txtFirstName->setText( ent.firstName() );
         txtMiddleName->setText( ent.middleName() );
         txtLastName->setText( ent.lastName() );
         txtSuffix->setText( ent.suffix() );
 
         QString *tmpString = new QString;
         *tmpString = ent.firstName() + " " + ent.middleName() + 
                 + " " + ent.lastName() + " " + ent.suffix();
         
         txtFullName->setText( tmpString->simplifyWhiteSpace() );
 
         cmbFileAs->setEditText( ent.fileAs() );
 
         if (hasTitle)
                 txtJobTitle->setText( ent.jobTitle() );
 
         if (hasCompany) 
                 txtOrganization->setText( ent.company() );
 
         if (hasNotes)
                 txtNote->setText( ent.notes() );
 
         if (hasStreet) {
                 (*slHomeAddress)[0] = ent.homeStreet();
                 (*slBusinessAddress)[0] = ent.businessStreet();
         }
 /*
         if (hasStreet2) {
                 (*slHomeAddress)[1] = ent.homeStreet2();
                 (*slBusinessAddress)[1] = ent.businessStreet2();
         }
 
         if (hasPOBox) {
                 (*slHomeAddress)[2] = ent.homePOBox();
                 (*slBusinessAddress)[2] = ent.businessPOBox();
         }
 */
         if (hasCity) {
                 (*slHomeAddress)[3] = ent.homeCity();
                 (*slBusinessAddress)[3] = ent.businessCity();
         }
 
         if (hasState) {
                 (*slHomeAddress)[4] = ent.homeState();
                 (*slBusinessAddress)[4] = ent.businessState();
         }
 
         if (hasZip) {
                 (*slHomeAddress)[5] = ent.homeZip();
                 (*slBusinessAddress)[5] = ent.businessZip();
         }
 
         if (hasCountry) {
                 (*slHomeAddress)[6] = ent.homeCountry();
                 (*slBusinessAddress)[6] = ent.businessCountry();
         }
 
         QStringList::ConstIterator it;
         QListIterator<QLineEdit> itLE( listValue );
         for ( it = slDynamicEntries->begin(); it != slDynamicEntries->end(); ++it, ++itLE) {
                 if ( *it == "Department" )
                         (*itLE)->setText( ent.department() );
 
                 if ( *it == "Company" )
                         (*itLE)->setText( ent.company() );
 
                 if ( *it == "Office" )
                         (*itLE)->setText( ent.office() );
 
                 if ( *it == "Profession" )
                         (*itLE)->setText( ent.profession() );
 
                 if ( *it == "Assistant" )
                         (*itLE)->setText( ent.assistant() );
 
                 if ( *it == "Manager" )
                         (*itLE)->setText( ent.manager() );
 
                 if ( *it == "Spouse" )
                         (*itLE)->setText( ent.spouse() );
 
                 if ( *it == "Birthday" )
                         (*itLE)->setText( ent.birthday() );
 
                 if ( *it == "Anniversary" )
                         (*itLE)->setText( ent.anniversary() );
 
                 if ( *it == "Nickname" )
                         (*itLE)->setText( ent.nickname() );
 
                 if ( *it == "Children" )
                         (*itLE)->setText( ent.children() );
 
         }
 
         QStringList::Iterator itV;
         for ( it = slChooserNames->begin(), itV = slChooserValues->begin(); it != slChooserNames->end(); ++it, ++itV ) {
 
                 if ( *it == "Business Phone" || *it == "Work Phone" )
                         *itV = ent.businessPhone();
 /*
                 if ( *it == "Business 2 Phone" )
                         *itV = ent.business2Phone();
 */
                 if ( *it == "Business Fax" || *it == "Work Fax" )
                         *itV = ent.businessFax();
 
                 if ( *it == "Business Mobile" || *it == "work Mobile" )
                         *itV = ent.businessMobile();
 /*
                 if ( *it == "Company Phone" )
                         *itV = ent.companyPhone();
 */
                 if ( *it == "Default Email" )
                         *itV = ent.defaultEmail();
 
                 if ( *it == "Emails" )
                         *itV = ent.emails();
 
                 if ( *it == "Home Phone" )
                         *itV = ent.homePhone();
 /*
                 if ( *it == "Home 2 Phone" )
                         *itV = ent.home2Phone();
 */
                 if ( *it == "Home Fax" )
                         *itV = ent.homeFax();
 
                 if ( *it == "Home Mobile" )
                         *itV = ent.homeMobile();
 /*
                 if ( *it == "Car Phone" )
                         *itV = ent.carPhone();
 
                 if ( *it == "ISDN Phone" )
                         *itV = ent.ISDNPhone();
 
                 if ( *it == "Other Phone" )
                         *itV = ent.otherPhone();
 */