1 files changed, 34 insertions, 33 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 9ae66d1..94c0a13 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -19,13 +19,13 @@
 
 #define QTOPIA_INTERNAL_FD
 
 // #include "addresssettings.h"
 #include "addressbook.h"
 
-
+#include <opie2/odebug.h>
 #include <opie2/ofileselector.h>
 #include <opie2/ofiledialog.h>
 #include <opie2/opimcontact.h>
 #include <opie2/ocontactaccessbackend_vcard.h>
 
 #include <qpe/resource.h>
@@ -248,13 +248,13 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
         defaultFont = new QFont( m_abView->font() );
          slotSetFont(m_config.fontSize());
         m_curFontSize = m_config.fontSize();
 
         setCentralWidget(listContainer);
 
-        //    qDebug("adressbook contrsuction: t=%d", t.elapsed() );
+                //Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
         connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
         connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) );
         connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ),
         this, SLOT( appMessage(const QCString&,const QByteArray&) ) );
 
 
@@ -264,29 +264,29 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
 void AddressbookWindow::slotConfig()
 {
         ConfigDlg* dlg = new ConfigDlg( this, "Config" );
         dlg -> setConfig( m_config );
         if ( QPEApplication::execDialog( dlg ) ) {
-                qWarning ("Config Dialog accepted!");
+                Opie::Core::owarn << "Config Dialog accepted!" << oendl;
                 m_config = dlg -> getConfig();
                 if ( m_curFontSize != m_config.fontSize() ){
-                        qWarning("Font was changed!");
+                        Opie::Core::owarn << "Font was changed!" << oendl;
                         m_curFontSize = m_config.fontSize();
                         emit slotSetFont( m_curFontSize );
                 }
                 m_abView -> setListOrder( m_config.orderList() );
         }
 
         delete dlg;
 }
 
 
 void AddressbookWindow::slotSetFont( int size )
 {
-        qWarning("void AddressbookWindow::slotSetFont( %d )", size);
+        Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
 
         if (size > 2 || size < 0)
                 size = 1;
 
         m_config.setFontSize( size );
 
@@ -322,16 +322,16 @@ void AddressbookWindow::importvCard() {
                 setDocument((const QString&) str );
         }
 
 }
 void AddressbookWindow::exportvCard()
 {
-        qWarning(" void AddressbookWindow::exportvCard()");
+        Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl;
         QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
         if( !filename.isEmpty() &&  ( filename[filename.length()-1] != '/' ) ){
-                qWarning(" Save to file %s, (%d)", filename.latin1(), filename.length()-1 );
+                Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
                 Opie::OPimContact curCont = m_abView->currentEntry();
                 if ( !curCont.isEmpty() ){
                         Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                                                 filename );
                         Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook_exp", QString::null , vcard_backend, true );
                         if ( access ){
@@ -347,65 +347,65 @@ void AddressbookWindow::exportvCard()
                 QMessageBox::critical( 0, "Export VCard",
                                        QString( tr( "You have to set a filename !") ) );
 }
 
 void AddressbookWindow::setDocument( const QString &filename )
 {
-        qWarning( "void AddressbookWindow::setDocument( %s )", filename.latin1() );
+        Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
 
         if ( filename.find(".vcf") != int(filename.length()) - 4 ){
 
 
 
                 switch( QMessageBox::information( this, tr ( "Right file type ?" ),
                                                   tr( "The selected file \n does not end with \".vcf\".\n Do you really want to open it?" ),
                                                   tr( "&Yes" ), tr( "&No" ), QString::null,
                                                   0,      // Enter == button 0
                                                   2 ) ) { // Escape == button 2
                 case 0:
-                        qWarning("YES clicked");
+                        Opie::Core::owarn << "YES clicked" << oendl;
                         break;
                 case 1:
-                        qWarning("NO clicked");
+                        Opie::Core::owarn << "NO clicked" << oendl;
                         return;
                         break;
                 }
         }
 
         Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null,
                                                                          filename );
         Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true );
         Opie::OPimContactAccess::List allList = access->allRecords();
-        qWarning( "Found number of contacts in File: %d", allList.count() );
+        Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl;
 
         if ( !allList.count() ) {
                 QMessageBox::information( this, "Import VCard",
                                           "It was impossible to import\nthe VCard.\n"
                                           "The VCard may be corrupted!" );
         }
 
         bool doAsk = true;
         Opie::OPimContactAccess::List::Iterator it;
         for ( it = allList.begin(); it != allList.end(); ++it ){
-                qWarning("Adding Contact from: %s", (*it).fullName().latin1() );
+                Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl;
                 if ( doAsk ){
                         switch( QMessageBox::information( this, tr ( "Add Contact?" ),
                                                           tr( "Do you really want add contact for \n%1?" )
                                                           .arg( (*it).fullName().latin1() ),
                                                           tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"),
                                                           0,      // Enter == button 0
                                                           2 ) ) { // Escape == button 2
                         case 0:
-                                qWarning("YES clicked");
+                                Opie::Core::owarn << "YES clicked" << oendl;
                                 m_abView->addEntry( *it );
                                 break;
                         case 1:
-                                qWarning("NO clicked");
+                                Opie::Core::owarn << "NO clicked" << oendl;
                                 break;
                         case 2:
-                                qWarning("YesAll clicked");
+                                Opie::Core::owarn << "YesAll clicked" << oendl;
                                 doAsk = false;
                                 break;
                         }
                 }else
                         m_abView->addEntry( *it );
 
@@ -535,25 +535,25 @@ void AddressbookWindow::writeMail()
         if ( basepath.isEmpty() )
                 basepath = QString::fromLatin1( getenv("QPEDIR") );
 
         // Try to access the preferred. If not possible, try to
         // switch to the other one..
         if ( m_config.useQtMail() ){
-                qWarning ("Accessing: %s", (basepath + "/bin/qtmail").latin1());
-                if ( QFile::exists( basepath + "/bin/qtmail" ) ){
-                        qWarning ("QCop");
+                Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
+                if ( QFile::exists( basepath + "/bin/qtmail" ) ){
+                        Opie::Core::owarn << "QCop" << oendl;
                         QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
                         e << name << email;
                         return;
                 } else
                         m_config.setUseOpieMail( true );
         }
         if ( m_config.useOpieMail() ){
-                qWarning ("Accessing: %s", (basepath + "/bin/opiemail").latin1());
+                Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
                 if ( QFile::exists( basepath + "/bin/opiemail" ) ){
-                        qWarning ("QCop");
+                        Opie::Core::owarn << "QCop" << oendl;
                         QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
                         e << name << email;
                         return;
                 } else
                         m_config.setUseQtMail( true );
         }
@@ -589,13 +589,13 @@ void AddressbookWindow::slotBeam()
                 access->save();
                 delete access;
 
                 beamFilename = beamfile;
         }
 
-        qWarning("Beaming: %s", beamFilename.latin1() );
+        Opie::Core::owarn << "Beaming: " << beamFilename << oendl;
 
         Ir *ir = new Ir( this );
         connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) );
         QString description = c.fullName();
         ir->send( beamFilename, description, "text/x-vCard" );
 }
