1 files changed, 43 insertions, 39 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 534666d..e496387 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -18,12 +18,13 @@
  * is made to operate exactly in interface with the exception of name.
  *
  */
 
 #include "contacteditor.h"
 
+#include <opie2/odebug.h>
 #include <opie2/opimcontact.h>
 
 #include <qpe/categoryselect.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/qpedialog.h>
 #include <qpe/resource.h>
@@ -74,13 +75,13 @@ ContactEditor::ContactEditor(	const Opie::OPimContact &entry,
 }
 
 ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
-        qWarning("init() START");
+        Opie::Core::owarn << "init() START" << oendl;
 
         uint i = 0;
 
         QStringList trlChooserNames;
 
         for (i = 0; i <= 6; i++) {
@@ -683,24 +684,24 @@ void ContactEditor::init() {
                  this, SLOT(slotAddressTypeChange(int)) );
 
         new QPEDialogListener(this);
 
         setPersonalView ( m_personalView );
 
-        qWarning("init() END");
+        Opie::Core::owarn << "init() END" << oendl;
 }
 
 void ContactEditor::defaultEmailChanged(int i){
-        qDebug("defaultEmailChanged");
+        Opie::Core::odebug << "defaultEmailChanged" << oendl;
 
         // was sollte das ? (se)
         // int index = cmbChooserField1->currentItem();
         // slChooserValues[index] = cmbDefaultEmail->text(i);
 
         defaultEmail = cmbDefaultEmail->text(i);
-        qDebug ("Changed to: %s", defaultEmail.latin1());
+        Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
 
 }
 
 void ContactEditor::populateDefaultEmailCmb(){
 
         // if the default-email combo was not selected and therfore not created
@@ -713,18 +714,18 @@ void ContactEditor::populateDefaultEmailCmb(){
         cmbDefaultEmail->insertStringList( emails );
         // cmbDefaultEmail->show();
 
         // Select default email in combo..
         bool found = false;
         for ( int i = 0; i < cmbDefaultEmail->count(); i++){
-                qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",
-                       cmbDefaultEmail->text( i ).latin1(), defaultEmail.latin1());
+                Opie::Core::odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
+                                                        << "< defaultEmail >" << defaultEmail << "<" << oendl;
 
                 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
                         cmbDefaultEmail->setCurrentItem( i );
-                        qDebug("set");
+                        Opie::Core::odebug << "set" << oendl;
                         found = true;
                 }
         }
 
         // If the current default email is not found in the list, we choose the
         // first one..
@@ -734,20 +735,22 @@ void ContactEditor::populateDefaultEmailCmb(){
 
 // 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];
-        qWarning("ContactEditor::cmbChooserChange -> Type: %s, WidgetPos: %d", type.latin1(), widgetPos );
+        Opie::Core::owarn << "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"){
-                qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition);
+                Opie::Core::owarn << "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;
@@ -774,13 +777,13 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
                 // Set current default email
                 populateDefaultEmailCmb();
 
 
         } else {
                 // Something else was selected: Hide combo..
-                qWarning(" Hiding default-email combo" );
+                Opie::Core::owarn << " Hiding default-email combo" << oendl;
                 if ( defaultEmailChooserPosition == widgetPos ){
                         defaultEmailChooserPosition = -1;
                 }
                 QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo );
                 if ( cmbo ){
                         inputStack->raiseWidget( TextField );
@@ -799,13 +802,13 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 
 }
 
 // Currently accessed when we select default-email more than once !
 void ContactEditor::chooserError( int index )
 {
-        qWarning("ContactEditor::chooserError( %d )", index);
+        Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
         QMessageBox::warning( this, "Chooser Error",
                               "Multiple selection of this\n"
                               "Item is not allowed !\n\n"
                               "First deselect the previous one !",
                               "&OK", 0, 0,
                               0, 0 );
@@ -835,52 +838,53 @@ 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
-        qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",
-               type.latin1(),textChanged.latin1(), index,  widgetPos );
+        Opie::Core::odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
+                                                << textChanged << "< index=" << index << ", widgetPos=" << widgetPos
+                                                << " )" << oendl;
 
         if ( type == "Default Email"){
-                qWarning ("??? Wozu??: %s", textChanged.latin1());
+                Opie::Core::owarn << "??? Wozu??: " << textChanged << oendl;
                 defaultEmail = textChanged;
 
                 populateDefaultEmailCmb();
 
         }else if (type == "Emails"){
-                qDebug("emails");
+                Opie::Core::odebug << "emails" << oendl;
 
                 QString de;
                 emails = QStringList::split (",", textChanged );
 
                 populateDefaultEmailCmb();
         }
 
         slChooserValues[index] = textChanged;
 
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
-        qWarning("ContactEditor::slotChooser1Change( %s )", textChanged.latin1());
+        Opie::Core::owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
-        qWarning("ContactEditor::slotChooser2Change( %s )", textChanged.latin1());
+        Opie::Core::owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
-        qWarning("ContactEditor::slotChooser3Change( %s )", textChanged.latin1());
+        Opie::Core::owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {
-        qWarning("ContactEditor::slotChooser4Change( %s )", textChanged.latin1());
+        Opie::Core::owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
 }
 
 void ContactEditor::slotAddressChange( const QString &textChanged ) {
 
         if ( cmbAddress->currentItem() == 0 ) {
@@ -944,46 +948,46 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
                 slHomeAddress[6] = textChanged;
         }
 }
 
 
 void ContactEditor::slotCmbChooser1Change( int index ) {
-        qWarning("ContactEditor::slotCmbChooser1Change( %d )", index);
+        Opie::Core::owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
         if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
 
                 txtChooserField1->setText( slChooserValues[index] );
                 txtChooserField1->setFocus();
 
         }
 
 }
 
 void ContactEditor::slotCmbChooser2Change( int index ) {
-        qWarning("ContactEditor::slotCmbChooser2Change( %d )", index);
+        Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
 
         if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
 
                 txtChooserField2->setText( slChooserValues[index] );
                 txtChooserField2->setFocus();
 
         }
 }
 
 void ContactEditor::slotCmbChooser3Change( int index ) {
-        qWarning("ContactEditor::slotCmbChooser3Change( %d )", index);
+        Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
 
         if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
 
                 txtChooserField3->setText( slChooserValues[index] );
                 txtChooserField3->setFocus();
 
         }
 }
 
 void ContactEditor::slotCmbChooser4Change( int index ) {
-        qWarning("ContactEditor::slotCmbChooser4Change( %d )", index);
+        Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
 
         if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
 
                 txtChooserField4->setText( slChooserValues[index] );
                 txtChooserField4->setFocus();
 
@@ -1022,13 +1026,13 @@ void ContactEditor::slotAddressTypeChange( int index ) {
         }
 
 }
 
 void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
