Diffstat (limited to 'core/pim/addressbook/abtable.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/addressbook/abtable.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp index 60f3177..539d6ba 100644 --- a/core/pim/addressbook/abtable.cpp +++ b/core/pim/addressbook/abtable.cpp | |||
@@ -12,27 +12,27 @@ | |||
12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | ** | 14 | ** |
15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
16 | ** | 16 | ** |
17 | ** Contact info@trolltech.com if any conditions of this licensing are | 17 | ** Contact info@trolltech.com if any conditions of this licensing are |
18 | ** not clear to you. | 18 | ** not clear to you. |
19 | ** | 19 | ** |
20 | **********************************************************************/ | 20 | **********************************************************************/ |
21 | 21 | ||
22 | #include <opie2/odebug.h> | 22 | #include <opie2/odebug.h> |
23 | #include <opie2/opimrecordlist.h> | 23 | #include <opie2/opimrecordlist.h> |
24 | #include <opie2/oresource.h> | ||
24 | 25 | ||
25 | #include <qpe/timestring.h> | 26 | #include <qpe/timestring.h> |
26 | #include <qpe/resource.h> | ||
27 | 27 | ||
28 | #include "abtable.h" | 28 | #include "abtable.h" |
29 | 29 | ||
30 | #include <errno.h> | 30 | #include <errno.h> |
31 | #include <fcntl.h> | 31 | #include <fcntl.h> |
32 | #include <unistd.h> | 32 | #include <unistd.h> |
33 | #include <stdlib.h> | 33 | #include <stdlib.h> |
34 | 34 | ||
35 | #include <ctype.h> //toupper() for key hack | 35 | #include <ctype.h> //toupper() for key hack |
36 | 36 | ||
37 | #if 0 | 37 | #if 0 |
38 | 38 | ||
@@ -620,109 +620,109 @@ ContactItem AbTable::findContactContact( const Opie::OPimContact &entry, int /* | |||
620 | case Qtopia::Title: | 620 | case Qtopia::Title: |
621 | item.value = entry.title(); | 621 | item.value = entry.title(); |
622 | break; | 622 | break; |
623 | case Qtopia::Suffix: | 623 | case Qtopia::Suffix: |
624 | item.value = entry.suffix(); | 624 | item.value = entry.suffix(); |
625 | break; | 625 | break; |
626 | case Qtopia::FileAs: | 626 | case Qtopia::FileAs: |
627 | item.value = entry.fileAs(); | 627 | item.value = entry.fileAs(); |
628 | break; | 628 | break; |
629 | case Qtopia::DefaultEmail: | 629 | case Qtopia::DefaultEmail: |
630 | item.value = entry.defaultEmail(); | 630 | item.value = entry.defaultEmail(); |
631 | if ( !item.value.isEmpty() ) | 631 | if ( !item.value.isEmpty() ) |
632 | item.icon = Resource::loadPixmap( "addressbook/email" ); | 632 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" ); |
633 | break; | 633 | break; |
634 | case Qtopia::Emails: | 634 | case Qtopia::Emails: |
635 | item.value = entry.emails(); | 635 | item.value = entry.emails(); |
636 | if ( !item.value.isEmpty() ) | 636 | if ( !item.value.isEmpty() ) |
637 | item.icon = Resource::loadPixmap( "addressbook/email" ); | 637 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/email" ); |
638 | break; | 638 | break; |
639 | case Qtopia::HomeStreet: | 639 | case Qtopia::HomeStreet: |
640 | item.value = entry.homeStreet(); | 640 | item.value = entry.homeStreet(); |
641 | break; | 641 | break; |
642 | case Qtopia::HomeCity: | 642 | case Qtopia::HomeCity: |
643 | item.value = entry.homeCity(); | 643 | item.value = entry.homeCity(); |
644 | break; | 644 | break; |
645 | case Qtopia::HomeState: | 645 | case Qtopia::HomeState: |
646 | item.value = entry.homeState(); | 646 | item.value = entry.homeState(); |
647 | break; | 647 | break; |
648 | case Qtopia::HomeZip: | 648 | case Qtopia::HomeZip: |
649 | item.value = entry.homeZip(); | 649 | item.value = entry.homeZip(); |
650 | break; | 650 | break; |
651 | case Qtopia::HomeCountry: | 651 | case Qtopia::HomeCountry: |
652 | item.value = entry.homeCountry(); | 652 | item.value = entry.homeCountry(); |
653 | break; | 653 | break; |
654 | case Qtopia::HomePhone: | 654 | case Qtopia::HomePhone: |
655 | item.value = entry.homePhone(); | 655 | item.value = entry.homePhone(); |
656 | if ( !item.value.isEmpty() ) | 656 | if ( !item.value.isEmpty() ) |
657 | item.icon = Resource::loadPixmap( "addressbook/phonehome" ); | 657 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonehome" ); |
658 | break; | 658 | break; |
659 | case Qtopia::HomeFax: | 659 | case Qtopia::HomeFax: |
660 | item.value = entry.homeFax(); | 660 | item.value = entry.homeFax(); |
661 | if ( !item.value.isEmpty() ) | 661 | if ( !item.value.isEmpty() ) |
662 | item.icon = Resource::loadPixmap( "addressbook/faxhome" ); | 662 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxhome" ); |
663 | break; | 663 | break; |
664 | case Qtopia::HomeMobile: | 664 | case Qtopia::HomeMobile: |
665 | item.value = entry.homeMobile(); | 665 | item.value = entry.homeMobile(); |
666 | if ( !item.value.isEmpty() ) | 666 | if ( !item.value.isEmpty() ) |
667 | item.icon = Resource::loadPixmap( "addressbook/mobilehome" ); | 667 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilehome" ); |
668 | break; | 668 | break; |
669 | case Qtopia::HomeWebPage: | 669 | case Qtopia::HomeWebPage: |
670 | item.value = entry.homeWebpage(); | 670 | item.value = entry.homeWebpage(); |
671 | if ( !item.value.isEmpty() ) | 671 | if ( !item.value.isEmpty() ) |
672 | item.icon = Resource::loadPixmap( "addressbook/webpagehome" ); | 672 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagehome" ); |
673 | break; | 673 | break; |
674 | case Qtopia::Company: | 674 | case Qtopia::Company: |
675 | item.value = entry.company(); | 675 | item.value = entry.company(); |
676 | break; | 676 | break; |
677 | case Qtopia::BusinessCity: | 677 | case Qtopia::BusinessCity: |
678 | item.value = entry.businessCity(); | 678 | item.value = entry.businessCity(); |
679 | break; | 679 | break; |
680 | case Qtopia::BusinessStreet: | 680 | case Qtopia::BusinessStreet: |
681 | item.value = entry.businessStreet(); | 681 | item.value = entry.businessStreet(); |
682 | break; | 682 | break; |
683 | case Qtopia::BusinessZip: | 683 | case Qtopia::BusinessZip: |
684 | item.value = entry.businessZip(); | 684 | item.value = entry.businessZip(); |
685 | break; | 685 | break; |
686 | case Qtopia::BusinessCountry: | 686 | case Qtopia::BusinessCountry: |
687 | item.value = entry.businessCountry(); | 687 | item.value = entry.businessCountry(); |
688 | break; | 688 | break; |
689 | case Qtopia::BusinessWebPage: | 689 | case Qtopia::BusinessWebPage: |
690 | item.value = entry.businessWebpage(); | 690 | item.value = entry.businessWebpage(); |
691 | if ( !item.value.isEmpty() ) | 691 | if ( !item.value.isEmpty() ) |
692 | item.icon = Resource::loadPixmap( "addressbook/webpagework" ); | 692 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/webpagework" ); |
693 | break; | 693 | break; |
694 | case Qtopia::JobTitle: | 694 | case Qtopia::JobTitle: |
695 | item.value = entry.jobTitle(); | 695 | item.value = entry.jobTitle(); |
696 | break; | 696 | break; |
697 | case Qtopia::Department: | 697 | case Qtopia::Department: |
698 | item.value = entry.department(); | 698 | item.value = entry.department(); |
699 | break; | 699 | break; |
700 | case Qtopia::Office: | 700 | case Qtopia::Office: |
701 | item.value = entry.office(); | 701 | item.value = entry.office(); |
702 | break; | 702 | break; |
703 | case Qtopia::BusinessPhone: | 703 | case Qtopia::BusinessPhone: |
704 | item.value = entry.businessPhone(); | 704 | item.value = entry.businessPhone(); |
705 | if ( !item.value.isEmpty() ) | 705 | if ( !item.value.isEmpty() ) |
706 | item.icon = Resource::loadPixmap( "addressbook/phonework" ); | 706 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/phonework" ); |
707 | break; | 707 | break; |
708 | case Qtopia::BusinessFax: | 708 | case Qtopia::BusinessFax: |
709 | item.value = entry.businessFax(); | 709 | item.value = entry.businessFax(); |
710 | if ( !item.value.isEmpty() ) | 710 | if ( !item.value.isEmpty() ) |
711 | item.icon = Resource::loadPixmap( "addressbook/faxwork" ); | 711 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/faxwork" ); |
712 | break; | 712 | break; |
713 | case Qtopia::BusinessMobile: | 713 | case Qtopia::BusinessMobile: |
714 | item.value = entry.businessMobile(); | 714 | item.value = entry.businessMobile(); |
715 | if ( !item.value.isEmpty() ) | 715 | if ( !item.value.isEmpty() ) |
716 | item.icon = Resource::loadPixmap( "addressbook/mobilework" ); | 716 | item.icon = Opie::Core::OResource::loadPixmap( "addressbook/mobilework" ); |
717 | break; | 717 | break; |
718 | case Qtopia::BusinessPager: | 718 | case Qtopia::BusinessPager: |
719 | item.value = entry.businessPager(); | 719 | item.value = entry.businessPager(); |
720 | break; | 720 | break; |
721 | case Qtopia::Profession: | 721 | case Qtopia::Profession: |
722 | item.value = entry.profession(); | 722 | item.value = entry.profession(); |
723 | break; | 723 | break; |
724 | case Qtopia::Assistant: | 724 | case Qtopia::Assistant: |
725 | item.value = entry.assistant(); | 725 | item.value = entry.assistant(); |
726 | break; | 726 | break; |
727 | case Qtopia::Manager: | 727 | case Qtopia::Manager: |
728 | item.value = entry.manager(); | 728 | item.value = entry.manager(); |