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
@@ -23,2 +23,3 @@
 
+#include <opie2/odebug.h>
 #include <opie2/opimcontact.h>
@@ -79,3 +80,3 @@ ContactEditor::~ContactEditor() {
 void ContactEditor::init() {
-        qWarning("init() START");
+        Opie::Core::owarn << "init() START" << oendl;
 
@@ -688,3 +689,3 @@ void ContactEditor::init() {
 
-        qWarning("init() END");
+        Opie::Core::owarn << "init() END" << oendl;
 }
@@ -692,3 +693,3 @@ void ContactEditor::init() {
 void ContactEditor::defaultEmailChanged(int i){
-        qDebug("defaultEmailChanged");
+        Opie::Core::odebug << "defaultEmailChanged" << oendl;
 
@@ -699,3 +700,3 @@ void ContactEditor::defaultEmailChanged(int i){
         defaultEmail = cmbDefaultEmail->text(i);
-        qDebug ("Changed to: %s", defaultEmail.latin1());
+        Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
 
@@ -718,4 +719,4 @@ void ContactEditor::populateDefaultEmailCmb(){
         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;
 
@@ -723,3 +724,3 @@ void ContactEditor::populateDefaultEmailCmb(){
                         cmbDefaultEmail->setCurrentItem( i );
-                        qDebug("set");
+                        Opie::Core::odebug << "set" << oendl;
                         found = true;
@@ -739,3 +740,4 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
         QString type = slChooserNames[index];
-        qWarning("ContactEditor::cmbChooserChange -> Type: %s, WidgetPos: %d", type.latin1(), widgetPos );
+        Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type
+                                                << ", WidgetPos: " << widgetPos << oendl;
 
@@ -746,3 +748,4 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
         if ( type == "Default Email"){
-                qWarning("Choosing default-email (defaultEmailChooserPosition= %d) ", defaultEmailChooserPosition);
+                Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= "
+                                                        << defaultEmailChooserPosition << ") " << oendl;
 
@@ -779,3 +782,3 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
                 // Something else was selected: Hide combo..
-                qWarning(" Hiding default-email combo" );
+                Opie::Core::owarn << " Hiding default-email combo" << oendl;
                 if ( defaultEmailChooserPosition == widgetPos ){
@@ -804,3 +807,3 @@ void ContactEditor::chooserError( int index )
 {
-        qWarning("ContactEditor::chooserError( %d )", index);
+        Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
         QMessageBox::warning( this, "Chooser Error",
@@ -840,7 +843,8 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
         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;
@@ -850,3 +854,3 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
         }else if (type == "Emails"){
-                qDebug("emails");
+                Opie::Core::odebug << "emails" << oendl;
 
@@ -863,3 +867,3 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
 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);
@@ -868,3 +872,3 @@ void ContactEditor::slotChooser1Change( const QString &textChanged ) {
 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);
@@ -874,3 +878,3 @@ void ContactEditor::slotChooser2Change( const QString &textChanged ) {
 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);
@@ -879,3 +883,3 @@ void ContactEditor::slotChooser3Change( const QString &textChanged ) {
 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);
@@ -949,3 +953,3 @@ void ContactEditor::slotCountryChange( const QString &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) ){
@@ -960,3 +964,3 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
 void ContactEditor::slotCmbChooser2Change( int index ) {
-        qWarning("ContactEditor::slotCmbChooser2Change( %d )", index);
+        Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
 
@@ -971,3 +975,3 @@ void ContactEditor::slotCmbChooser2Change( int index ) {
 void ContactEditor::slotCmbChooser3Change( int index ) {
-        qWarning("ContactEditor::slotCmbChooser3Change( %d )", index);
+        Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
 
@@ -982,3 +986,3 @@ void ContactEditor::slotCmbChooser3Change( int index ) {
 void ContactEditor::slotCmbChooser4Change( int index ) {
-        qWarning("ContactEditor::slotCmbChooser4Change( %d )", index);
+        Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
 
@@ -1027,3 +1031,3 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
-        qWarning( "ContactEditor::slotFullNameChange( %s )", textChanged.latin1() );
+        Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
 
@@ -1051,3 +1055,3 @@ void ContactEditor::slotSuffixChange( const QString& ) {
 void ContactEditor::slotOrganizationChange( const QString &textChanged ){
-        qWarning( "ContactEditor::slotOrganizationChange( %s )", textChanged.latin1() );
+        Opie::Core::owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
         // Special handling for storing Companies:
@@ -1133,3 +1137,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
-        qWarning("Fullname: %s", simplifiedName.latin1());
+        Opie::Core::owarn << "Fullname: " << simplifiedName << oendl;
 
@@ -1137,3 +1141,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
         if ( commapos >= 0 ) {
-                qWarning(" Commapos: %d", commapos );
+                Opie::Core::owarn << " Commapos: " << commapos << oendl;
 
@@ -1146,3 +1150,3 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                 haveLastName = true;
-                qWarning("Fullname without ',': %s", simplifiedName.latin1());
+                Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl;
 
@@ -1180,6 +1184,6 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
 
-        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;
 
@@ -1266,3 +1270,3 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
         if (defaultEmail.isEmpty()) defaultEmail = emails[0];
-        qDebug("default email=%s",defaultEmail.latin1());
+        Opie::Core::odebug << "default email=" << defaultEmail << oendl;
 
@@ -1326,3 +1330,3 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
 
-                qWarning(" Filling dynamic Field: %s", (*it).latin1() );
+                Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl;
 
@@ -1350,3 +1354,3 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
                 if ( *it == "Nickname" ){
-                        qWarning("**** Nichname: %s", ent.nickname().latin1() );
+                        Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
                         (*itLE)->setText( ent.nickname() );
@@ -1583,4 +1587,4 @@ void ContactEditor::saveEntry() {
                         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 );
@@ -1736,3 +1740,3 @@ void ContactEditor::slotRemoveBirthday()
 {
-        qWarning("void ContactEditor::slotRemoveBirthday()");
+        Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
         ent.setBirthday( QDate() );
@@ -1743,3 +1747,3 @@ void ContactEditor::slotRemoveAnniversary()
 {
-        qWarning("void ContactEditor::slotRemoveAnniversary()");
+        Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
         ent.setAnniversary( QDate() );