1 files changed, 37 insertions, 37 deletions

diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index e496387..72c8bd3 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -78,7 +78,7 @@ ContactEditor::~ContactEditor() {
 }
 
 void ContactEditor::init() {
-        Opie::Core::owarn << "init() START" << oendl;
+        owarn << "init() START" << oendl;
 
         uint i = 0;
 
@@ -687,18 +687,18 @@ void ContactEditor::init() {
 
         setPersonalView ( m_personalView );
 
-        Opie::Core::owarn << "init() END" << oendl;
+        owarn << "init() END" << oendl;
 }
 
 void ContactEditor::defaultEmailChanged(int i){
-        Opie::Core::odebug << "defaultEmailChanged" << oendl;
+        odebug << "defaultEmailChanged" << oendl;
 
         // was sollte das ? (se)
         // int index = cmbChooserField1->currentItem();
         // slChooserValues[index] = cmbDefaultEmail->text(i);
 
         defaultEmail = cmbDefaultEmail->text(i);
-        Opie::Core::odebug << "Changed to: " << defaultEmail << oendl;
+        odebug << "Changed to: " << defaultEmail << oendl;
 
 }
 
@@ -717,12 +717,12 @@ void ContactEditor::populateDefaultEmailCmb(){
         // Select default email in combo..
         bool found = false;
         for ( int i = 0; i < cmbDefaultEmail->count(); i++){
-                Opie::Core::odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
+                odebug << " populateDefaultEmailCmb text >" << cmbDefaultEmail->text( i )
                                                         << "< defaultEmail >" << defaultEmail << "<" << oendl;
 
                 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
                         cmbDefaultEmail->setCurrentItem( i );
-                        Opie::Core::odebug << "set" << oendl;
+                        odebug << "set" << oendl;
                         found = true;
                 }
         }
@@ -738,7 +738,7 @@ void ContactEditor::populateDefaultEmailCmb(){
 // be handled by something else..
 bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) {
         QString type = slChooserNames[index];
-        Opie::Core::owarn << "ContactEditor::cmbChooserChange -> Type: " << type
+        owarn << "ContactEditor::cmbChooserChange -> Type: " << type
                                                 << ", WidgetPos: " << widgetPos << oendl;
 
         if ( !initializing )
@@ -746,7 +746,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 
         // Create and connect combobox for selecting the default email
         if ( type == "Default Email"){
-                Opie::Core::owarn << "Choosing default-email (defaultEmailChooserPosition= "
+                owarn << "Choosing default-email (defaultEmailChooserPosition= "
                                                         << defaultEmailChooserPosition << ") " << oendl;
 
                 // More than one default-email chooser is not allowed !
@@ -780,7 +780,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 
         } else {
                 // Something else was selected: Hide combo..
-                Opie::Core::owarn << " Hiding default-email combo" << oendl;
+                owarn << " Hiding default-email combo" << oendl;
                 if ( defaultEmailChooserPosition == widgetPos ){
                         defaultEmailChooserPosition = -1;
                 }
@@ -805,7 +805,7 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w
 // Currently accessed when we select default-email more than once !
 void ContactEditor::chooserError( int index )
 {
-        Opie::Core::owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
+        owarn << "ContactEditor::chooserError( " << index << " )" << oendl;
         QMessageBox::warning( this, "Chooser Error",
                               "Multiple selection of this\n"
                               "Item is not allowed !\n\n"
@@ -841,18 +841,18 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
                                    QLineEdit* , int widgetPos ) {
 
         QString type = slChooserNames[index]; // :SX
-        Opie::Core::odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
+        odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>"
                                                 << textChanged << "< index=" << index << ", widgetPos=" << widgetPos
                                                 << " )" << oendl;
 
         if ( type == "Default Email"){
-                Opie::Core::owarn << "??? Wozu??: " << textChanged << oendl;
+                owarn << "??? Wozu??: " << textChanged << oendl;
                 defaultEmail = textChanged;
 
                 populateDefaultEmailCmb();
 
         }else if (type == "Emails"){
-                Opie::Core::odebug << "emails" << oendl;
+                odebug << "emails" << oendl;
 
                 QString de;
                 emails = QStringList::split (",", textChanged );
@@ -865,23 +865,23 @@ void ContactEditor::chooserChange( const QString &textChanged, int index,
 }
 
 void ContactEditor::slotChooser1Change( const QString &textChanged ) {
-        Opie::Core::owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
 }
 
 void ContactEditor::slotChooser2Change( const QString &textChanged ) {
-        Opie::Core::owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
 
 }
 
 void ContactEditor::slotChooser3Change( const QString &textChanged ) {
-        Opie::Core::owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
 }
 
 void ContactEditor::slotChooser4Change( const QString &textChanged ) {
-        Opie::Core::owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl;
         chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
 }
 
@@ -951,7 +951,7 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) {
 
 
 void ContactEditor::slotCmbChooser1Change( int index ) {
-        Opie::Core::owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
+        owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl;
         if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){
 
                 txtChooserField1->setText( slChooserValues[index] );
@@ -962,7 +962,7 @@ void ContactEditor::slotCmbChooser1Change( int index ) {
 }
 
 void ContactEditor::slotCmbChooser2Change( int index ) {
-        Opie::Core::owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
+        owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl;
 
         if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){
 
@@ -973,7 +973,7 @@ void ContactEditor::slotCmbChooser2Change( int index ) {
 }
 
 void ContactEditor::slotCmbChooser3Change( int index ) {
-        Opie::Core::owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
+        owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl;
 
         if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){
 
@@ -984,7 +984,7 @@ void ContactEditor::slotCmbChooser3Change( int index ) {
 }
 
 void ContactEditor::slotCmbChooser4Change( int index ) {
-        Opie::Core::owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
+        owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl;
 
         if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){
 
@@ -1029,7 +1029,7 @@ void ContactEditor::slotAddressTypeChange( int index ) {
 
 void ContactEditor::slotFullNameChange( const QString &textChanged ) {
 
-        Opie::Core::owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
+        owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl;
 
         int index = cmbFileAs->currentItem();
 
@@ -1053,7 +1053,7 @@ void ContactEditor::slotSuffixChange( const QString& ) {
 }
 
 void ContactEditor::slotOrganizationChange( const QString &textChanged ){
-        Opie::Core::owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl;
+        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..
@@ -1135,11 +1135,11 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
         int commapos;
         bool haveLastName = false;
 
-        Opie::Core::owarn << "Fullname: " << simplifiedName << oendl;
+        owarn << "Fullname: " << simplifiedName << oendl;
 
         commapos = simplifiedName.find( ',', 0, TRUE);
         if ( commapos >= 0 ) {
-                Opie::Core::owarn << " Commapos: " << commapos << oendl;
+                owarn << " Commapos: " << commapos << oendl;
 
                 // A comma (",") separates the lastname from one or
                 // many first names. Thus, remove the lastname from the
@@ -1148,7 +1148,7 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
                 strLastName = simplifiedName.left( commapos );
                 simplifiedName= simplifiedName.mid( commapos + 1 );
                 haveLastName = true;
-                Opie::Core::owarn << "Fullname without ',': " << simplifiedName << oendl;
+                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"
@@ -1182,10 +1182,10 @@ QString ContactEditor::parseName( const QString fullName, int type ) {
         if ( strFirstName == strLastName )
                 strFirstName = "";
 
-        Opie::Core::owarn << "strFirstName: " << strFirstName << oendl;
-        Opie::Core::owarn << "strMiddletName: " << strMiddleName << oendl;
-        Opie::Core::owarn << "strLastName: " << strLastName << oendl;
-        Opie::Core::owarn << "strTitle: " << strTitle << oendl;
+        owarn << "strFirstName: " << strFirstName << oendl;
+        owarn << "strMiddletName: " << strMiddleName << oendl;
+        owarn << "strLastName: " << strLastName << oendl;
+        owarn << "strTitle: " << strTitle << oendl;
 
         switch (type) {
         case NAME_FL:
@@ -1268,7 +1268,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
         emails = QStringList(ent.emailList());
         defaultEmail = ent.defaultEmail();
         if (defaultEmail.isEmpty()) defaultEmail = emails[0];
-        Opie::Core::odebug << "default email=" << defaultEmail << oendl;
+        odebug << "default email=" << defaultEmail << oendl;
 
         txtFirstName->setText( ent.firstName() );
         txtMiddleName->setText( ent.middleName() );
@@ -1328,7 +1328,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
         QListIterator<QLineEdit> itLE( listValue );
         for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) {
 
-                Opie::Core::owarn << " Filling dynamic Field: " << (*it) << oendl;
+                owarn << " Filling dynamic Field: " << (*it) << oendl;
 
                 if ( *it ==  "Department"  )
                         (*itLE)->setText( ent.department() );
@@ -1352,7 +1352,7 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) {
                         (*itLE)->setText( ent.spouse() );
 
                 if ( *it == "Nickname" ){
-                        Opie::Core::owarn << "**** Nichname: " << ent.nickname() << oendl;
+                        owarn << "**** Nichname: " << ent.nickname() << oendl;
                         (*itLE)->setText( ent.nickname() );
                 }
 
@@ -1585,8 +1585,8 @@ void ContactEditor::saveEntry() {
                         QString defaultmail;
                         parseEmailFrom( emails.join(","), defaultmail, allemail );
                         if ( defaultEmail.isEmpty() ){
-                                Opie::Core::owarn << "Default email was not set by user!" << oendl;
-                                Opie::Core::owarn << "Using first email in list: " << defaultmail << oendl;
+                                owarn << "Default email was not set by user!" << oendl;
+                                owarn << "Using first email in list: " << defaultmail << oendl;
                                 ent.setDefaultEmail( defaultmail );
                         }
                         ent.setEmails( allemail );
@@ -1738,14 +1738,14 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day)
 
 void ContactEditor::slotRemoveBirthday()
 {
-        Opie::Core::owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
+        owarn << "void ContactEditor::slotRemoveBirthday()" << oendl;
         ent.setBirthday( QDate() );
         updateDatePicker();
 }
 
 void ContactEditor::slotRemoveAnniversary()
 {
-        Opie::Core::owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
+        owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl;
         ent.setAnniversary( QDate() );
         updateDatePicker();
 }