-rw-r--r-- | kabc/addressee.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 3ce733d..568dfc4 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -1622,191 +1622,193 @@ Key Addressee::key( int type, QString customTypeString ) const | |||
1622 | if ( customTypeString.isEmpty() ) { | 1622 | if ( customTypeString.isEmpty() ) { |
1623 | return *it; | 1623 | return *it; |
1624 | } else { | 1624 | } else { |
1625 | if ( (*it).customTypeString() == customTypeString ) | 1625 | if ( (*it).customTypeString() == customTypeString ) |
1626 | return (*it); | 1626 | return (*it); |
1627 | } | 1627 | } |
1628 | } else { | 1628 | } else { |
1629 | return *it; | 1629 | return *it; |
1630 | } | 1630 | } |
1631 | } | 1631 | } |
1632 | } | 1632 | } |
1633 | return Key( QString(), type ); | 1633 | return Key( QString(), type ); |
1634 | } | 1634 | } |
1635 | void Addressee::setKeys( const Key::List& list ) { | 1635 | void Addressee::setKeys( const Key::List& list ) { |
1636 | detach(); | 1636 | detach(); |
1637 | mData->keys = list; | 1637 | mData->keys = list; |
1638 | } | 1638 | } |
1639 | 1639 | ||
1640 | Key::List Addressee::keys() const | 1640 | Key::List Addressee::keys() const |
1641 | { | 1641 | { |
1642 | return mData->keys; | 1642 | return mData->keys; |
1643 | } | 1643 | } |
1644 | 1644 | ||
1645 | Key::List Addressee::keys( int type, QString customTypeString ) const | 1645 | Key::List Addressee::keys( int type, QString customTypeString ) const |
1646 | { | 1646 | { |
1647 | Key::List list; | 1647 | Key::List list; |
1648 | 1648 | ||
1649 | Key::List::ConstIterator it; | 1649 | Key::List::ConstIterator it; |
1650 | for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { | 1650 | for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { |
1651 | if ( (*it).type() == type ) { | 1651 | if ( (*it).type() == type ) { |
1652 | if ( type == Key::Custom ) { | 1652 | if ( type == Key::Custom ) { |
1653 | if ( customTypeString.isEmpty() ) { | 1653 | if ( customTypeString.isEmpty() ) { |
1654 | list.append(*it); | 1654 | list.append(*it); |
1655 | } else { | 1655 | } else { |
1656 | if ( (*it).customTypeString() == customTypeString ) | 1656 | if ( (*it).customTypeString() == customTypeString ) |
1657 | list.append(*it); | 1657 | list.append(*it); |
1658 | } | 1658 | } |
1659 | } else { | 1659 | } else { |
1660 | list.append(*it); | 1660 | list.append(*it); |
1661 | } | 1661 | } |
1662 | } | 1662 | } |
1663 | } | 1663 | } |
1664 | return list; | 1664 | return list; |
1665 | } | 1665 | } |
1666 | 1666 | ||
1667 | Key Addressee::findKey( const QString &id ) const | 1667 | Key Addressee::findKey( const QString &id ) const |
1668 | { | 1668 | { |
1669 | Key::List::ConstIterator it; | 1669 | Key::List::ConstIterator it; |
1670 | for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { | 1670 | for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) { |
1671 | if ( (*it).id() == id ) { | 1671 | if ( (*it).id() == id ) { |
1672 | return *it; | 1672 | return *it; |
1673 | } | 1673 | } |
1674 | } | 1674 | } |
1675 | return Key(); | 1675 | return Key(); |
1676 | } | 1676 | } |
1677 | 1677 | ||
1678 | QString Addressee::asString() const | 1678 | QString Addressee::asString() const |
1679 | { | 1679 | { |
1680 | return "Smith, agent Smith..."; | 1680 | return "Smith, agent Smith..."; |
1681 | } | 1681 | } |
1682 | 1682 | ||
1683 | void Addressee::dump() const | 1683 | void Addressee::dump() const |
1684 | { | 1684 | { |
1685 | return; | 1685 | return; |
1686 | #if 0 | ||
1686 | kdDebug(5700) << "Addressee {" << endl; | 1687 | kdDebug(5700) << "Addressee {" << endl; |
1687 | 1688 | ||
1688 | kdDebug(5700) << " Uid: '" << uid() << "'" << endl; | 1689 | kdDebug(5700) << " Uid: '" << uid() << "'" << endl; |
1689 | 1690 | ||
1690 | kdDebug(5700) << " Name: '" << name() << "'" << endl; | 1691 | kdDebug(5700) << " Name: '" << name() << "'" << endl; |
1691 | kdDebug(5700) << " FormattedName: '" << formattedName() << "'" << endl; | 1692 | kdDebug(5700) << " FormattedName: '" << formattedName() << "'" << endl; |
1692 | kdDebug(5700) << " FamilyName: '" << familyName() << "'" << endl; | 1693 | kdDebug(5700) << " FamilyName: '" << familyName() << "'" << endl; |
1693 | kdDebug(5700) << " GivenName: '" << givenName() << "'" << endl; | 1694 | kdDebug(5700) << " GivenName: '" << givenName() << "'" << endl; |
1694 | kdDebug(5700) << " AdditionalName: '" << additionalName() << "'" << endl; | 1695 | kdDebug(5700) << " AdditionalName: '" << additionalName() << "'" << endl; |
1695 | kdDebug(5700) << " Prefix: '" << prefix() << "'" << endl; | 1696 | kdDebug(5700) << " Prefix: '" << prefix() << "'" << endl; |
1696 | kdDebug(5700) << " Suffix: '" << suffix() << "'" << endl; | 1697 | kdDebug(5700) << " Suffix: '" << suffix() << "'" << endl; |
1697 | kdDebug(5700) << " NickName: '" << nickName() << "'" << endl; | 1698 | kdDebug(5700) << " NickName: '" << nickName() << "'" << endl; |
1698 | kdDebug(5700) << " Birthday: '" << birthday().toString() << "'" << endl; | 1699 | kdDebug(5700) << " Birthday: '" << birthday().toString() << "'" << endl; |
1699 | kdDebug(5700) << " Mailer: '" << mailer() << "'" << endl; | 1700 | kdDebug(5700) << " Mailer: '" << mailer() << "'" << endl; |
1700 | kdDebug(5700) << " TimeZone: '" << timeZone().asString() << "'" << endl; | 1701 | kdDebug(5700) << " TimeZone: '" << timeZone().asString() << "'" << endl; |
1701 | kdDebug(5700) << " Geo: '" << geo().asString() << "'" << endl; | 1702 | kdDebug(5700) << " Geo: '" << geo().asString() << "'" << endl; |
1702 | kdDebug(5700) << " Title: '" << title() << "'" << endl; | 1703 | kdDebug(5700) << " Title: '" << title() << "'" << endl; |
1703 | kdDebug(5700) << " Role: '" << role() << "'" << endl; | 1704 | kdDebug(5700) << " Role: '" << role() << "'" << endl; |
1704 | kdDebug(5700) << " Organization: '" << organization() << "'" << endl; | 1705 | kdDebug(5700) << " Organization: '" << organization() << "'" << endl; |
1705 | kdDebug(5700) << " Note: '" << note() << "'" << endl; | 1706 | kdDebug(5700) << " Note: '" << note() << "'" << endl; |
1706 | kdDebug(5700) << " ProductId: '" << productId() << "'" << endl; | 1707 | kdDebug(5700) << " ProductId: '" << productId() << "'" << endl; |
1707 | kdDebug(5700) << " Revision: '" << revision().toString() << "'" << endl; | 1708 | kdDebug(5700) << " Revision: '" << revision().toString() << "'" << endl; |
1708 | kdDebug(5700) << " SortString: '" << sortString() << "'" << endl; | 1709 | kdDebug(5700) << " SortString: '" << sortString() << "'" << endl; |
1709 | kdDebug(5700) << " Url: '" << url().url() << "'" << endl; | 1710 | kdDebug(5700) << " Url: '" << url().url() << "'" << endl; |
1710 | kdDebug(5700) << " Secrecy: '" << secrecy().asString() << "'" << endl; | 1711 | kdDebug(5700) << " Secrecy: '" << secrecy().asString() << "'" << endl; |
1711 | kdDebug(5700) << " Logo: '" << logo().asString() << "'" << endl; | 1712 | kdDebug(5700) << " Logo: '" << logo().asString() << "'" << endl; |
1712 | kdDebug(5700) << " Photo: '" << photo().asString() << "'" << endl; | 1713 | kdDebug(5700) << " Photo: '" << photo().asString() << "'" << endl; |
1713 | kdDebug(5700) << " Sound: '" << sound().asString() << "'" << endl; | 1714 | kdDebug(5700) << " Sound: '" << sound().asString() << "'" << endl; |
1714 | kdDebug(5700) << " Agent: '" << agent().asString() << "'" << endl; | 1715 | kdDebug(5700) << " Agent: '" << agent().asString() << "'" << endl; |
1715 | 1716 | ||
1716 | kdDebug(5700) << " Emails {" << endl; | 1717 | kdDebug(5700) << " Emails {" << endl; |
1717 | QStringList e = emails(); | 1718 | QStringList e = emails(); |
1718 | QStringList::ConstIterator it; | 1719 | QStringList::ConstIterator it; |
1719 | for( it = e.begin(); it != e.end(); ++it ) { | 1720 | for( it = e.begin(); it != e.end(); ++it ) { |
1720 | kdDebug(5700) << " " << (*it) << endl; | 1721 | kdDebug(5700) << " " << (*it) << endl; |
1721 | } | 1722 | } |
1722 | kdDebug(5700) << " }" << endl; | 1723 | kdDebug(5700) << " }" << endl; |
1723 | 1724 | ||
1724 | kdDebug(5700) << " PhoneNumbers {" << endl; | 1725 | kdDebug(5700) << " PhoneNumbers {" << endl; |
1725 | PhoneNumber::List p = phoneNumbers(); | 1726 | PhoneNumber::List p = phoneNumbers(); |
1726 | PhoneNumber::List::ConstIterator it2; | 1727 | PhoneNumber::List::ConstIterator it2; |
1727 | for( it2 = p.begin(); it2 != p.end(); ++it2 ) { | 1728 | for( it2 = p.begin(); it2 != p.end(); ++it2 ) { |
1728 | kdDebug(5700) << " Type: " << int((*it2).type()) << " Number: " << (*it2).number() << endl; | 1729 | kdDebug(5700) << " Type: " << int((*it2).type()) << " Number: " << (*it2).number() << endl; |
1729 | } | 1730 | } |
1730 | kdDebug(5700) << " }" << endl; | 1731 | kdDebug(5700) << " }" << endl; |
1731 | 1732 | ||
1732 | Address::List a = addresses(); | 1733 | Address::List a = addresses(); |
1733 | Address::List::ConstIterator it3; | 1734 | Address::List::ConstIterator it3; |
1734 | for( it3 = a.begin(); it3 != a.end(); ++it3 ) { | 1735 | for( it3 = a.begin(); it3 != a.end(); ++it3 ) { |
1735 | (*it3).dump(); | 1736 | (*it3).dump(); |
1736 | } | 1737 | } |
1737 | 1738 | ||
1738 | kdDebug(5700) << " Keys {" << endl; | 1739 | kdDebug(5700) << " Keys {" << endl; |
1739 | Key::List k = keys(); | 1740 | Key::List k = keys(); |
1740 | Key::List::ConstIterator it4; | 1741 | Key::List::ConstIterator it4; |
1741 | for( it4 = k.begin(); it4 != k.end(); ++it4 ) { | 1742 | for( it4 = k.begin(); it4 != k.end(); ++it4 ) { |
1742 | kdDebug(5700) << " Type: " << int((*it4).type()) << | 1743 | kdDebug(5700) << " Type: " << int((*it4).type()) << |
1743 | " Key: " << (*it4).textData() << | 1744 | " Key: " << (*it4).textData() << |
1744 | " CustomString: " << (*it4).customTypeString() << endl; | 1745 | " CustomString: " << (*it4).customTypeString() << endl; |
1745 | } | 1746 | } |
1746 | kdDebug(5700) << " }" << endl; | 1747 | kdDebug(5700) << " }" << endl; |
1747 | 1748 | ||
1748 | kdDebug(5700) << "}" << endl; | 1749 | kdDebug(5700) << "}" << endl; |
1750 | #endif | ||
1749 | } | 1751 | } |
1750 | 1752 | ||
1751 | 1753 | ||
1752 | void Addressee::insertAddress( const Address &address ) | 1754 | void Addressee::insertAddress( const Address &address ) |
1753 | { | 1755 | { |
1754 | detach(); | 1756 | detach(); |
1755 | mData->empty = false; | 1757 | mData->empty = false; |
1756 | 1758 | ||
1757 | Address::List::Iterator it; | 1759 | Address::List::Iterator it; |
1758 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | 1760 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { |
1759 | if ( (*it).id() == address.id() ) { | 1761 | if ( (*it).id() == address.id() ) { |
1760 | *it = address; | 1762 | *it = address; |
1761 | return; | 1763 | return; |
1762 | } | 1764 | } |
1763 | } | 1765 | } |
1764 | mData->addresses.append( address ); | 1766 | mData->addresses.append( address ); |
1765 | } | 1767 | } |
1766 | 1768 | ||
1767 | void Addressee::removeAddress( const Address &address ) | 1769 | void Addressee::removeAddress( const Address &address ) |
1768 | { | 1770 | { |
1769 | detach(); | 1771 | detach(); |
1770 | 1772 | ||
1771 | Address::List::Iterator it; | 1773 | Address::List::Iterator it; |
1772 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | 1774 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { |
1773 | if ( (*it).id() == address.id() ) { | 1775 | if ( (*it).id() == address.id() ) { |
1774 | mData->addresses.remove( it ); | 1776 | mData->addresses.remove( it ); |
1775 | return; | 1777 | return; |
1776 | } | 1778 | } |
1777 | } | 1779 | } |
1778 | } | 1780 | } |
1779 | 1781 | ||
1780 | Address Addressee::address( int type ) const | 1782 | Address Addressee::address( int type ) const |
1781 | { | 1783 | { |
1782 | Address address( type ); | 1784 | Address address( type ); |
1783 | Address::List::ConstIterator it; | 1785 | Address::List::ConstIterator it; |
1784 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | 1786 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { |
1785 | if ( matchBinaryPatternA( (*it).type(), type ) ) { | 1787 | if ( matchBinaryPatternA( (*it).type(), type ) ) { |
1786 | if ( (*it).type() & Address::Pref ) | 1788 | if ( (*it).type() & Address::Pref ) |
1787 | return (*it); | 1789 | return (*it); |
1788 | else if ( address.isEmpty() ) | 1790 | else if ( address.isEmpty() ) |
1789 | address = (*it); | 1791 | address = (*it); |
1790 | } | 1792 | } |
1791 | } | 1793 | } |
1792 | 1794 | ||
1793 | return address; | 1795 | return address; |
1794 | } | 1796 | } |
1795 | 1797 | ||
1796 | Address::List Addressee::addresses() const | 1798 | Address::List Addressee::addresses() const |
1797 | { | 1799 | { |
1798 | return mData->addresses; | 1800 | return mData->addresses; |
1799 | } | 1801 | } |
1800 | 1802 | ||
1801 | Address::List Addressee::addresses( int type ) const | 1803 | Address::List Addressee::addresses( int type ) const |
1802 | { | 1804 | { |
1803 | Address::List list; | 1805 | Address::List list; |
1804 | 1806 | ||
1805 | Address::List::ConstIterator it; | 1807 | Address::List::ConstIterator it; |
1806 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { | 1808 | for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) { |
1807 | if ( matchBinaryPattern( (*it).type(), type ) ) { | 1809 | if ( matchBinaryPattern( (*it).type(), type ) ) { |
1808 | list.append( *it ); | 1810 | list.append( *it ); |
1809 | } | 1811 | } |
1810 | } | 1812 | } |
1811 | 1813 | ||
1812 | return list; | 1814 | return list; |