-rw-r--r-- | core/pim/addressbook/ablabel.cpp | 14 | ||||
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 46 | ||||
-rw-r--r-- | core/pim/addressbook/abview.cpp | 52 | ||||
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 58 | ||||
-rw-r--r-- | core/pim/addressbook/configdlg.cpp | 10 | ||||
-rw-r--r-- | core/pim/addressbook/contacteditor.cpp | 58 | ||||
-rw-r--r-- | core/pim/addressbook/picker.cpp | 2 |
7 files changed, 120 insertions, 120 deletions
diff --git a/core/pim/addressbook/ablabel.cpp b/core/pim/addressbook/ablabel.cpp index b81a3b9..6b8e4dd 100644 --- a/core/pim/addressbook/ablabel.cpp +++ b/core/pim/addressbook/ablabel.cpp @@ -92,21 +92,21 @@ void AbLabel::keyPressEvent( QKeyEvent *e ) { // Commonly handled keys if ( !m_empty ){ switch( e->key() ) { case Qt::Key_Left: - owarn << "Left.." << oendl; + odebug << "Left.." << oendl; case Qt::Key_Right: - owarn << "Right.." << oendl; + odebug << "Right.." << oendl; case Qt::Key_F33: - owarn << "OK.." << oendl; + odebug << "OK.." << oendl; emit signalOkPressed(); break; case Qt::Key_Up: - owarn << "Up.." << oendl; + odebug << "Up.." << oendl; if ( ( visibleHeight() < contentsHeight() ) && ( verticalScrollBar()->value() > verticalScrollBar()->minValue() ) ) scrollBy( 0, -(visibleHeight()-20) ); else { --m_itCurContact; if ( *m_itCurContact != Opie::OPimContact() ) @@ -114,15 +114,15 @@ void AbLabel::keyPressEvent( QKeyEvent *e ) else m_itCurContact = m_viewList.end(); } break; case Qt::Key_Down: - owarn << "Down.." << oendl; -// owarn << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl; -// owarn << "Value: " << verticalScrollBar()->value() + odebug << "Down.." << oendl; +// odebug << "Visible: " << visibleHeight() << ", content: " << contentHeight() << oendl; +// odebug << "Value: " << verticalScrollBar()->value() // << ", barMaxValue: " << verticalScrollBar()->maxValue() << oendl; if ( ( visibleHeight() < contentsHeight() ) && ( verticalScrollBar()->value() < verticalScrollBar()->maxValue() ) ) scrollBy( 0, visibleHeight()-20 ); else { ++m_itCurContact; diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 3fb2214..30d749c 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp @@ -118,21 +118,21 @@ AbTable::AbTable( const QValueList<int> order, QWidget *parent, const char *name asc( TRUE ), intFields( order ), enablePainting( true ), columnVisible( true ), countNested( 0 ) { - // owarn << "C'tor start" << oendl; + // odebug << "C'tor start" << oendl; setSelectionMode( NoSelection ); init(); setSorting( TRUE ); connect( this, SIGNAL(clicked(int,int,int,const QPoint&)), this, SLOT(itemClicked(int,int)) ); // contactList.clear(); - // owarn << "C'tor end" << oendl; + // odebug << "C'tor end" << oendl; } AbTable::~AbTable() { } @@ -148,13 +148,13 @@ void AbTable::init() verticalHeader()->hide(); columnVisible = true; } void AbTable::setContacts( const Opie::OPimContactAccess::List& viewList ) { - owarn << "AbTable::setContacts()" << oendl; + odebug << "AbTable::setContacts()" << oendl; clear(); m_viewList = viewList; setSorting( false ); setPaintingEnabled( FALSE ); @@ -180,28 +180,28 @@ void AbTable::setOrderedList( const QValueList<int> ordered ) intFields = ordered; } bool AbTable::selectContact( int UID ) { - owarn << "AbTable::selectContact( " << UID << " )" << oendl; + odebug << "AbTable::selectContact( " << UID << " )" << oendl; int rows = numRows(); Opie::OPimContact* foundContact = 0l; bool found = false; setPaintingEnabled( FALSE ); - owarn << "Search start" << oendl; + odebug << "Search start" << oendl; for ( int r = 0; r < rows; ++r ) { if ( m_viewList.uidAt( r ) == UID ){ ensureCellVisible( r, 0 ); setCurrentCell( r, 0 ); found = true; break; } } - owarn << "Search end" << oendl; + odebug << "Search end" << oendl; if ( !found ){ ensureCellVisible( 0,0 ); setCurrentCell( 0, 0 ); } @@ -210,13 +210,13 @@ bool AbTable::selectContact( int UID ) return true; } #if 0 void AbTable::insertIntoTable( const Opie::OPimContact& cnt, int row ) { - owarn << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, " + odebug << "void AbTable::insertIntoTable( const Opie::OPimContact& cnt, " << row << " )" << oendl; QString strName; ContactItem contactItem; strName = findContactName( cnt ); contactItem = findContactContact( cnt, row ); @@ -280,13 +280,13 @@ int AbTable::currentEntry_UID() { return ( currentEntry().uid() ); } void AbTable::clear() { - owarn << "void AbTable::clear()" << oendl; + odebug << "void AbTable::clear()" << oendl; // contactList.clear(); setPaintingEnabled( FALSE ); for ( int r = 0; r < numRows(); ++r ) { for ( int c = 0; c < numCols(); ++c ) { if ( cellWidget( r, c ) ) @@ -331,36 +331,36 @@ void AbTable::keyPressEvent( QKeyEvent *e ) { char key = toupper( e->ascii() ); if ( key >= 'A' && key <= 'Z' ) moveTo( key ); - // owarn << "Received key .." << oendl; + // odebug << "Received key .." << oendl; switch( e->key() ) { case Qt::Key_Space: case Qt::Key_Return: case Qt::Key_Enter: emit signalSwitch(); break; // case Qt::Key_Up: -// owarn << "a" << oendl; +// odebug << "a" << oendl; // emit signalKeyUp(); // break; // case Qt::Key_Down: -// owarn << "b" << oendl; +// odebug << "b" << oendl; // emit signalKeyDown(); // break; default: QTable::keyPressEvent( e ); } } void AbTable::moveTo( char c ) { - owarn << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; + odebug << "void AbTable::moveTo( char c ) NOT IMPLEMENTED !!" << oendl; #if 0 int rows = numRows(); QString value; AbTableItem *abi; int r; @@ -420,13 +420,13 @@ void AbTable::resizeRows() { */ } void AbTable::realignTable() { - // owarn << "void AbTable::realignTable()" << oendl; + // odebug << "void AbTable::realignTable()" << oendl; setPaintingEnabled( FALSE ); resizeRows(); fitColumns(); @@ -470,37 +470,37 @@ void QTable::paintEmptyArea( QPainter *p, int cx, int cy, int cw, int ch ) // } void AbTable::fitColumns() { - owarn << "void AbTable::fitColumns()" << oendl; + odebug << "void AbTable::fitColumns()" << oendl; int contentsWidth = visibleWidth() / 2; // Fix to better value // contentsWidth = 130; setPaintingEnabled( FALSE ); if ( columnVisible == false ){ showColumn(0); columnVisible = true; } - // owarn << "Width: " << contentsWidth << oendl; + // odebug << "Width: " << contentsWidth << oendl; setColumnWidth( 0, contentsWidth ); adjustColumn(1); if ( columnWidth(1) < contentsWidth ) setColumnWidth( 1, contentsWidth ); setPaintingEnabled( TRUE ); } void AbTable::show() { - // owarn << "void AbTable::show()" << oendl; + // odebug << "void AbTable::show()" << oendl; realignTable(); QTable::show(); } #if 0 void AbTable::setChoiceNames( const QStringList& list) @@ -518,17 +518,17 @@ void AbTable::setChoiceNames( const QStringList& list) fitColumns(); } #endif void AbTable::itemClicked(int,int col) { - // owarn << "AbTable::itemClicked(int, col: " << col << ")" << oendl; + // odebug << "AbTable::itemClicked(int, col: " << col << ")" << oendl; if ( col == 2 ) { return; } else { - // owarn << "Emitting signalSwitch()" << oendl; + // odebug << "Emitting signalSwitch()" << oendl; emit signalSwitch(); } } #if 0 QStringList AbTable::choiceNames() const @@ -559,13 +559,13 @@ QStringList AbTable::choiceSelection(int /*index*/) const return r; } void AbTable::updateVisible() { - // owarn << "void AbTable::updateVisible()" << oendl; + // odebug << "void AbTable::updateVisible()" << oendl; int visible, totalRows, row, selectedRow = 0; @@ -595,13 +595,13 @@ void AbTable::updateVisible() setPaintingEnabled( TRUE ); } void AbTable::setPaintingEnabled( bool e ) { - // owarn << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: " + // odebug << "IN void AbTable::setPaintingEnabled( " << e << " )->Nested: " // << countNested << oendl; if ( e ) { if ( countNested > 0 ) --countNested; if ( ! countNested ){ @@ -612,29 +612,29 @@ void AbTable::setPaintingEnabled( bool e ) } } else { ++countNested; enablePainting = false; setUpdatesEnabled( false ); } - // owarn << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: " + // odebug << "OUT void AbTable::setPaintingEnabled( " << e << " )->Nested: " // << countNested << oendl; } void AbTable::viewportPaintEvent( QPaintEvent* e ) { - // owarn << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> " + // odebug << "void AbTable::viewportPaintEvent( QPaintEvent* e ) -> " // << enablePainting << oendl; if ( enablePainting ) QTable::viewportPaintEvent( e ); } void AbTable::paintCell(QPainter* p, int row, int col, const QRect& cr, bool ) { const QColorGroup &cg = colorGroup(); p->save(); - // owarn << "Paint row: " << row << oendl; + // odebug << "Paint row: " << row << oendl; Opie::OPimContact act_contact = m_viewList[row]; // Paint alternating background bars if ( (row % 2 ) == 0 ) { p->fillRect( 0, 0, cr.width(), cr.height(), cg.brush( QColorGroup::Base ) ); diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp index 7a5b6d4..7abb45c 100644 --- a/core/pim/addressbook/abview.cpp +++ b/core/pim/addressbook/abview.cpp @@ -49,13 +49,13 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): m_contactdb ( 0l ), m_storedDB ( 0l ), m_viewStack( 0l ), m_abTable( 0l ), m_orderedFields( ordered ) { - owarn << "AbView::c'tor" << oendl; + odebug << "AbView::c'tor" << oendl; // Load default database and handle syncing myself.. ! m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false ); m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available mCat.load( categoryFileName() ); // Create Layout and put WidgetStack into it. @@ -97,34 +97,34 @@ AbView::~AbView() } } void AbView::setView( Views view ) { - owarn << "AbView::setView( Views view )" << oendl; + odebug << "AbView::setView( Views view )" << oendl; m_curr_View = view; load(); } void AbView::addEntry( const Opie::OPimContact &newContact ) { - owarn << "AbView::AddContact" << oendl; + odebug << "AbView::AddContact" << oendl; m_contactdb->add ( newContact ); load(); } void AbView::removeEntry( const int UID ) { - owarn << "AbView;:RemoveContact" << oendl; + odebug << "AbView;:RemoveContact" << oendl; m_contactdb->remove( UID ); load(); } void AbView::replaceEntry( const Opie::OPimContact &contact ) { - owarn << "AbView::ReplaceContact" << oendl; + odebug << "AbView::ReplaceContact" << oendl; m_contactdb->replace( contact ); load(); } Opie::OPimContact AbView::currentEntry() @@ -142,20 +142,20 @@ Opie::OPimContact AbView::currentEntry() m_curr_Contact = currentContact.uid(); return currentContact; } bool AbView::save() { - // owarn << "AbView::Save data" << oendl; + // odebug << "AbView::Save data" << oendl; return m_contactdb->save(); } void AbView::load() { - owarn << "AbView::Load data" << oendl; + odebug << "AbView::Load data" << oendl; // Letter Search is stopped at this place emit signalClearLetterPicker(); if ( m_inPersonal ) // VCard Backend does not sort.. @@ -163,73 +163,73 @@ void AbView::load() else{ m_list = m_contactdb->sorted( true, 0, 0, 0 ); if ( m_curr_category != -1 ) clearForCategory(); } - owarn << "Number of contacts: " << m_list.count() << oendl; + odebug << "Number of contacts: " << m_list.count() << oendl; updateView( true ); } void AbView::reload() { - owarn << "AbView::::reload()" << oendl; + odebug << "AbView::::reload()" << oendl; m_contactdb->reload(); load(); } void AbView::clear() { // :SX } void AbView::setShowByCategory( const QString& cat ) { - owarn << "AbView::setShowCategory( const QString& cat )" << oendl; + odebug << "AbView::setShowCategory( const QString& cat )" << oendl; int intCat = 0; // All (cat == NULL) will be stored as -1 if ( cat.isNull() ) intCat = -1; else intCat = mCat.id("Contacts", cat ); // Just do anything if we really change the category if ( intCat != m_curr_category ){ - // owarn << "Categories: Selected " << cat << ".. Number: " + // odebug << "Categories: Selected " << cat << ".. Number: " // << m_curr_category << oendl; m_curr_category = intCat; emit signalClearLetterPicker(); load(); } } void AbView::setShowToView( Views view ) { - owarn << "void AbView::setShowToView( View " << view << " )" << oendl; + odebug << "void AbView::setShowToView( View " << view << " )" << oendl; if ( m_curr_View != view ){ - owarn << "Change the View (Category is: " << m_curr_category << ")" << oendl; + odebug << "Change the View (Category is: " << m_curr_category << ")" << oendl; m_prev_View = m_curr_View; m_curr_View = view; updateView(); } } void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) { - owarn << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl; + odebug << "void AbView::setShowByLetter( " << c << ", " << mode << " )" << oendl; assert( mode < AbConfig::LASTELEMENT ); Opie::OPimContact query; if ( c == 0 ){ load(); @@ -276,13 +276,13 @@ QString AbView::showCategory() const { return mCat.label( "Contacts", m_curr_category ); } void AbView::showPersonal( bool personal ) { - owarn << "void AbView::showPersonal( " << personal << " )" << oendl; + odebug << "void AbView::showPersonal( " << personal << " )" << oendl; if ( personal ){ if ( m_inPersonal ) return; @@ -346,22 +346,22 @@ void AbView::slotDoFind( const QString &str, bool caseSensitive, bool useRegExp, if ( cat.isEmpty() ) category = m_curr_category; else{ category = mCat.id("Contacts", cat ); } - // owarn << "Find in Category " << category << oendl; + // odebug << "Find in Category " << category << oendl; QRegExp r( str ); r.setCaseSensitive( caseSensitive ); r.setWildcard( !useRegExp ); // Get all matching entries out of the database m_list = m_contactdb->matchRegexp( r ); - // owarn << "Found: " << m_list.count() << oendl; + // odebug << "Found: " << m_list.count() << oendl; if ( m_list.count() == 0 ){ emit signalNotFound(); return; } // Now remove all contacts with wrong category (if any selected) @@ -379,22 +379,22 @@ void AbView::offSearch() m_inSearch = false; load(); } void AbView::slotSwitch(){ - // owarn << "AbView::slotSwitch()" << oendl; + // odebug << "AbView::slotSwitch()" << oendl; m_prev_View = m_curr_View; switch ( (int) m_curr_View ){ case TableView: - owarn << "Switching to CardView" << oendl; + odebug << "Switching to CardView" << oendl; m_curr_View = CardView; break; case CardView: - owarn << "Switching to TableView" << oendl; + odebug << "Switching to TableView" << oendl; m_curr_View = TableView; break; } updateView(); } @@ -407,59 +407,59 @@ void AbView::clearForCategory() // Now remove all contacts with wrong category if any category selected Opie::OPimContactAccess::List allList = m_list; if ( m_curr_category != -1 ){ for ( it = allList.begin(); it != allList.end(); ++it ){ if ( !contactCompare( *it, m_curr_category ) ){ - //owarn << "Removing " << (*it).uid() << oendl; + //odebug << "Removing " << (*it).uid() << oendl; m_list.remove( (*it).uid() ); } } } } bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) { - // owarn << "bool AbView::contactCompare( const Opie::OPimContact &cnt, " + // odebug << "bool AbView::contactCompare( const Opie::OPimContact &cnt, " // << category << " )" << oendl; bool returnMe; QArray<int> cats; cats = cnt.categories(); - // owarn << "Number of categories: " << cats.count() << oendl; + // odebug << "Number of categories: " << cats.count() << oendl; returnMe = false; if ( cats.count() == 0 && category == 0 ) // Contacts with no category will just shown on "All" and "Unfiled" returnMe = true; else { int i; for ( i = 0; i < int(cats.count()); i++ ) { - //owarn << "Comparing " << cats[i] << " with " << category << oendl; + //odebug << "Comparing " << cats[i] << " with " << category << oendl; if ( cats[i] == category ) { returnMe = true; break; } } } - // owarn << "Return: " << returnMe << oendl; + // odebug << "Return: " << returnMe << oendl; return returnMe; } // In Some rare cases we have to update all lists.. void AbView::updateListinViews() { m_abTable -> setContacts( m_list ); m_ablabel -> setContacts( m_list ); } void AbView::updateView( bool newdata ) { - // owarn << "AbView::updateView()" << oendl; + // odebug << "AbView::updateView()" << oendl; if ( m_viewStack -> visibleWidget() ){ m_viewStack -> visibleWidget() -> clearFocus(); } // If we switching the view, we have to store some information diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 35d0f41..835038a 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp @@ -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 ) ) { - owarn << "Config Dialog accepted!" << oendl; + odebug << "Config Dialog accepted!" << oendl; m_config = dlg -> getConfig(); if ( m_curFontSize != m_config.fontSize() ){ - owarn << "Font was changed!" << oendl; + odebug << "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 ) { - owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl; + odebug << "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() { - owarn << "void AddressbookWindow::exportvCard()" << oendl; + odebug << "void AddressbookWindow::exportvCard()" << oendl; QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){ - owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl; + odebug << " 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 ) { - owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl; + odebug << "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: - owarn << "YES clicked" << oendl; + odebug << "YES clicked" << oendl; break; case 1: - owarn << "NO clicked" << oendl; + odebug << "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(); - owarn << "Found number of contacts in File: " << allList.count() << oendl; + odebug << "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 ){ - owarn << "Adding Contact from: " << (*it).fullName() << oendl; + odebug << "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: - owarn << "YES clicked" << oendl; + odebug << "YES clicked" << oendl; m_abView->addEntry( *it ); break; case 1: - owarn << "NO clicked" << oendl; + odebug << "NO clicked" << oendl; break; case 2: - owarn << "YesAll clicked" << oendl; + odebug << "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() ){ - owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl; + odebug << "Accessing: " << (basepath + "/bin/qtmail") << oendl; if ( QFile::exists( basepath + "/bin/qtmail" ) ){ - owarn << "QCop" << oendl; + odebug << "QCop" << oendl; QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)"); e << name << email; return; } else m_config.setUseOpieMail( true ); } if ( m_config.useOpieMail() ){ - owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl; + odebug << "Accessing: " << (basepath + "/bin/opiemail") << oendl; if ( QFile::exists( basepath + "/bin/opiemail" ) ){ - owarn << "QCop" << oendl; + odebug << "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; } - owarn << "Beaming: " << beamFilename << oendl; + odebug << "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; - owarn << "Receiving QCop-Call with message " << msg << oendl; + odebug << "Receiving QCop-Call with message " << msg << oendl; if (msg == "editPersonal()") { editPersonal(); } else if (msg == "editPersonalAndClose()") { editPersonal(); @@ -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; - owarn << "Showing uid: " << uid << oendl; + odebug << "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() ){ - owarn << "*** ++++" << oendl; + odebug << "*** ++++" << oendl; actionPersonal->setOn( true ); slotPersonalView(); } if ( !abEditor ) { abEditor = new ContactEditor( entry, this, "editor" ); @@ -778,29 +778,29 @@ void AddressbookWindow::editPersonal() } void AddressbookWindow::slotPersonalView() { - owarn << "slotPersonalView()" << oendl; + odebug << "slotPersonalView()" << oendl; if (!actionPersonal->isOn()) { // we just turned it off - owarn << "slotPersonalView()-> OFF" << oendl; + odebug << "slotPersonalView()-> OFF" << oendl; setCaption( tr("Contacts") ); actionNew->setEnabled(TRUE); actionTrash->setEnabled(TRUE); actionFind->setEnabled(TRUE); actionMail->setEnabled(TRUE); // slotUpdateToolbar(); m_abView->showPersonal( false ); return; } - owarn << "slotPersonalView()-> ON" << oendl; + odebug << "slotPersonalView()-> ON" << oendl; // XXX need to disable some QActions. actionNew->setEnabled(FALSE); actionTrash->setEnabled(FALSE); actionFind->setEnabled(FALSE); actionMail->setEnabled(FALSE); @@ -884,30 +884,30 @@ void AddressbookWindow::slotSave() } #endif void AddressbookWindow::slotNotFound() { - owarn << "Got not found signal!" << oendl; + odebug << "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() { - owarn << "Got wrap signal!" << oendl; + odebug << "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 ) { - owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from " + odebug << "void AddressbookWindow::slotSetCategory( " << c << " ) from " << catMenu->count() << oendl; QString cat, book; AbView::Views view = AbView::TableView; if ( c <= 0 ) @@ -937,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"; - owarn << "Unfiled selected!" << oendl; + odebug << "Unfiled selected!" << oendl; }else{ cat = m_abView->categories()[i - 4]; } } } @@ -960,13 +960,13 @@ void AddressbookWindow::slotSetCategory( int c ) setCaption( tr( "Contacts" ) + " - " + book + " - " + tr( cat ) ); } void AddressbookWindow::slotViewSwitched( int view ) { - owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl; + odebug << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl; int menu = 0; // Switch to selected view switch ( view ){ case AbView::TableView: menu = 1; diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp index 22f7291..61e6c7e 100644 --- a/core/pim/addressbook/configdlg.cpp +++ b/core/pim/addressbook/configdlg.cpp @@ -40,13 +40,13 @@ ConfigDlg::ConfigDlg( QWidget *parent, const char *name): connect ( m_upButton, SIGNAL( clicked() ), this, SLOT( slotItemUp() ) ); connect ( m_downButton, SIGNAL( clicked() ), this, SLOT( slotItemDown() ) ); } void ConfigDlg::slotItemUp() { - owarn << "void ConfigDlg::slotItemUp()" << oendl; + odebug << "void ConfigDlg::slotItemUp()" << oendl; int i = fieldListBox->currentItem(); if ( i > 0 ) { QString item = fieldListBox->currentText(); fieldListBox->removeItem( i ); fieldListBox->insertItem( item, i-1 ); @@ -54,38 +54,38 @@ void ConfigDlg::slotItemUp() } } void ConfigDlg::slotItemDown() { - owarn << "void ConfigDlg::slotItemDown()" << oendl; + odebug << "void ConfigDlg::slotItemDown()" << oendl; int i = fieldListBox->currentItem(); if ( i < (int)fieldListBox->count() - 1 ) { QString item = fieldListBox->currentText(); fieldListBox->removeItem( i ); fieldListBox->insertItem( item, i+1 ); fieldListBox->setCurrentItem( i+1 ); } } void ConfigDlg::slotItemAdd() { - owarn << "void ConfigDlg::slotItemAdd()" << oendl; + odebug << "void ConfigDlg::slotItemAdd()" << oendl; int i = allFieldListBox->currentItem(); if ( i > 0 ) { QString item = allFieldListBox->currentText(); - owarn << "Adding " << item << oendl; + odebug << "Adding " << item << oendl; fieldListBox->insertItem( item ); } } void ConfigDlg::slotItemRemove() { - owarn << "void ConfigDlg::slotItemRemove()" << oendl; + odebug << "void ConfigDlg::slotItemRemove()" << oendl; int i = fieldListBox->currentItem(); if ( i > 0 ) { fieldListBox->removeItem( i ); } } diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp index 312c663..b078968 100644 --- a/core/pim/addressbook/contacteditor.cpp +++ b/core/pim/addressbook/contacteditor.cpp @@ -76,13 +76,13 @@ ContactEditor::ContactEditor( const Opie::OPimContact &entry, } ContactEditor::~ContactEditor() { } void ContactEditor::init() { - owarn << "init() START" << oendl; + odebug << "init() START" << oendl; uint i = 0; QStringList trlChooserNames; for (i = 0; i <= 6; i++) { @@ -685,13 +685,13 @@ void ContactEditor::init() { this, SLOT(slotAddressTypeChange(int)) ); new QPEDialogListener(this); setPersonalView ( m_personalView ); - owarn << "init() END" << oendl; + odebug << "init() END" << oendl; } void ContactEditor::defaultEmailChanged(int i){ odebug << "defaultEmailChanged" << oendl; // was sollte das ? (se) @@ -736,21 +736,21 @@ void ContactEditor::populateDefaultEmailCmb(){ // Called when any combobox was changed. // "true" returned if the change was chandled by this function, else it should // be handled by something else.. bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int widgetPos ) { QString type = slChooserNames[index]; - owarn << "ContactEditor::cmbChooserChange -> Type: " << type + odebug << "ContactEditor::cmbChooserChange -> Type: " << type << ", WidgetPos: " << widgetPos << oendl; if ( !initializing ) contactfields.setFieldOrder( widgetPos-1, index ); // Create and connect combobox for selecting the default email if ( type == "Default Email"){ - owarn << "Choosing default-email (defaultEmailChooserPosition= " + odebug << "Choosing default-email (defaultEmailChooserPosition= " << defaultEmailChooserPosition << ") " << oendl; // More than one default-email chooser is not allowed ! if ( ( defaultEmailChooserPosition != -1 ) && defaultEmailChooserPosition != widgetPos && !initializing){ chooserError( widgetPos ); @@ -778,13 +778,13 @@ bool ContactEditor::cmbChooserChange( int index, QWidgetStack* inputStack, int w // Set current default email populateDefaultEmailCmb(); } else { // Something else was selected: Hide combo.. - owarn << " Hiding default-email combo" << oendl; + odebug << " Hiding default-email combo" << oendl; if ( defaultEmailChooserPosition == widgetPos ){ defaultEmailChooserPosition = -1; } QComboBox* cmbo = ( QComboBox* ) inputStack -> widget( Combo ); if ( cmbo ){ inputStack->raiseWidget( TextField ); @@ -844,13 +844,13 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, QString type = slChooserNames[index]; // :SX odebug << "ContactEditor::chooserChange( type=>" << type << "<, textChanged=>" << textChanged << "< index=" << index << ", widgetPos=" << widgetPos << " )" << oendl; if ( type == "Default Email"){ - owarn << "??? Wozu??: " << textChanged << oendl; + odebug << "??? Wozu??: " << textChanged << oendl; defaultEmail = textChanged; populateDefaultEmailCmb(); }else if (type == "Emails"){ odebug << "emails" << oendl; @@ -863,29 +863,29 @@ void ContactEditor::chooserChange( const QString &textChanged, int index, slChooserValues[index] = textChanged; } void ContactEditor::slotChooser1Change( const QString &textChanged ) { - owarn << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl; + odebug << "ContactEditor::slotChooser1Change( " << textChanged << " )" << oendl; chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1); } void ContactEditor::slotChooser2Change( const QString &textChanged ) { - owarn << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl; + odebug << "ContactEditor::slotChooser2Change( " << textChanged << " )" << oendl; chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2); } void ContactEditor::slotChooser3Change( const QString &textChanged ) { - owarn << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl; + odebug << "ContactEditor::slotChooser3Change( " << textChanged << " )" << oendl; chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3); } void ContactEditor::slotChooser4Change( const QString &textChanged ) { - owarn << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl; + odebug << "ContactEditor::slotChooser4Change( " << textChanged << " )" << oendl; chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4); } void ContactEditor::slotAddressChange( const QString &textChanged ) { if ( cmbAddress->currentItem() == 0 ) { @@ -949,46 +949,46 @@ void ContactEditor::slotCountryChange( const QString &textChanged ) { slHomeAddress[6] = textChanged; } } void ContactEditor::slotCmbChooser1Change( int index ) { - owarn << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl; + odebug << "ContactEditor::slotCmbChooser1Change( " << index << " )" << oendl; if ( !cmbChooserChange( cmbChooserField1->currentItem(), m_widgetStack1, 1) ){ txtChooserField1->setText( slChooserValues[index] ); txtChooserField1->setFocus(); } } void ContactEditor::slotCmbChooser2Change( int index ) { - owarn << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl; + odebug << "ContactEditor::slotCmbChooser2Change( " << index << " )" << oendl; if ( !cmbChooserChange( cmbChooserField2->currentItem(), m_widgetStack2, 2) ){ txtChooserField2->setText( slChooserValues[index] ); txtChooserField2->setFocus(); } } void ContactEditor::slotCmbChooser3Change( int index ) { - owarn << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl; + odebug << "ContactEditor::slotCmbChooser3Change( " << index << " )" << oendl; if ( !cmbChooserChange( cmbChooserField3->currentItem(), m_widgetStack3, 3) ){ txtChooserField3->setText( slChooserValues[index] ); txtChooserField3->setFocus(); } } void ContactEditor::slotCmbChooser4Change( int index ) { - owarn << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl; + odebug << "ContactEditor::slotCmbChooser4Change( " << index << " )" << oendl; if ( !cmbChooserChange( cmbChooserField4->currentItem(), m_widgetStack4, 4) ){ txtChooserField4->setText( slChooserValues[index] ); txtChooserField4->setFocus(); @@ -1027,13 +1027,13 @@ void ContactEditor::slotAddressTypeChange( int index ) { } } void ContactEditor::slotFullNameChange( const QString &textChanged ) { - owarn << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl; + odebug << "ContactEditor::slotFullNameChange( " << textChanged << " )" << oendl; int index = cmbFileAs->currentItem(); cmbFileAs->clear(); cmbFileAs->insertItem( parseName( textChanged, NAME_LF ) ); @@ -1051,13 +1051,13 @@ void ContactEditor::slotFullNameChange( const QString &textChanged ) { void ContactEditor::slotSuffixChange( const QString& ) { // Just want to update the FileAs combo if the suffix was changed.. slotFullNameChange( txtFullName->text() ); } void ContactEditor::slotOrganizationChange( const QString &textChanged ){ - owarn << "ContactEditor::slotOrganizationChange( " << textChanged << " )" << oendl; + odebug << "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.. if ( txtFullName->text() == txtOrganization->text().left( txtFullName->text().length() ) ) txtFullName->setText( textChanged ); @@ -1133,26 +1133,26 @@ QString ContactEditor::parseName( const QString fullName, int type ) { QString strMiddleName; QString strLastName; QString strTitle; int commapos; bool haveLastName = false; - owarn << "Fullname: " << simplifiedName << oendl; + odebug << "Fullname: " << simplifiedName << oendl; commapos = simplifiedName.find( ',', 0, TRUE); if ( commapos >= 0 ) { - owarn << " Commapos: " << commapos << oendl; + odebug << " Commapos: " << commapos << oendl; // A comma (",") separates the lastname from one or // many first names. Thus, remove the lastname from the // String and parse the firstnames. strLastName = simplifiedName.left( commapos ); simplifiedName= simplifiedName.mid( commapos + 1 ); haveLastName = true; - owarn << "Fullname without ',': " << simplifiedName << oendl; + odebug << "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" QStringList allFirstNames = QStringList::split(" ", simplifiedName); QStringList::Iterator it = allFirstNames.begin(); @@ -1180,16 +1180,16 @@ QString ContactEditor::parseName( const QString fullName, int type ) { } if ( strFirstName == strLastName ) strFirstName = ""; - owarn << "strFirstName: " << strFirstName << oendl; - owarn << "strMiddletName: " << strMiddleName << oendl; - owarn << "strLastName: " << strLastName << oendl; - owarn << "strTitle: " << strTitle << oendl; + odebug << "strFirstName: " << strFirstName << oendl; + odebug << "strMiddletName: " << strMiddleName << oendl; + odebug << "strLastName: " << strLastName << oendl; + odebug << "strTitle: " << strTitle << oendl; switch (type) { case NAME_FL: return strFirstName + " " + strLastName; case NAME_LF: @@ -1326,13 +1326,13 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) { //} QStringList::ConstIterator it; QListIterator<QLineEdit> itLE( listValue ); for ( it = slDynamicEntries.begin(); itLE.current()/* != slDynamicEntries.end()*/; ++it, ++itLE) { - owarn << " Filling dynamic Field: " << (*it) << oendl; + odebug << " Filling dynamic Field: " << (*it) << oendl; if ( *it == "Department" ) (*itLE)->setText( ent.department() ); if ( *it == "Company" ) (*itLE)->setText( ent.company() ); @@ -1350,13 +1350,13 @@ void ContactEditor::setEntry( const Opie::OPimContact &entry ) { (*itLE)->setText( ent.manager() ); if ( *it == "Spouse" ) (*itLE)->setText( ent.spouse() ); if ( *it == "Nickname" ){ - owarn << "**** Nichname: " << ent.nickname() << oendl; + odebug << "**** Nichname: " << ent.nickname() << oendl; (*itLE)->setText( ent.nickname() ); } if ( *it == "Children" ) (*itLE)->setText( ent.children() ); @@ -1583,14 +1583,14 @@ void ContactEditor::saveEntry() { if ( *it == "Emails" ){ QString allemail; QString defaultmail; parseEmailFrom( emails.join(","), defaultmail, allemail ); if ( defaultEmail.isEmpty() ){ - owarn << "Default email was not set by user!" << oendl; - owarn << "Using first email in list: " << defaultmail << oendl; + odebug << "Default email was not set by user!" << oendl; + odebug << "Using first email in list: " << defaultmail << oendl; ent.setDefaultEmail( defaultmail ); } ent.setEmails( allemail ); } if ( *it == "Default Email") @@ -1736,17 +1736,17 @@ void ContactEditor::slotBirthdayDateChanged( int year, int month, int day) birthdayButton->setText( dateString ); ent.setBirthday ( date ); } void ContactEditor::slotRemoveBirthday() { - owarn << "void ContactEditor::slotRemoveBirthday()" << oendl; + odebug << "void ContactEditor::slotRemoveBirthday()" << oendl; ent.setBirthday( QDate() ); updateDatePicker(); } void ContactEditor::slotRemoveAnniversary() { - owarn << "void ContactEditor::slotRemoveAnniversary()" << oendl; + odebug << "void ContactEditor::slotRemoveAnniversary()" << oendl; ent.setAnniversary( QDate() ); updateDatePicker(); } diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp index 8a9c85b..b962896 100644 --- a/core/pim/addressbook/picker.cpp +++ b/core/pim/addressbook/picker.cpp @@ -236,10 +236,10 @@ void LetterPicker::clear() lblVWX->clearLetter(); lblYZ->clearLetter(); } void LetterPicker::newLetter( char letter ) { - owarn << "LetterClicked" << oendl; + odebug << "LetterClicked" << oendl; emit letterClicked( letter ); } |