-        qWarning( "ContactEditor::slotFullNameChange( %s )", textChanged.latin1() );
+        Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
 
         int index = cmbFileAs->currentItem();
 
         cmbFileAs->clear();
 
         cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) );
@@ -1046,13 +1050,13 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 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 ){
-        qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() );
+        Opie::Core::owarn << "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 );
 
@@ -1128,26 +1132,26 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
         QString strMiddleName;
         QString strLastName;
         QString strTitle;
         int commapos;
         bool haveLastName = false;
 
-        qWarning("Fullname: %s", simplifiedName.latin1());
+        Opie::Core::owarn << "Fullname: " << simplifiedName << oendl;
 
         commapos = simplifiedName.find( ',', 0, TRUE);
         if ( commapos >= 0 ) {
-                qWarning(" Commapos: %d", commapos );
+                Opie::Core::owarn << " 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;
-                qWarning("Fullname without ',': %s", simplifiedName.latin1());
+                Opie::Core::owarn << "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();
@@ -1175,16 +1179,16 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
         }
 
         if ( strFirstName == strLastName )
                 strFirstName = "";
 
-        qWarning(" strFirstName: %s",  strFirstName.latin1());
-        qWarning(" strMiddleName: %s",  strMiddleName.latin1());
-        qWarning(" strLastName: %s",  strLastName.latin1());
-        qWarning(" strTitle: %s",  strTitle.latin1());
+        Opie::Core::owarn << "strFirstName: " << strFirstName << oendl;
+        Opie::Core::owarn << "strMiddletName: " << strMiddleName << oendl;
+        Opie::Core::owarn << "strLastName: " << strLastName << oendl;
+        Opie::Core::owarn << "strTitle: " << strTitle << oendl;
 
         switch (type) {
         case NAME_FL:
                 return strFirstName + " " + strLastName;
 
         case NAME_LF:
@@ -1261,13 +1265,13 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 
         ent = entry;
 
         emails = QStringList(ent.emailList());
         defaultEmail = ent.defaultEmail();
         if (defaultEmail.isEmpty()) defaultEmail = emails[0];
-        qDebug("default email=%s",defaultEmail.latin1());
+        Opie::Core::odebug << "default email=" << defaultEmail << oendl;
 
         txtFirstName->setText( ent.firstName() );
         txtMiddleName->setText( ent.middleName() );
         txtLastName->setText( ent.lastName() );
         txtSuffix->setText( ent.suffix() );
 
@@ -1321,13 +1325,13 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
         //}
 
         QStringList::ConstIterator it;
         QListIterator<QLineEdit> itLE( listValue );
         for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
 
-                qWarning(" Filling dynamic Field: %s", (*it).latin1() );
+                Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl;
 
                 if ( *it ==  "Department"  )
                         (*itLE)->setText( ent.department() );
 
                 if ( *it == "Company" )
                         (*itLE)->setText( ent.company() );
@@ -1345,13 +1349,13 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
                         (*itLE)->setText( ent.manager() );
 
                 if ( *it == "Spouse" )
                         (*itLE)->setText( ent.spouse() );
 
                 if ( *it == "Nickname" ){
-                        qWarning("**** Nichname: %s", ent.nickname().latin1() );
+                        Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
                         (*itLE)->setText( ent.nickname() );
                 }
 
                 if ( *it == "Children" )
                         (*itLE)->setText( ent.children() );
 
@@ -1578,14 +1582,14 @@ void ContactEditor::saveEntry() {
 
                 if ( *it == "Emails" ){
                         QString allemail;
                         QString defaultmail;
                         parseEmailFrom( emails.join(","), defaultmail, allemail );
                         if ( defaultEmail.isEmpty() ){
-                                qWarning("Default email was not set by user!");
-                                qWarning("Using first email in list: %s", defaultmail.latin1());
+                                Opie::Core::owarn << "Default email was not set by user!" << oendl;
+                                Opie::Core::owarn << "Using first email in list: " << defaultmail << oendl;
                                 ent.setDefaultEmail( defaultmail );
                         }
                         ent.setEmails( allemail );
                 }
 
                 if ( *it == "Default Email")
@@ -1731,17 +1735,17 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
         birthdayButton->setText( dateString );
         ent.setBirthday ( date );
 }
 
 void ContactEditor::slotRemoveBirthday()
 {
-        qWarning("void ContactEditor::slotRemoveBirthday()");
+        Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
         ent.setBirthday( QDate() );
         updateDatePicker();
 }
 
 void ContactEditor::slotRemoveAnniversary()
 {
-        qWarning("void ContactEditor::slotRemoveAnniversary()");
+        Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
         ent.setAnniversary( QDate() );
         updateDatePicker();
 }