1 files changed, 31 insertions, 31 deletions

diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 94c0a13..35d0f41 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -253,3 +253,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
 
-                //Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
+                //odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl;
         connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) );
@@ -269,6 +269,6 @@ void AddressbookWindow::slotConfig()
         if ( QPEApplication::execDialog( dlg ) ) {
-                Opie::Core::owarn << "Config Dialog accepted!" << oendl;
+                owarn << "Config Dialog accepted!" << oendl;
                 m_config = dlg -> getConfig();
                 if ( m_curFontSize != m_config.fontSize() ){
-                        Opie::Core::owarn << "Font was changed!" << oendl;
+                        owarn << "Font was changed!" << oendl;
                         m_curFontSize = m_config.fontSize();
@@ -285,3 +285,3 @@ void AddressbookWindow::slotSetFont( int size )
 {
-        Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
+        owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl;
 
@@ -327,6 +327,6 @@ void AddressbookWindow::exportvCard()
 {
-        Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl;
+        owarn << "void AddressbookWindow::exportvCard()" << oendl;
         QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this );
         if( !filename.isEmpty() &&  ( filename[filename.length()-1] != '/' ) ){
-                Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
+                owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl;
                 Opie::OPimContact curCont = m_abView->currentEntry();
@@ -352,3 +352,3 @@ void AddressbookWindow::setDocument( const QString &filename )
 {
-        Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
+        owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl;
 
@@ -364,6 +364,6 @@ void AddressbookWindow::setDocument( const QString &filename )
                 case 0:
-                        Opie::Core::owarn << "YES clicked" << oendl;
+                        owarn << "YES clicked" << oendl;
                         break;
                 case 1:
-                        Opie::Core::owarn << "NO clicked" << oendl;
+                        owarn << "NO clicked" << oendl;
                         return;
@@ -377,3 +377,3 @@ void AddressbookWindow::setDocument( const QString &filename )
         Opie::OPimContactAccess::List allList = access->allRecords();
-        Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl;
+        owarn << "Found number of contacts in File: " << allList.count() << oendl;
 
@@ -388,3 +388,3 @@ void AddressbookWindow::setDocument( const QString &filename )
         for ( it = allList.begin(); it != allList.end(); ++it ){
-                Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl;
+                owarn << "Adding Contact from: " << (*it).fullName() << oendl;
                 if ( doAsk ){
@@ -397,3 +397,3 @@ void AddressbookWindow::setDocument( const QString &filename )
                         case 0:
-                                Opie::Core::owarn << "YES clicked" << oendl;
+                                owarn << "YES clicked" << oendl;
                                 m_abView->addEntry( *it );
@@ -401,6 +401,6 @@ void AddressbookWindow::setDocument( const QString &filename )
                         case 1:
-                                Opie::Core::owarn << "NO clicked" << oendl;
+                                owarn << "NO clicked" << oendl;
                                 break;
                         case 2:
-                                Opie::Core::owarn << "YesAll clicked" << oendl;
+                                owarn << "YesAll clicked" << oendl;
                                 doAsk = false;
@@ -540,5 +540,5 @@ void AddressbookWindow::writeMail()
         if ( m_config.useQtMail() ){
-                Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
+                owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl;
                 if ( QFile::exists( basepath + "/bin/qtmail" ) ){
-                        Opie::Core::owarn << "QCop" << oendl;
+                        owarn << "QCop" << oendl;
                         QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
@@ -550,5 +550,5 @@ void AddressbookWindow::writeMail()
         if ( m_config.useOpieMail() ){
-                Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
+                owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl;
                 if ( QFile::exists( basepath + "/bin/opiemail" ) ){
-                        Opie::Core::owarn << "QCop" << oendl;
+                        owarn << "QCop" << oendl;
                         QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)");
@@ -594,3 +594,3 @@ void AddressbookWindow::slotBeam()
 
-        Opie::Core::owarn << "Beaming: " << beamFilename << oendl;
+        owarn << "Beaming: " << beamFilename << oendl;
 
@@ -641,3 +641,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
         bool needShow = FALSE;
-                Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl;
+                owarn << "Receiving QCop-Call with message " << msg << oendl;
 
@@ -657,3 +657,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
                 parseName( name, &fn, &mn, &ln );
-                        //Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl;
+                        //odebug << " " << fn << " - " << mn " - " << ln << oendl;
                 cnt.setFirstName( fn );
@@ -684,3 +684,3 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data)
 
-                Opie::Core::owarn << "Showing uid: " << uid << oendl;
+                owarn << "Showing uid: " << uid << oendl;
 
@@ -764,3 +764,3 @@ void AddressbookWindow::editPersonal()
         if ( ! actionPersonal->isOn() ){
-                Opie::Core::owarn << "*** ++++" << oendl;
+                owarn << "*** ++++" << oendl;
                 actionPersonal->setOn( true );
@@ -783,6 +783,6 @@ void AddressbookWindow::slotPersonalView()
 {
-        Opie::Core::owarn << "slotPersonalView()" << oendl;
+        owarn << "slotPersonalView()" << oendl;
         if (!actionPersonal->isOn()) {
                 // we just turned it off
-                Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl;
+                owarn << "slotPersonalView()-> OFF" << oendl;
                 setCaption( tr("Contacts") );
@@ -799,3 +799,3 @@ void AddressbookWindow::slotPersonalView()
 
-        Opie::Core::owarn << "slotPersonalView()-> ON" << oendl;
+        owarn << "slotPersonalView()-> ON" << oendl;
         // XXX need to disable some QActions.
@@ -889,3 +889,3 @@ void AddressbookWindow::slotNotFound()
 {
-        Opie::Core::owarn << "Got not found signal!" << oendl;
+        owarn << "Got not found signal!" << oendl;
         QMessageBox::information( this, tr( "Not Found" ),
@@ -897,3 +897,3 @@ void AddressbookWindow::slotWrapAround()
 {
-        Opie::Core::owarn << "Got wrap signal!" << oendl;
+        owarn << "Got wrap signal!" << oendl;
         // if ( doNotifyWrapAround )
@@ -906,3 +906,3 @@ void AddressbookWindow::slotSetCategory( int c )
 {
-        Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
+        owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from "
                                         << catMenu->count() << oendl;
@@ -942,3 +942,3 @@ void AddressbookWindow::slotSetCategory( int c )
                                 cat = "Unfiled";
-                                Opie::Core::owarn << "Unfiled selected!" << oendl;
+                                owarn << "Unfiled selected!" << oendl;
                         }else{
@@ -965,3 +965,3 @@ void AddressbookWindow::slotViewSwitched( int view )
 {
-        Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
+        owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl;
         int menu = 0;