author | mickeyl <mickeyl> | 2004-04-04 17:03:27 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-04 17:03:27 (UTC) |
commit | daef74a7e852855f781765fad7969b6c83e2e9c6 (patch) (unidiff) | |
tree | f635b437ba9f6d144c34c5ee58d37954bacc3c6e /core/pim/addressbook/addressbook.cpp | |
parent | 100def2936503dedc8138d738d68b69d5de66766 (diff) | |
download | opie-daef74a7e852855f781765fad7969b6c83e2e9c6.zip opie-daef74a7e852855f781765fad7969b6c83e2e9c6.tar.gz opie-daef74a7e852855f781765fad7969b6c83e2e9c6.tar.bz2 |
s/Opie::Core::odebug/odebug/ (same with oerr,owarn,ofatal)
Diffstat (limited to 'core/pim/addressbook/addressbook.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/addressbook.cpp | 62 |
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 | |||
@@ -250,9 +250,9 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | |||
250 | m_curFontSize = m_config.fontSize(); | 250 | m_curFontSize = m_config.fontSize(); |
251 | 251 | ||
252 | setCentralWidget(listContainer); | 252 | setCentralWidget(listContainer); |
253 | 253 | ||
254 | //Opie::Core::odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl; | 254 | //odebug << "adressbook contrsuction: t=" << t.elapsed() << oendl; |
255 | connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); | 255 | connect( qApp, SIGNAL( flush() ), this, SLOT( flush() ) ); |
256 | connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) ); | 256 | connect( qApp, SIGNAL( reload() ), this, SLOT( reload() ) ); |
257 | connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ), | 257 | connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ), |
258 | this, SLOT( appMessage(const QCString&,const QByteArray&) ) ); | 258 | this, SLOT( appMessage(const QCString&,const QByteArray&) ) ); |
@@ -266,12 +266,12 @@ void AddressbookWindow::slotConfig() | |||
266 | { | 266 | { |
267 | ConfigDlg* dlg = new ConfigDlg( this, "Config" ); | 267 | ConfigDlg* dlg = new ConfigDlg( this, "Config" ); |
268 | dlg -> setConfig( m_config ); | 268 | dlg -> setConfig( m_config ); |
269 | if ( QPEApplication::execDialog( dlg ) ) { | 269 | if ( QPEApplication::execDialog( dlg ) ) { |
270 | Opie::Core::owarn << "Config Dialog accepted!" << oendl; | 270 | owarn << "Config Dialog accepted!" << oendl; |
271 | m_config = dlg -> getConfig(); | 271 | m_config = dlg -> getConfig(); |
272 | if ( m_curFontSize != m_config.fontSize() ){ | 272 | if ( m_curFontSize != m_config.fontSize() ){ |
273 | Opie::Core::owarn << "Font was changed!" << oendl; | 273 | owarn << "Font was changed!" << oendl; |
274 | m_curFontSize = m_config.fontSize(); | 274 | m_curFontSize = m_config.fontSize(); |
275 | emit slotSetFont( m_curFontSize ); | 275 | emit slotSetFont( m_curFontSize ); |
276 | } | 276 | } |
277 | m_abView -> setListOrder( m_config.orderList() ); | 277 | m_abView -> setListOrder( m_config.orderList() ); |
@@ -282,9 +282,9 @@ void AddressbookWindow::slotConfig() | |||
282 | 282 | ||
283 | 283 | ||
284 | void AddressbookWindow::slotSetFont( int size ) | 284 | void AddressbookWindow::slotSetFont( int size ) |
285 | { | 285 | { |
286 | Opie::Core::owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl; | 286 | owarn << "void AddressbookWindow::slotSetFont( " << size << " )" << oendl; |
287 | 287 | ||
288 | if (size > 2 || size < 0) | 288 | if (size > 2 || size < 0) |
289 | size = 1; | 289 | size = 1; |
290 | 290 | ||
@@ -324,12 +324,12 @@ void AddressbookWindow::importvCard() { | |||
324 | 324 | ||
325 | } | 325 | } |
326 | void AddressbookWindow::exportvCard() | 326 | void AddressbookWindow::exportvCard() |
327 | { | 327 | { |
328 | Opie::Core::owarn << "void AddressbookWindow::exportvCard()" << oendl; | 328 | owarn << "void AddressbookWindow::exportvCard()" << oendl; |
329 | QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); | 329 | QString filename = Opie::Ui::OFileDialog::getSaveFileName( 1,"/home/"); //,"", "*", this ); |
330 | if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){ | 330 | if( !filename.isEmpty() && ( filename[filename.length()-1] != '/' ) ){ |
331 | Opie::Core::owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl; | 331 | owarn << " Save to file " << filename << ", (" << filename.length()-1 << ")" << oendl; |
332 | Opie::OPimContact curCont = m_abView->currentEntry(); | 332 | Opie::OPimContact curCont = m_abView->currentEntry(); |
333 | if ( !curCont.isEmpty() ){ | 333 | if ( !curCont.isEmpty() ){ |
334 | Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, | 334 | Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, |
335 | filename ); | 335 | filename ); |
@@ -349,9 +349,9 @@ void AddressbookWindow::exportvCard() | |||
349 | } | 349 | } |
350 | 350 | ||
351 | void AddressbookWindow::setDocument( const QString &filename ) | 351 | void AddressbookWindow::setDocument( const QString &filename ) |
352 | { | 352 | { |
353 | Opie::Core::owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl; | 353 | owarn << "void AddressbookWindow::setDocument( " << filename << " )" << oendl; |
354 | 354 | ||
355 | if ( filename.find(".vcf") != int(filename.length()) - 4 ){ | 355 | if ( filename.find(".vcf") != int(filename.length()) - 4 ){ |
356 | 356 | ||
357 | 357 | ||
@@ -361,12 +361,12 @@ void AddressbookWindow::setDocument( const QString &filename ) | |||
361 | tr( "&Yes" ), tr( "&No" ), QString::null, | 361 | tr( "&Yes" ), tr( "&No" ), QString::null, |
362 | 0, // Enter == button 0 | 362 | 0, // Enter == button 0 |
363 | 2 ) ) { // Escape == button 2 | 363 | 2 ) ) { // Escape == button 2 |
364 | case 0: | 364 | case 0: |
365 | Opie::Core::owarn << "YES clicked" << oendl; | 365 | owarn << "YES clicked" << oendl; |
366 | break; | 366 | break; |
367 | case 1: | 367 | case 1: |
368 | Opie::Core::owarn << "NO clicked" << oendl; | 368 | owarn << "NO clicked" << oendl; |
369 | return; | 369 | return; |
370 | break; | 370 | break; |
371 | } | 371 | } |
372 | } | 372 | } |
@@ -374,9 +374,9 @@ void AddressbookWindow::setDocument( const QString &filename ) | |||
374 | Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, | 374 | Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, |
375 | filename ); | 375 | filename ); |
376 | Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); | 376 | Opie::OPimContactAccess* access = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); |
377 | Opie::OPimContactAccess::List allList = access->allRecords(); | 377 | Opie::OPimContactAccess::List allList = access->allRecords(); |
378 | Opie::Core::owarn << "Found number of contacts in File: " << allList.count() << oendl; | 378 | owarn << "Found number of contacts in File: " << allList.count() << oendl; |
379 | 379 | ||
380 | if ( !allList.count() ) { | 380 | if ( !allList.count() ) { |
381 | QMessageBox::information( this, "Import VCard", | 381 | QMessageBox::information( this, "Import VCard", |
382 | "It was impossible to import\nthe VCard.\n" | 382 | "It was impossible to import\nthe VCard.\n" |
@@ -385,25 +385,25 @@ void AddressbookWindow::setDocument( const QString &filename ) | |||
385 | 385 | ||
386 | bool doAsk = true; | 386 | bool doAsk = true; |
387 | Opie::OPimContactAccess::List::Iterator it; | 387 | Opie::OPimContactAccess::List::Iterator it; |
388 | for ( it = allList.begin(); it != allList.end(); ++it ){ | 388 | for ( it = allList.begin(); it != allList.end(); ++it ){ |
389 | Opie::Core::owarn << "Adding Contact from: " << (*it).fullName() << oendl; | 389 | owarn << "Adding Contact from: " << (*it).fullName() << oendl; |
390 | if ( doAsk ){ | 390 | if ( doAsk ){ |
391 | switch( QMessageBox::information( this, tr ( "Add Contact?" ), | 391 | switch( QMessageBox::information( this, tr ( "Add Contact?" ), |
392 | tr( "Do you really want add contact for \n%1?" ) | 392 | tr( "Do you really want add contact for \n%1?" ) |
393 | .arg( (*it).fullName().latin1() ), | 393 | .arg( (*it).fullName().latin1() ), |
394 | tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"), | 394 | tr( "&Yes" ), tr( "&No" ), tr( "&All Yes"), |
395 | 0, // Enter == button 0 | 395 | 0, // Enter == button 0 |
396 | 2 ) ) { // Escape == button 2 | 396 | 2 ) ) { // Escape == button 2 |
397 | case 0: | 397 | case 0: |
398 | Opie::Core::owarn << "YES clicked" << oendl; | 398 | owarn << "YES clicked" << oendl; |
399 | m_abView->addEntry( *it ); | 399 | m_abView->addEntry( *it ); |
400 | break; | 400 | break; |
401 | case 1: | 401 | case 1: |
402 | Opie::Core::owarn << "NO clicked" << oendl; | 402 | owarn << "NO clicked" << oendl; |
403 | break; | 403 | break; |
404 | case 2: | 404 | case 2: |
405 | Opie::Core::owarn << "YesAll clicked" << oendl; | 405 | owarn << "YesAll clicked" << oendl; |
406 | doAsk = false; | 406 | doAsk = false; |
407 | break; | 407 | break; |
408 | } | 408 | } |
409 | }else | 409 | }else |
@@ -537,21 +537,21 @@ void AddressbookWindow::writeMail() | |||
537 | 537 | ||
538 | // Try to access the preferred. If not possible, try to | 538 | // Try to access the preferred. If not possible, try to |
539 | // switch to the other one.. | 539 | // switch to the other one.. |
540 | if ( m_config.useQtMail() ){ | 540 | if ( m_config.useQtMail() ){ |
541 | Opie::Core::owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl; | 541 | owarn << "Accessing: " << (basepath + "/bin/qtmail") << oendl; |
542 | if ( QFile::exists( basepath + "/bin/qtmail" ) ){ | 542 | if ( QFile::exists( basepath + "/bin/qtmail" ) ){ |
543 | Opie::Core::owarn << "QCop" << oendl; | 543 | owarn << "QCop" << oendl; |
544 | QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)"); | 544 | QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)"); |
545 | e << name << email; | 545 | e << name << email; |
546 | return; | 546 | return; |
547 | } else | 547 | } else |
548 | m_config.setUseOpieMail( true ); | 548 | m_config.setUseOpieMail( true ); |
549 | } | 549 | } |
550 | if ( m_config.useOpieMail() ){ | 550 | if ( m_config.useOpieMail() ){ |
551 | Opie::Core::owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl; | 551 | owarn << "Accessing: " << (basepath + "/bin/opiemail") << oendl; |
552 | if ( QFile::exists( basepath + "/bin/opiemail" ) ){ | 552 | if ( QFile::exists( basepath + "/bin/opiemail" ) ){ |
553 | Opie::Core::owarn << "QCop" << oendl; | 553 | owarn << "QCop" << oendl; |
554 | QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)"); | 554 | QCopEnvelope e("QPE/Application/opiemail", "writeMail(QString,QString)"); |
555 | e << name << email; | 555 | e << name << email; |
556 | return; | 556 | return; |
557 | } else | 557 | } else |
@@ -591,9 +591,9 @@ void AddressbookWindow::slotBeam() | |||
591 | 591 | ||
592 | beamFilename = beamfile; | 592 | beamFilename = beamfile; |
593 | } | 593 | } |
594 | 594 | ||
595 | Opie::Core::owarn << "Beaming: " << beamFilename << oendl; | 595 | owarn << "Beaming: " << beamFilename << oendl; |
596 | 596 | ||
597 | Ir *ir = new Ir( this ); | 597 | Ir *ir = new Ir( this ); |
598 | connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); | 598 | connect( ir, SIGNAL( done(Ir*) ), this, SLOT( beamDone(Ir*) ) ); |
599 | QString description = c.fullName(); | 599 | QString description = c.fullName(); |
@@ -638,9 +638,9 @@ static void parseName( const QString& name, QString *first, QString *middle, | |||
638 | 638 | ||
639 | void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | 639 | void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) |
640 | { | 640 | { |
641 | bool needShow = FALSE; | 641 | bool needShow = FALSE; |
642 | Opie::Core::owarn << "Receiving QCop-Call with message " << msg << oendl; | 642 | owarn << "Receiving QCop-Call with message " << msg << oendl; |
643 | 643 | ||
644 | 644 | ||
645 | if (msg == "editPersonal()") { | 645 | if (msg == "editPersonal()") { |
646 | editPersonal(); | 646 | editPersonal(); |
@@ -654,9 +654,9 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | |||
654 | 654 | ||
655 | Opie::OPimContact cnt; | 655 | Opie::OPimContact cnt; |
656 | QString fn, mn, ln; | 656 | QString fn, mn, ln; |
657 | parseName( name, &fn, &mn, &ln ); | 657 | parseName( name, &fn, &mn, &ln ); |
658 | //Opie::Core::odebug << " " << fn << " - " << mn " - " << ln << oendl; | 658 | //odebug << " " << fn << " - " << mn " - " << ln << oendl; |
659 | cnt.setFirstName( fn ); | 659 | cnt.setFirstName( fn ); |
660 | cnt.setMiddleName( mn ); | 660 | cnt.setMiddleName( mn ); |
661 | cnt.setLastName( ln ); | 661 | cnt.setLastName( ln ); |
662 | cnt.insertEmails( email ); | 662 | cnt.insertEmails( email ); |
@@ -681,9 +681,9 @@ void AddressbookWindow::appMessage(const QCString &msg, const QByteArray &data) | |||
681 | QDataStream stream(data,IO_ReadOnly); | 681 | QDataStream stream(data,IO_ReadOnly); |
682 | int uid; | 682 | int uid; |
683 | stream >> uid; | 683 | stream >> uid; |
684 | 684 | ||
685 | Opie::Core::owarn << "Showing uid: " << uid << oendl; | 685 | owarn << "Showing uid: " << uid << oendl; |
686 | 686 | ||
687 | // Deactivate Personal View.. | 687 | // Deactivate Personal View.. |
688 | if ( actionPersonal->isOn() ){ | 688 | if ( actionPersonal->isOn() ){ |
689 | actionPersonal->setOn( false ); | 689 | actionPersonal->setOn( false ); |
@@ -761,9 +761,9 @@ void AddressbookWindow::editPersonal() | |||
761 | 761 | ||
762 | // Switch to personal view if not selected | 762 | // Switch to personal view if not selected |
763 | // but take care of the menu, too | 763 | // but take care of the menu, too |
764 | if ( ! actionPersonal->isOn() ){ | 764 | if ( ! actionPersonal->isOn() ){ |
765 | Opie::Core::owarn << "*** ++++" << oendl; | 765 | owarn << "*** ++++" << oendl; |
766 | actionPersonal->setOn( true ); | 766 | actionPersonal->setOn( true ); |
767 | slotPersonalView(); | 767 | slotPersonalView(); |
768 | } | 768 | } |
769 | 769 | ||
@@ -780,12 +780,12 @@ void AddressbookWindow::editPersonal() | |||
780 | 780 | ||
781 | 781 | ||
782 | void AddressbookWindow::slotPersonalView() | 782 | void AddressbookWindow::slotPersonalView() |
783 | { | 783 | { |
784 | Opie::Core::owarn << "slotPersonalView()" << oendl; | 784 | owarn << "slotPersonalView()" << oendl; |
785 | if (!actionPersonal->isOn()) { | 785 | if (!actionPersonal->isOn()) { |
786 | // we just turned it off | 786 | // we just turned it off |
787 | Opie::Core::owarn << "slotPersonalView()-> OFF" << oendl; | 787 | owarn << "slotPersonalView()-> OFF" << oendl; |
788 | setCaption( tr("Contacts") ); | 788 | setCaption( tr("Contacts") ); |
789 | actionNew->setEnabled(TRUE); | 789 | actionNew->setEnabled(TRUE); |
790 | actionTrash->setEnabled(TRUE); | 790 | actionTrash->setEnabled(TRUE); |
791 | actionFind->setEnabled(TRUE); | 791 | actionFind->setEnabled(TRUE); |
@@ -796,9 +796,9 @@ void AddressbookWindow::slotPersonalView() | |||
796 | 796 | ||
797 | return; | 797 | return; |
798 | } | 798 | } |
799 | 799 | ||
800 | Opie::Core::owarn << "slotPersonalView()-> ON" << oendl; | 800 | owarn << "slotPersonalView()-> ON" << oendl; |
801 | // XXX need to disable some QActions. | 801 | // XXX need to disable some QActions. |
802 | actionNew->setEnabled(FALSE); | 802 | actionNew->setEnabled(FALSE); |
803 | actionTrash->setEnabled(FALSE); | 803 | actionTrash->setEnabled(FALSE); |
804 | actionFind->setEnabled(FALSE); | 804 | actionFind->setEnabled(FALSE); |
@@ -886,26 +886,26 @@ void AddressbookWindow::slotSave() | |||
886 | 886 | ||
887 | 887 | ||
888 | void AddressbookWindow::slotNotFound() | 888 | void AddressbookWindow::slotNotFound() |
889 | { | 889 | { |
890 | Opie::Core::owarn << "Got not found signal!" << oendl; | 890 | owarn << "Got not found signal!" << oendl; |
891 | QMessageBox::information( this, tr( "Not Found" ), | 891 | QMessageBox::information( this, tr( "Not Found" ), |
892 | "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" ); | 892 | "<qt>" + tr( "Unable to find a contact for this search pattern!" ) + "</qt>" ); |
893 | 893 | ||
894 | 894 | ||
895 | } | 895 | } |
896 | void AddressbookWindow::slotWrapAround() | 896 | void AddressbookWindow::slotWrapAround() |
897 | { | 897 | { |
898 | Opie::Core::owarn << "Got wrap signal!" << oendl; | 898 | owarn << "Got wrap signal!" << oendl; |
899 | // if ( doNotifyWrapAround ) | 899 | // if ( doNotifyWrapAround ) |
900 | // QMessageBox::information( this, tr( "End of list" ), | 900 | // QMessageBox::information( this, tr( "End of list" ), |
901 | // tr( "End of list. Wrap around now...!" ) + "\n" ); | 901 | // tr( "End of list. Wrap around now...!" ) + "\n" ); |
902 | 902 | ||
903 | } | 903 | } |
904 | 904 | ||
905 | void AddressbookWindow::slotSetCategory( int c ) | 905 | void AddressbookWindow::slotSetCategory( int c ) |
906 | { | 906 | { |
907 | Opie::Core::owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from " | 907 | owarn << "void AddressbookWindow::slotSetCategory( " << c << " ) from " |
908 | << catMenu->count() << oendl; | 908 | << catMenu->count() << oendl; |
909 | 909 | ||
910 | QString cat, book; | 910 | QString cat, book; |
911 | AbView::Views view = AbView::TableView; | 911 | AbView::Views view = AbView::TableView; |
@@ -939,9 +939,9 @@ void AddressbookWindow::slotSetCategory( int c ) | |||
939 | }else if ( i == 3 ){ // default All Categories | 939 | }else if ( i == 3 ){ // default All Categories |
940 | cat = QString::null; | 940 | cat = QString::null; |
941 | }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled | 941 | }else if ( i == (unsigned int)catMenu->count() - 1 ){ // last menu option (seperator is counted, too) will be Unfiled |
942 | cat = "Unfiled"; | 942 | cat = "Unfiled"; |
943 | Opie::Core::owarn << "Unfiled selected!" << oendl; | 943 | owarn << "Unfiled selected!" << oendl; |
944 | }else{ | 944 | }else{ |
945 | cat = m_abView->categories()[i - 4]; | 945 | cat = m_abView->categories()[i - 4]; |
946 | } | 946 | } |
947 | } | 947 | } |
@@ -962,9 +962,9 @@ void AddressbookWindow::slotSetCategory( int c ) | |||
962 | } | 962 | } |
963 | 963 | ||
964 | void AddressbookWindow::slotViewSwitched( int view ) | 964 | void AddressbookWindow::slotViewSwitched( int view ) |
965 | { | 965 | { |
966 | Opie::Core::owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl; | 966 | owarn << "void AddressbookWindow::slotViewSwitched( " << view << " )" << oendl; |
967 | int menu = 0; | 967 | int menu = 0; |
968 | 968 | ||
969 | // Switch to selected view | 969 | // Switch to selected view |
970 | switch ( view ){ | 970 | switch ( view ){ |