summaryrefslogtreecommitdiff
authoreilers <eilers>2002-12-27 13:03:34 (UTC)
committer eilers <eilers>2002-12-27 13:03:34 (UTC)
commit158fd475abbc652613d5eed362dae79f94b17803 (patch) (unidiff)
tree60b38278a274ac97d0ebb1226cfd881418d735bf
parent8ae81608ed194e36236ea68c5fbed54ac6c0275c (diff)
downloadopie-158fd475abbc652613d5eed362dae79f94b17803.zip
opie-158fd475abbc652613d5eed362dae79f94b17803.tar.gz
opie-158fd475abbc652613d5eed362dae79f94b17803.tar.bz2
Fixing nullpointer crash if "emails" selected
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/contacteditor.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/pim/addressbook/contacteditor.cpp b/core/pim/addressbook/contacteditor.cpp
index 1b83308..b68d88c 100644
--- a/core/pim/addressbook/contacteditor.cpp
+++ b/core/pim/addressbook/contacteditor.cpp
@@ -574,210 +574,214 @@ void ContactEditor::init() {
574 gl->addWidget( l, 0, 0 ); 574 gl->addWidget( l, 0, 0 );
575 txtFirstName = new QLineEdit( dlgName ); 575 txtFirstName = new QLineEdit( dlgName );
576 gl->addWidget( txtFirstName, 0, 1 ); 576 gl->addWidget( txtFirstName, 0, 1 );
577 577
578 l = new QLabel( tr("Middle Name"), dlgName ); 578 l = new QLabel( tr("Middle Name"), dlgName );
579 gl->addWidget( l, 1, 0 ); 579 gl->addWidget( l, 1, 0 );
580 txtMiddleName = new QLineEdit( dlgName ); 580 txtMiddleName = new QLineEdit( dlgName );
581 gl->addWidget( txtMiddleName, 1, 1 ); 581 gl->addWidget( txtMiddleName, 1, 1 );
582 582
583 l = new QLabel( tr("Last Name"), dlgName ); 583 l = new QLabel( tr("Last Name"), dlgName );
584 gl->addWidget( l, 2, 0 ); 584 gl->addWidget( l, 2, 0 );
585 txtLastName = new QLineEdit( dlgName ); 585 txtLastName = new QLineEdit( dlgName );
586 gl->addWidget( txtLastName, 2, 1 ); 586 gl->addWidget( txtLastName, 2, 1 );
587 587
588 l = new QLabel( tr("Suffix"), dlgName ); 588 l = new QLabel( tr("Suffix"), dlgName );
589 gl->addWidget( l, 3, 0 ); 589 gl->addWidget( l, 3, 0 );
590 txtSuffix = new QLineEdit( dlgName ); 590 txtSuffix = new QLineEdit( dlgName );
591 gl->addWidget( txtSuffix, 3, 1 ); 591 gl->addWidget( txtSuffix, 3, 1 );
592 space = new QSpacerItem(1,1, 592 space = new QSpacerItem(1,1,
593 QSizePolicy::Maximum, 593 QSizePolicy::Maximum,
594 QSizePolicy::MinimumExpanding ); 594 QSizePolicy::MinimumExpanding );
595 gl->addItem( space, 4, 0 ); 595 gl->addItem( space, 4, 0 );
596 596
597 cmbChooserField1->insertStringList( trlChooserNames ); 597 cmbChooserField1->insertStringList( trlChooserNames );
598 cmbChooserField2->insertStringList( trlChooserNames ); 598 cmbChooserField2->insertStringList( trlChooserNames );
599 cmbChooserField3->insertStringList( trlChooserNames ); 599 cmbChooserField3->insertStringList( trlChooserNames );
600 cmbChooserField4->insertStringList( trlChooserNames ); 600 cmbChooserField4->insertStringList( trlChooserNames );
601 601
602 cmbChooserField1->setCurrentItem( 0 ); 602 cmbChooserField1->setCurrentItem( 0 );
603 cmbChooserField2->setCurrentItem( 1 ); 603 cmbChooserField2->setCurrentItem( 1 );
604 cmbChooserField3->setCurrentItem( 2 ); 604 cmbChooserField3->setCurrentItem( 2 );
605 605
606 connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) ); 606 connect( btnFullName, SIGNAL(clicked()), this, SLOT(slotName()) );
607 607
608 connect( txtFullName, SIGNAL(textChanged(const QString &)), this, SLOT(slotFullNameChange(const QString &)) ); 608 connect( txtFullName, SIGNAL(textChanged(const QString &)), this, SLOT(slotFullNameChange(const QString &)) );
609 609
610 connect( txtChooserField1, SIGNAL(textChanged(const QString &)), 610 connect( txtChooserField1, SIGNAL(textChanged(const QString &)),
611 this, SLOT(slotChooser1Change(const QString &)) ); 611 this, SLOT(slotChooser1Change(const QString &)) );
612 connect( txtChooserField2, SIGNAL(textChanged(const QString &)), 612 connect( txtChooserField2, SIGNAL(textChanged(const QString &)),
613 this, SLOT(slotChooser2Change(const QString &)) ); 613 this, SLOT(slotChooser2Change(const QString &)) );
614 connect( txtChooserField3, SIGNAL(textChanged(const QString &)), 614 connect( txtChooserField3, SIGNAL(textChanged(const QString &)),
615 this, SLOT(slotChooser3Change(const QString &)) ); 615 this, SLOT(slotChooser3Change(const QString &)) );
616 connect( txtChooserField4, SIGNAL(textChanged(const QString &)), 616 connect( txtChooserField4, SIGNAL(textChanged(const QString &)),
617 this, SLOT(slotChooser4Change(const QString &)) ); 617 this, SLOT(slotChooser4Change(const QString &)) );
618 connect( txtAddress, SIGNAL(textChanged(const QString &)), 618 connect( txtAddress, SIGNAL(textChanged(const QString &)),
619 this, SLOT(slotAddressChange(const QString &)) ); 619 this, SLOT(slotAddressChange(const QString &)) );
620 connect( txtCity, SIGNAL(textChanged(const QString &)), 620 connect( txtCity, SIGNAL(textChanged(const QString &)),
621 this, SLOT(slotCityChange(const QString &)) ); 621 this, SLOT(slotCityChange(const QString &)) );
622 connect( txtState, SIGNAL(textChanged(const QString &)), 622 connect( txtState, SIGNAL(textChanged(const QString &)),
623 this, SLOT(slotStateChange(const QString &)) ); 623 this, SLOT(slotStateChange(const QString &)) );
624 connect( txtZip, SIGNAL(textChanged(const QString &)), 624 connect( txtZip, SIGNAL(textChanged(const QString &)),
625 this, SLOT(slotZipChange(const QString &)) ); 625 this, SLOT(slotZipChange(const QString &)) );
626 connect( cmbCountry, SIGNAL(textChanged(const QString &)), 626 connect( cmbCountry, SIGNAL(textChanged(const QString &)),
627 this, SLOT(slotCountryChange(const QString &)) ); 627 this, SLOT(slotCountryChange(const QString &)) );
628 connect( cmbCountry, SIGNAL(activated(const QString &)), 628 connect( cmbCountry, SIGNAL(activated(const QString &)),
629 this, SLOT(slotCountryChange(const QString &)) ); 629 this, SLOT(slotCountryChange(const QString &)) );
630 connect( cmbChooserField1, SIGNAL(activated(int)), 630 connect( cmbChooserField1, SIGNAL(activated(int)),
631 this, SLOT(slotCmbChooser1Change(int)) ); 631 this, SLOT(slotCmbChooser1Change(int)) );
632 connect( cmbChooserField2, SIGNAL(activated(int)), 632 connect( cmbChooserField2, SIGNAL(activated(int)),
633 this, SLOT(slotCmbChooser2Change(int)) ); 633 this, SLOT(slotCmbChooser2Change(int)) );
634 connect( cmbChooserField3, SIGNAL(activated(int)), 634 connect( cmbChooserField3, SIGNAL(activated(int)),
635 this, SLOT(slotCmbChooser3Change(int)) ); 635 this, SLOT(slotCmbChooser3Change(int)) );
636 connect( cmbChooserField4, SIGNAL(activated(int)), 636 connect( cmbChooserField4, SIGNAL(activated(int)),
637 this, SLOT(slotCmbChooser4Change(int)) ); 637 this, SLOT(slotCmbChooser4Change(int)) );
638 connect( cmbAddress, SIGNAL(activated(int)), 638 connect( cmbAddress, SIGNAL(activated(int)),
639 this, SLOT(slotAddressTypeChange(int)) ); 639 this, SLOT(slotAddressTypeChange(int)) );
640 640
641 new QPEDialogListener(this); 641 new QPEDialogListener(this);
642 642
643 setPersonalView ( m_personalView ); 643 setPersonalView ( m_personalView );
644} 644}
645 645
646void ContactEditor::defaultEmailChanged(int i){ 646void ContactEditor::defaultEmailChanged(int i){
647 qDebug("defaultEmailChanged"); 647 qDebug("defaultEmailChanged");
648 int index = cmbChooserField1->currentItem(); 648 int index = cmbChooserField1->currentItem();
649 slChooserValues[index] = cmbDefaultEmail->text(i); 649 slChooserValues[index] = cmbDefaultEmail->text(i);
650 650
651} 651}
652 652
653void ContactEditor::populateDefaultEmailCmb(){ 653void ContactEditor::populateDefaultEmailCmb(){
654 cmbDefaultEmail->clear(); 654 cmbDefaultEmail->clear();
655 cmbDefaultEmail->insertStringList(emails); 655 cmbDefaultEmail->insertStringList(emails);
656 for ( int i = 0; i < cmbDefaultEmail->count(); i++){ 656 for ( int i = 0; i < cmbDefaultEmail->count(); i++){
657 qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",cmbDefaultEmail->text( i ).latin1(),defaultEmail.latin1()); 657 qDebug(" populateDefaultEmailCmb text >%s< defaultEmail >%s<",cmbDefaultEmail->text( i ).latin1(),defaultEmail.latin1());
658 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){ 658 if ( cmbDefaultEmail->text( i ).stripWhiteSpace() == defaultEmail.stripWhiteSpace() ){
659 cmbDefaultEmail->setCurrentItem( i ); 659 cmbDefaultEmail->setCurrentItem( i );
660 qDebug("set"); 660 qDebug("set");
661 } 661 }
662 } 662 }
663} 663}
664 664
665void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid, int widgetPos ) { 665void ContactEditor::chooserChange( const QString &textChanged, int index, QLineEdit *inputWid, int widgetPos ) {
666 QString type = slChooserNames[index]; 666 QString type = slChooserNames[index];
667 qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",type.latin1(),textChanged.latin1(), index, widgetPos ); 667 qDebug("ContactEditor::chooserChange( type=>%s<, textChanged=>%s< index=%i, widgetPos=%i",type.latin1(),textChanged.latin1(), index, widgetPos );
668 if ( type == "Default Email"){ 668 if ( type == "Default Email"){
669 defaultEmail = textChanged; 669 defaultEmail = textChanged;
670 if (cmbDefaultEmail) delete cmbDefaultEmail; 670 if (cmbDefaultEmail){
671 delete cmbDefaultEmail;
672 cmbDefaultEmail = 0l;
673 }
671 cmbDefaultEmail = new QComboBox(inputWid->parentWidget()); 674 cmbDefaultEmail = new QComboBox(inputWid->parentWidget());
672 cmbDefaultEmail->setGeometry(inputWid->frameGeometry()); 675 cmbDefaultEmail->setGeometry(inputWid->frameGeometry());
673 cmbDefaultEmail->show(); 676 cmbDefaultEmail->show();
674 populateDefaultEmailCmb(); 677 populateDefaultEmailCmb();
675 connect(cmbDefaultEmail,SIGNAL(activated(int)), 678 connect(cmbDefaultEmail,SIGNAL(activated(int)),
676 SLOT(defaultEmailChanged(int))); 679 SLOT(defaultEmailChanged(int)));
677 defaultEmailChooserPosition = widgetPos; 680 defaultEmailChooserPosition = widgetPos;
678 }else if (defaultEmailChooserPosition == widgetPos){ 681 }else if (defaultEmailChooserPosition == widgetPos){
679 qDebug("cmbDefaultEmail->hide()"); 682 qDebug("cmbDefaultEmail->hide()");
680 if (cmbDefaultEmail) cmbDefaultEmail->hide(); 683 if (cmbDefaultEmail) cmbDefaultEmail->hide();
681 widgetPos=-1; 684 widgetPos=-1;
682 }else if (type == "Emails"){ 685 }else if (type == "Emails"){
683 qDebug("emails"); 686 qDebug("emails");
684 QString de; 687 QString de;
685 emails = QStringList::split (",", textChanged ); 688 emails = QStringList::split (",", textChanged );
686 689
687 populateDefaultEmailCmb(); 690 if ( cmbDefaultEmail )
691 populateDefaultEmailCmb();
688 } 692 }
689 693
690 694
691 695
692 slChooserValues[index] = textChanged; 696 slChooserValues[index] = textChanged;
693 697
694} 698}
695 699
696void ContactEditor::slotChooser1Change( const QString &textChanged ) { 700void ContactEditor::slotChooser1Change( const QString &textChanged ) {
697 chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1); 701 chooserChange( textChanged, cmbChooserField1->currentItem(), txtChooserField1, 1);
698} 702}
699 703
700void ContactEditor::slotChooser2Change( const QString &textChanged ) { 704void ContactEditor::slotChooser2Change( const QString &textChanged ) {
701 chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2); 705 chooserChange( textChanged, cmbChooserField2->currentItem(), txtChooserField2, 2);
702 706
703} 707}
704 708
705void ContactEditor::slotChooser3Change( const QString &textChanged ) { 709void ContactEditor::slotChooser3Change( const QString &textChanged ) {
706 chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3); 710 chooserChange( textChanged, cmbChooserField3->currentItem(), txtChooserField3, 3);
707} 711}
708 712
709void ContactEditor::slotChooser4Change( const QString &textChanged ) { 713void ContactEditor::slotChooser4Change( const QString &textChanged ) {
710 chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4); 714 chooserChange( textChanged, cmbChooserField4->currentItem(), txtChooserField4, 4);
711} 715}
712 716
713void ContactEditor::slotAddressChange( const QString &textChanged ) { 717void ContactEditor::slotAddressChange( const QString &textChanged ) {
714 718
715 if ( cmbAddress->currentItem() == 0 ) { 719 if ( cmbAddress->currentItem() == 0 ) {
716 slBusinessAddress[0] = textChanged; 720 slBusinessAddress[0] = textChanged;
717 } else { 721 } else {
718 slHomeAddress[0] = textChanged; 722 slHomeAddress[0] = textChanged;
719 } 723 }
720} 724}
721 725
722void ContactEditor::slotAddress2Change( const QString &textChanged ) { 726void ContactEditor::slotAddress2Change( const QString &textChanged ) {
723 727
724 if ( cmbAddress->currentItem() == 0 ) { 728 if ( cmbAddress->currentItem() == 0 ) {
725 slBusinessAddress[1] = textChanged; 729 slBusinessAddress[1] = textChanged;
726 } else { 730 } else {
727 slHomeAddress[1] = textChanged; 731 slHomeAddress[1] = textChanged;
728 } 732 }
729} 733}
730 734
731void ContactEditor::slotPOBoxChange( const QString &textChanged ) { 735void ContactEditor::slotPOBoxChange( const QString &textChanged ) {
732 736
733 if ( cmbAddress->currentItem() == 0 ) { 737 if ( cmbAddress->currentItem() == 0 ) {
734 slBusinessAddress[2] = textChanged; 738 slBusinessAddress[2] = textChanged;
735 } else { 739 } else {
736 slHomeAddress[2] = textChanged; 740 slHomeAddress[2] = textChanged;
737 } 741 }
738} 742}
739 743
740void ContactEditor::slotCityChange( const QString &textChanged ) { 744void ContactEditor::slotCityChange( const QString &textChanged ) {
741 745
742 if ( cmbAddress->currentItem() == 0 ) { 746 if ( cmbAddress->currentItem() == 0 ) {
743 slBusinessAddress[3] = textChanged; 747 slBusinessAddress[3] = textChanged;
744 } else { 748 } else {
745 slHomeAddress[3] = textChanged; 749 slHomeAddress[3] = textChanged;
746 } 750 }
747} 751}
748 752
749void ContactEditor::slotStateChange( const QString &textChanged ) { 753void ContactEditor::slotStateChange( const QString &textChanged ) {
750 754
751 755
752 if ( cmbAddress->currentItem() == 0 ) { 756 if ( cmbAddress->currentItem() == 0 ) {
753 slBusinessAddress[4] = textChanged; 757 slBusinessAddress[4] = textChanged;
754 } else { 758 } else {
755 slHomeAddress[4] = textChanged; 759 slHomeAddress[4] = textChanged;
756 } 760 }
757} 761}
758 762
759void ContactEditor::slotZipChange( const QString &textChanged ) { 763void ContactEditor::slotZipChange( const QString &textChanged ) {
760 764
761 if ( cmbAddress->currentItem() == 0 ) { 765 if ( cmbAddress->currentItem() == 0 ) {
762 slBusinessAddress[5] = textChanged; 766 slBusinessAddress[5] = textChanged;
763 } else { 767 } else {
764 slHomeAddress[5] = textChanged; 768 slHomeAddress[5] = textChanged;
765 } 769 }
766} 770}
767 771
768void ContactEditor::slotCountryChange( const QString &textChanged ) { 772void ContactEditor::slotCountryChange( const QString &textChanged ) {
769 773
770 if ( cmbAddress->currentItem() == 0 ) { 774 if ( cmbAddress->currentItem() == 0 ) {
771 slBusinessAddress[6] = textChanged; 775 slBusinessAddress[6] = textChanged;
772 } else { 776 } else {
773 slHomeAddress[6] = textChanged; 777 slHomeAddress[6] = textChanged;
774 } 778 }
775} 779}
776 780
777 781
778void ContactEditor::slotCmbChooser1Change( int index ) { 782void ContactEditor::slotCmbChooser1Change( int index ) {
779 783
780 txtChooserField1->setText( slChooserValues[index] ); 784 txtChooserField1->setText( slChooserValues[index] );
781 txtChooserField1->setFocus(); 785 txtChooserField1->setFocus();
782} 786}
783 787