1 files changed, 28 insertions, 28 deletions

diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp
index 52e5f59..7a5b6d4 100644
--- a/core/pim/addressbook/abview.cpp
+++ b/core/pim/addressbook/abview.cpp
@@ -53,5 +53,5 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ):
         m_orderedFields( ordered )
 {
-        Opie::Core::owarn << "AbView::c'tor" << oendl;
+        owarn << "AbView::c'tor" << oendl;
         // Load default database and handle syncing myself.. !
         m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false );
@@ -101,5 +101,5 @@ AbView::~AbView()
 void AbView::setView( Views view )
 {
-        Opie::Core::owarn << "AbView::setView( Views view )" << oendl;
+        owarn << "AbView::setView( Views view )" << oendl;
          m_curr_View = view;
          load();
@@ -108,5 +108,5 @@ void AbView::setView( Views view )
 void AbView::addEntry( const Opie::OPimContact &newContact )
 {
-        Opie::Core::owarn << "AbView::AddContact" << oendl;
+        owarn << "AbView::AddContact" << oendl;
         m_contactdb->add ( newContact );
         load();
@@ -115,5 +115,5 @@ void AbView::addEntry( const Opie::OPimContact &newContact )
 void AbView::removeEntry( const int UID )
 {
-        Opie::Core::owarn << "AbView;:RemoveContact" << oendl;
+        owarn << "AbView;:RemoveContact" << oendl;
         m_contactdb->remove( UID );
         load();
@@ -122,5 +122,5 @@ void AbView::removeEntry( const int UID )
 void AbView::replaceEntry( const Opie::OPimContact &contact )
 {
-        Opie::Core::owarn << "AbView::ReplaceContact" << oendl;
+        owarn << "AbView::ReplaceContact" << oendl;
         m_contactdb->replace( contact );
         load();
@@ -146,5 +146,5 @@ Opie::OPimContact AbView::currentEntry()
 bool AbView::save()
 {
-                //Opie::Core::owarn << "AbView::Save data" << oendl;
+                //owarn << "AbView::Save data" << oendl;
 
         return m_contactdb->save();
@@ -153,5 +153,5 @@ bool AbView::save()
 void AbView::load()
 {
-        Opie::Core::owarn << "AbView::Load data" << oendl;
+        owarn << "AbView::Load data" << oendl;
 
         // Letter Search is stopped at this place
@@ -167,5 +167,5 @@ void AbView::load()
         }
 
-        Opie::Core::owarn << "Number of contacts: " << m_list.count() << oendl;
+        owarn << "Number of contacts: " << m_list.count() << oendl;
 
         updateView( true );
@@ -175,5 +175,5 @@ void AbView::load()
 void AbView::reload()
 {
-        Opie::Core::owarn << "AbView::::reload()" << oendl;
+        owarn << "AbView::::reload()" << oendl;
 
         m_contactdb->reload();
@@ -188,5 +188,5 @@ void AbView::clear()
 void AbView::setShowByCategory( const QString& cat )
 {
-        Opie::Core::owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
+        owarn << "AbView::setShowCategory( const QString& cat )" << oendl;
 
         int intCat = 0;
@@ -200,5 +200,5 @@ void AbView::setShowByCategory( const QString& cat )
         // Just do anything if we really change the category
         if ( intCat != m_curr_category ){
-                        //      Opie::Core::owarn << "Categories: Selected " << cat << ".. Number: "
+                        //      owarn << "Categories: Selected " << cat << ".. Number: "
                         //                                      << m_curr_category << oendl;
 
@@ -213,8 +213,8 @@ void AbView::setShowByCategory( const QString& cat )
 void AbView::setShowToView( Views view )
 {
-        Opie::Core::owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
+        owarn << "void AbView::setShowToView( View " << view << " )" << oendl;
 
         if ( m_curr_View != view ){
-                Opie::Core::owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl;
+                owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl;
                 m_prev_View = m_curr_View;
                 m_curr_View = view;
@@ -227,5 +227,5 @@ void AbView::setShowToView( Views view )
 void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
 {
-        Opie::Core::owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
+        owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl;
 
         assert( mode < AbConfig::LASTELEMENT );
@@ -250,5 +250,5 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode )
                         break;
                 default:
-                        Opie::Core::owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl
+                        owarn << "Unknown Searchmode for AbView::setShowByLetter ! -> " << mode << oendl
                                                         << "I will ignore it.." << oendl;
                         return;
@@ -280,5 +280,5 @@ QString AbView::showCategory() const
 void AbView::showPersonal( bool personal )
 {
-        Opie::Core::owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
+        owarn << "void AbView::showPersonal( " << personal << " )" << oendl;
 
         if ( personal ){
@@ -336,5 +336,5 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
                          bool , QString cat )
 {
-                //Opie::Core::owarn << "void AbView::slotDoFind" << oendl;
+                //owarn << "void AbView::slotDoFind" << oendl;
 
         // We reloading the data: Deselect Letterpicker
@@ -350,5 +350,5 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
         }
 
-                //Opie::Core::owarn << "Find in Category " << category << oendl;
+                //owarn << "Find in Category " << category << oendl;
 
         QRegExp r( str );
@@ -359,5 +359,5 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp,
         m_list = m_contactdb->matchRegexp( r );
 
-                //Opie::Core::owarn << "Found: " << m_list.count() << oendl;
+                //owarn << "Found: " << m_list.count() << oendl;
         if ( m_list.count() == 0 ){
                 emit signalNotFound();
@@ -383,14 +383,14 @@ void AbView::offSearch()
 
 void AbView::slotSwitch(){
-                //Opie::Core::owarn << "AbView::slotSwitch()" << oendl;
+                //owarn << "AbView::slotSwitch()" << oendl;
 
         m_prev_View = m_curr_View;
         switch ( (int) m_curr_View ){
         case TableView:
-                Opie::Core::owarn << "Switching to CardView" << oendl;
+                owarn << "Switching to CardView" << oendl;
                 m_curr_View = CardView;
                 break;
         case CardView:
-                Opie::Core::owarn << "Switching to TableView" << oendl;
+                owarn << "Switching to TableView" << oendl;
                 m_curr_View = TableView;
                 break;
@@ -411,5 +411,5 @@ void AbView::clearForCategory()
                 for ( it = allList.begin(); it != allList.end(); ++it ){
                         if ( !contactCompare( *it, m_curr_category ) ){
-                                //Opie::Core::owarn << "Removing " << (*it).uid() << oendl;
+                                //owarn << "Removing " << (*it).uid() << oendl;
                                 m_list.remove( (*it).uid() );
                         }
@@ -421,5 +421,5 @@ void AbView::clearForCategory()
 bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
 {
-                //Opie::Core::owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
+                //owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, "
                 //                              << category << " )" << oendl;
 
@@ -428,5 +428,5 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
         cats = cnt.categories();
 
-                //Opie::Core::owarn << "Number of categories: " << cats.count() << oendl;
+                //owarn << "Number of categories: " << cats.count() << oendl;
 
         returnMe = false;
@@ -437,5 +437,5 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
                 int i;
                 for ( i = 0; i < int(cats.count()); i++ ) {
-                        //Opie::Core::owarn << "Comparing " << cats[i] << " with " << category << oendl;
+                        //owarn << "Comparing " << cats[i] << " with " << category << oendl;
                         if ( cats[i] == category ) {
                                 returnMe = true;
@@ -444,5 +444,5 @@ bool AbView::contactCompare( const Opie::OPimContact &cnt, int category )
                 }
         }
-                //Opie::Core::owarn << "Return: " << returnMe << oendl;
+                //owarn << "Return: " << returnMe << oendl;
         return returnMe;
 }
@@ -457,5 +457,5 @@ void AbView::updateListinViews()
 void  AbView::updateView( bool newdata )
 {
-                //Opie::Core::owarn << "AbView::updateView()" << oendl;
+                //owarn << "AbView::updateView()" << oendl;
 
         if ( m_viewStack -> visibleWidget() ){