1 files changed, 29 insertions, 29 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 312c663..b078968 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -70,25 +70,25 @@ ContactEditor::ContactEditor(	const Opie::OPimContact &entry,
 	init();
 	setEntry( entry );
 // 	cmbDefaultEmail = 0;
 // 	defaultEmailChooserPosition = -1;
 
 	initializing = false;
 }
 
 ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
-	owarn << "init() START" << oendl;
+	odebug << "init() START" << oendl;
 
 	uint i = 0;
 
 	QStringList trlChooserNames;
 
 	for (i = 0; i <= 6; i++) {
 		slHomeAddress.append( "" );
 		slBusinessAddress.append( "" );
 	}
 
 	trlChooserNames   = Opie::OPimContactFields::trphonefields( false );
 	slChooserNames    = Opie::OPimContactFields::untrphonefields( false );
@@ -679,25 +679,25 @@ void ContactEditor::init() {
                  this, SLOT(slotCmbChooser2Change(int)) );
 	connect( cmbChooserField3, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser3Change(int)) );
 	connect( cmbChooserField4, SIGNAL(activated(int)),
                  this, SLOT(slotCmbChooser4Change(int)) );
 	connect( cmbAddress, SIGNAL(activated(int)),
                  this, SLOT(slotAddressTypeChange(int)) );
 
 	new QPEDialogListener(this);
 
 	setPersonalView ( m_personalView );
 
-	owarn << "init() END" << oendl;
+	odebug << "init() END" << oendl;
 }
 
 void ContactEditor::defaultEmailChanged(int i){
 	odebug << "defaultEmailChanged" << oendl;
 
 	// was sollte das ? (se)
 // 	int index = cmbChooserField1->currentItem();
 // 	slChooserValues[index] = cmbDefaultEmail->text(i);
 
 	defaultEmail = cmbDefaultEmail->text(i);
 	odebug << "Changed to: " << defaultEmail << oendl;
 
@@ -730,33 +730,33 @@ void ContactEditor::populateDefaultEmailCmb(){
 
 	// If the current default email is not found in the list, we choose the
 	// first one..
 	if ( !found )
 		defaultEmail = cmbDefaultEmail->text(0);
 }
 
 // Called when any combobox was changed.
 // "true" returned if the change was chandled by this function, else it should
 // be handled by something else..
 bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
 	QString type = slChooserNames[index];
-	owarn << "ContactEditor::cmbChooserChange -> Type: " << type
+	odebug << "ContactEditor::cmbChooserChange -> Type: " << type
 						<< ", WidgetPos: " << widgetPos << oendl;
 
 	if ( !initializing )
 		contactfields.setFieldOrder( widgetPos-1, index );
 
 	// Create and connect combobox for selecting the default email
         if ( type == "Default Email"){
-		owarn << "Choosing default-email (defaultEmailChooserPosition= "
+		odebug << "Choosing default-email (defaultEmailChooserPosition= "
 							<< defaultEmailChooserPosition << ") " << oendl;
 
 		// More than one default-email chooser is not allowed !
 		if ( ( defaultEmailChooserPosition != -1 ) &&
 		     defaultEmailChooserPosition != widgetPos && !initializing){
 			chooserError( widgetPos );
 			return true;
 		}
 
 		QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
 		if ( cmbo ){
 			inputStack->raiseWidget( TextField );
@@ -772,25 +772,25 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 		defaultEmailChooserPosition = widgetPos;
 		cmbDefaultEmail = cmbo;
 
 		connect( cmbo,SIGNAL( activated(int) ),
 			 SLOT( defaultEmailChanged(int) ) );
 
 		// Set current default email
 		populateDefaultEmailCmb();
 
 
 	} else {
 		// Something else was selected: Hide combo..
-		owarn << " Hiding default-email combo" << oendl;
+		odebug << " Hiding default-email combo" << oendl;
 		if ( defaultEmailChooserPosition == widgetPos ){
 			defaultEmailChooserPosition = -1;
 		}
 		QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
 		if ( cmbo ){
 			inputStack->raiseWidget( TextField );
 			inputStack -> removeWidget( cmbo );
 			cmbDefaultEmail = 0l;
 			delete cmbo;
 		}
 
 		// Caller should initialize the responsible textfield, therefore
@@ -838,60 +838,60 @@ void ContactEditor::chooserError( int index )
 }
 
 // Called when something was changed in a textfield (shouldn't it called textchanged? (se))
 void ContactEditor::chooserChange( const QString &textChanged, int index,
 				   QLineEdit* , int widgetPos ) {
 
 	QString type = slChooserNames[index]; // :SX
 	odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
 						<< textChanged << "< index=" << index << ", widgetPos=" << widgetPos
 						<< " )" << oendl;
 
         if ( type == "Default Email"){
-		owarn << "??? Wozu??: " << textChanged << oendl;
+		odebug << "??? Wozu??: " << textChanged << oendl;
 		defaultEmail = textChanged;
 
 		populateDefaultEmailCmb();
 
         }else if (type == "Emails"){
 		odebug << "emails" << oendl;
 
 		QString de;
 		emails = QStringList::split (",", textChanged );
 
 		populateDefaultEmailCmb();
 	}
 
 	slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
-	owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
+	odebug << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
 	chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
-	owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
+	odebug << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
 	chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
-	owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
+	odebug << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
 	chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {
-	owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
+	odebug << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
 	chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
 }
 
 void ContactEditor::slotAddressChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[0] = textChanged;
 	} else {
 		slHomeAddress[0] = textChanged;
 	}
 }
 
@@ -943,58 +943,58 @@ void ContactEditor::slotZipChange( const QString &textChanged ) {
 
 void ContactEditor::slotCountryChange( const QString &textChanged ) {
 
 	if ( cmbAddress->currentItem() == 0 ) {
 		slBusinessAddress[6] = textChanged;
 	} else {
 		slHomeAddress[6] = textChanged;
 	}
 }
 
 
 void ContactEditor::slotCmbChooser1Change( int index ) {
-	owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
+	odebug << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
 	if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
 
 		txtChooserField1->setText( slChooserValues[index] );
 		txtChooserField1->setFocus();
 
 	}
 
 }
 
 void ContactEditor::slotCmbChooser2Change( int index ) {
-	owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
+	odebug << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
 
 	if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
 
 		txtChooserField2->setText( slChooserValues[index] );
 		txtChooserField2->setFocus();
 
 	}
 }
 
 void ContactEditor::slotCmbChooser3Change( int index ) {
-	owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
+	odebug << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
 
 	if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
 
 		txtChooserField3->setText( slChooserValues[index] );
 		txtChooserField3->setFocus();
 
 	}
 }
 
 void ContactEditor::slotCmbChooser4Change( int index ) {
-	owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
+	odebug << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
 
 	if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
 
 		txtChooserField4->setText( slChooserValues[index] );
 		txtChooserField4->setFocus();
 
 	}
 }
 
 void ContactEditor::slotAddressTypeChange( int index ) {
 
 
@@ -1021,49 +1021,49 @@ void ContactEditor::slotAddressTypeChange( int index ) {
 		txtCity->setText( slHomeAddress[3] );
 		txtState->setText( slHomeAddress[4] );
 		txtZip->setText( slHomeAddress[5] );
 		QLineEdit *txtTmp = cmbCountry->lineEdit();
 		txtTmp->setText( slHomeAddress[6] );
 
 	}
 
 }
 
 void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