@@ -636,13 +636,13 @@ static void parseName( const QString& name, QString *first, QString *middle,
 }
 
 
 void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 {
         bool needShow = FALSE;
-        qWarning("Receiving QCop-Call with message %s", QString( msg ).latin1() );
+                Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl;
 
 
         if (msg == "editPersonal()") {
                 editPersonal();
         } else if (msg == "editPersonalAndClose()") {
                 editPersonal();
@@ -652,13 +652,13 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                 QString name, email;
                 stream >> name >> email;
 
                 Opie::OPimContact cnt;
                 QString fn, mn, ln;
                 parseName( name, &fn, &mn, &ln );
-                //  qDebug( " %s - %s - %s", fn.latin1(), mn.latin1(), ln.latin1() );
+                        //Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl;
                 cnt.setFirstName( fn );
                 cnt.setMiddleName( mn );
                 cnt.setLastName( ln );
                 cnt.insertEmails( email );
                 cnt.setDefaultEmail( email );
                 cnt.setFileAs();
@@ -679,13 +679,13 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
         } else if ( msg == "show(int)" ) {
                 raise();
                 QDataStream stream(data,IO_ReadOnly);
                 int uid;
                 stream >> uid;
 
-                qWarning( "Showing uid: %d" , uid );
+                Opie::Core::owarn << "Showing uid: " << uid << oendl;
 
                 // Deactivate Personal View..
                 if ( actionPersonal->isOn() ){
                         actionPersonal->setOn( false );
                         slotPersonalView();
                 }
@@ -759,13 +759,13 @@ void AddressbookWindow::editPersonal()
 {
         Opie::OPimContact entry;
 
         // Switch to personal view if not selected
         // but take care of the menu, too
         if ( ! actionPersonal->isOn() ){
-                qWarning("*** ++++");
+                Opie::Core::owarn << "*** ++++" << oendl;
                 actionPersonal->setOn( true );
                 slotPersonalView();
         }
 
         if ( !abEditor ) {
                 abEditor = new ContactEditor( entry, this, "editor" );
@@ -778,29 +778,29 @@ void AddressbookWindow::editPersonal()
 
 }
 
 
 void AddressbookWindow::slotPersonalView()
 {
-        qWarning("slotPersonalView()");
+        Opie::Core::owarn << "slotPersonalView()" << oendl;
         if (!actionPersonal->isOn()) {
                 // we just turned it off
-                qWarning("slotPersonalView()-> OFF");
+                Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl;
                 setCaption( tr("Contacts") );
                 actionNew->setEnabled(TRUE);
                 actionTrash->setEnabled(TRUE);
                 actionFind->setEnabled(TRUE);
                 actionMail->setEnabled(TRUE);
                 // slotUpdateToolbar();
 
                 m_abView->showPersonal( false );
 
                 return;
         }
 
-        qWarning("slotPersonalView()-> ON");
+        Opie::Core::owarn << "slotPersonalView()-> ON" << oendl;
         // XXX need to disable some QActions.
         actionNew->setEnabled(FALSE);
         actionTrash->setEnabled(FALSE);
         actionFind->setEnabled(FALSE);
         actionMail->setEnabled(FALSE);
 
@@ -884,30 +884,31 @@ void AddressbookWindow::slotSave()
 }
 #endif
 
 
 void AddressbookWindow::slotNotFound()
 {
-        qWarning("Got notfound signal!");
+        Opie::Core::owarn << "Got not found signal!" << oendl;
         QMessageBox::information( this, tr( "Not Found" ),
                                  "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" );
 
 
 }
 void AddressbookWindow::slotWrapAround()
 {
-        qWarning("Got wrap signal!");
+        Opie::Core::owarn << "Got wrap signal!" << oendl;
         // if ( doNotifyWrapAround )
         //      QMessageBox::information( this, tr( "End of list" ),
         //                                tr( "End of list. Wrap around now...!" ) + "\n" );
 
 }
 
 void AddressbookWindow::slotSetCategory( int c )
 {
-        qWarning( "void AddressbookWindow::slotSetCategory( %d ) from %d", c, catMenu->count() );
+        Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
+                                        << catMenu->count() << oendl;
 
         QString cat, book;
         AbView::Views  view = AbView::TableView;
 
         if ( c <= 0 )
                 return;
@@ -936,13 +937,13 @@ void AddressbookWindow::slotSetCategory( int c )
         //                      book = tr( "Personal" );
         //                      view = AbView:: PersonalView;
                         }else if ( i == 3 ){ // default All Categories
                                 cat = QString::null;
                         }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled
                                 cat = "Unfiled";
-                                qWarning ("Unfiled selected!");
+                                Opie::Core::owarn << "Unfiled selected!" << oendl;
                         }else{
                                 cat = m_abView->categories()[i - 4];
                         }
                 }
         }
 
@@ -959,13 +960,13 @@ void AddressbookWindow::slotSetCategory( int c )
 
         setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) );
 }
 
 void AddressbookWindow::slotViewSwitched( int view )
 {
-        qWarning( "void AddressbookWindow::slotViewSwitched( %d )", view );
+        Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
         int menu = 0;
 
         // Switch to selected view
         switch ( view ){
         case AbView::TableView:
                 menu = 1;