-	owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
+	odebug << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
 
 	int index = cmbFileAs->currentItem();
 
 	cmbFileAs->clear();
 
 	cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) );
 	cmbFileAs->insertItem( parseName( textChanged, NAME_LFM ) );
 	cmbFileAs->insertItem( parseName( textChanged, NAME_FL ) );
 	cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) );
 	if ( ! txtSuffix->text().isEmpty() )
 		cmbFileAs->insertItem( parseName( textChanged, NAME_FML ) + " " + txtSuffix->text() );
 
 	cmbFileAs->setCurrentItem( index );
 
 
 }
 
 void ContactEditor::slotSuffixChange( const QString& ) {
 	// Just want to update the FileAs combo if the suffix was changed..
 	slotFullNameChange( txtFullName->text() );
 }
 
 void ContactEditor::slotOrganizationChange( const QString &textChanged ){
-	owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
+	odebug << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
 	// Special handling for storing Companies:
 	// If no Fullname is given, we store the Company-Name as lastname
 	// to handle it like a person..
 	if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) )
 		txtFullName->setText( textChanged );
 
 }
 
 void ContactEditor::accept() {
 
 	if ( isEmpty() ) {
 		cleanupFields();
@@ -1127,38 +1127,38 @@ bool ContactEditor::isEmpty() {
 }
 
 QString ContactEditor::parseName( const QString fullName, int type ) {
 
 	QString simplifiedName( fullName.simplifyWhiteSpace() );
 	QString strFirstName;
 	QString strMiddleName;
 	QString strLastName;
 	QString strTitle;
 	int commapos;
 	bool haveLastName = false;
 
-	owarn << "Fullname: " << simplifiedName << oendl;
+	odebug << "Fullname: " << simplifiedName << oendl;
 
 	commapos = simplifiedName.find( ',', 0, TRUE);
 	if ( commapos >= 0 ) {
-		owarn << " Commapos: " << commapos << oendl;
+		odebug << " Commapos: " << commapos << oendl;
 
 		// A comma (",") separates the lastname from one or
 		// many first names. Thus, remove the lastname from the
 		// String and parse the firstnames.
 
 		strLastName = simplifiedName.left( commapos );
 		simplifiedName= simplifiedName.mid( commapos + 1 );
 		haveLastName = true;
-		owarn << "Fullname without ',': " << simplifiedName << oendl;
+		odebug << "Fullname without ',': " << simplifiedName << oendl;
 
 		// If we have any lastname, we should now split all first names.
 		// The first one will be the used as first, the rest as "middle names"
 
 		QStringList allFirstNames = QStringList::split(" ", simplifiedName);
 		QStringList::Iterator it = allFirstNames.begin();
 		strFirstName = *it++;
 		QStringList allSecondNames;
 		for ( ; it != allFirstNames.end(); ++it )
 			allSecondNames.append( *it );
 
 		strMiddleName = allSecondNames.join(" ");
@@ -1174,28 +1174,28 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 		QStringList allSecondNames;
 		for ( ; it != --allNames.end(); ++it )
 			allSecondNames.append( *it );
 
 		strMiddleName = allSecondNames.join(" ");
 		strLastName = *(--allNames.end());
 
 	}
 
 	if ( strFirstName == strLastName )
 		strFirstName = "";
 
-	owarn << "strFirstName: " << strFirstName << oendl;
-	owarn << "strMiddletName: " << strMiddleName << oendl;
-	owarn << "strLastName: " << strLastName << oendl;
-	owarn << "strTitle: " << strTitle << oendl;
+	odebug << "strFirstName: " << strFirstName << oendl;
+	odebug << "strMiddletName: " << strMiddleName << oendl;
+	odebug << "strLastName: " << strLastName << oendl;
+	odebug << "strTitle: " << strTitle << oendl;
 
 	switch (type) {
 	case NAME_FL:
 		return strFirstName + " " + strLastName;
 
 	case NAME_LF:
 		return strLastName + ", " + strFirstName;
 
 	case NAME_LFM:
 		return strLastName + ", " + strFirstName + " " + strMiddleName;
 
 	case NAME_FML:
@@ -1320,49 +1320,49 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 	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(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
 
-		owarn << " Filling dynamic Field: " << (*it) << oendl;
+		odebug << " Filling dynamic Field: " << (*it) << oendl;
 
 		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 == "Nickname" ){
-			owarn << "**** Nichname: " << ent.nickname() << oendl;
+			odebug << "**** Nichname: " << ent.nickname() << oendl;
 			(*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" ) )
@@ -1577,26 +1577,26 @@ void ContactEditor::saveEntry() {
 
 		if ( ( *it == "Business Fax" ) || ( *it == "Work Fax" ) )
 			ent.setBusinessFax( *itV );
 
 		if ( ( *it == "Business Mobile" ) || ( *it == "Work Mobile" ) )
 			ent.setBusinessMobile( *itV );
 
 		if ( *it == "Emails" ){
  			QString allemail;
  			QString defaultmail;
 			parseEmailFrom( emails.join(","), defaultmail, allemail );
 			if ( defaultEmail.isEmpty() ){
-				owarn << "Default email was not set by user!" << oendl;
-				owarn << "Using first email in list: " << defaultmail << oendl;
+				odebug << "Default email was not set by user!" << oendl;
+				odebug << "Using first email in list: " << defaultmail << oendl;
 				ent.setDefaultEmail( defaultmail );
 			}
  			ent.setEmails( allemail );
 		}
 
 		if ( *it == "Default Email")
 			ent.setDefaultEmail( defaultEmail /* *itV */ );
 
 		if ( *it == "Home Phone" )
 			ent.setHomePhone( *itV );
 
 		if ( *it == "Home Fax" )
@@ -1730,23 +1730,23 @@ void ContactEditor::slotAnniversaryDateChanged( int year, int month, int day)
 
 void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
 {
 	QDate date;
 	date.setYMD( year, month, day );
 	QString dateString = TimeString::numberDateString( date );
 	birthdayButton->setText( dateString );
 	ent.setBirthday ( date );
 }
 
 void ContactEditor::slotRemoveBirthday()
 {
-	owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
+	odebug << "void ContactEditor::slotRemoveBirthday()" << oendl;
 	ent.setBirthday( QDate() );
 	updateDatePicker();
 }
 
 void ContactEditor::slotRemoveAnniversary()
 {
-	owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
+	odebug << "void ContactEditor::slotRemoveAnniversary()" << oendl;
 	ent.setAnniversary( QDate() );
 	updateDatePicker();
 }