-rw-r--r-- | kabc/addressee.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 3f3d5c0..607ae26 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -43,96 +43,97 @@ $Id$ | |||
43 | using namespace KABC; | 43 | using namespace KABC; |
44 | 44 | ||
45 | static bool matchBinaryPattern( int value, int pattern ); | 45 | static bool matchBinaryPattern( int value, int pattern ); |
46 | static bool matchBinaryPatternA( int value, int pattern ); | 46 | static bool matchBinaryPatternA( int value, int pattern ); |
47 | static bool matchBinaryPatternP( int value, int pattern ); | 47 | static bool matchBinaryPatternP( int value, int pattern ); |
48 | 48 | ||
49 | struct Addressee::AddresseeData : public KShared | 49 | struct Addressee::AddresseeData : public KShared |
50 | { | 50 | { |
51 | QString uid; | 51 | QString uid; |
52 | QString name; | 52 | QString name; |
53 | QString formattedName; | 53 | QString formattedName; |
54 | QString familyName; | 54 | QString familyName; |
55 | QString givenName; | 55 | QString givenName; |
56 | QString additionalName; | 56 | QString additionalName; |
57 | QString prefix; | 57 | QString prefix; |
58 | QString suffix; | 58 | QString suffix; |
59 | QString nickName; | 59 | QString nickName; |
60 | QDateTime birthday; | 60 | QDateTime birthday; |
61 | QString mailer; | 61 | QString mailer; |
62 | TimeZone timeZone; | 62 | TimeZone timeZone; |
63 | Geo geo; | 63 | Geo geo; |
64 | QString title; | 64 | QString title; |
65 | QString role; | 65 | QString role; |
66 | QString organization; | 66 | QString organization; |
67 | QString note; | 67 | QString note; |
68 | QString productId; | 68 | QString productId; |
69 | QDateTime revision; | 69 | QDateTime revision; |
70 | QString sortString; | 70 | QString sortString; |
71 | QString externalUID; | 71 | QString externalUID; |
72 | QString originalExternalUID; | 72 | QString originalExternalUID; |
73 | KURL url; | 73 | KURL url; |
74 | Secrecy secrecy; | 74 | Secrecy secrecy; |
75 | Picture logo; | 75 | Picture logo; |
76 | Picture photo; | 76 | Picture photo; |
77 | Sound sound; | 77 | Sound sound; |
78 | Agent agent; | 78 | Agent agent; |
79 | QString mExternalId; | 79 | QString mExternalId; |
80 | PhoneNumber::List phoneNumbers; | 80 | PhoneNumber::List phoneNumbers; |
81 | Address::List addresses; | 81 | Address::List addresses; |
82 | Key::List keys; | 82 | Key::List keys; |
83 | QStringList emails; | 83 | QStringList emails; |
84 | QStringList categories; | 84 | QStringList categories; |
85 | QStringList custom; | 85 | QStringList custom; |
86 | int mTempSyncStat; | 86 | int mTempSyncStat; |
87 | Resource *resource; | 87 | Resource *resource; |
88 | 88 | ||
89 | bool empty :1; | 89 | bool empty :1; |
90 | bool changed :1; | 90 | bool changed :1; |
91 | bool tagged :1; | ||
91 | }; | 92 | }; |
92 | 93 | ||
93 | Addressee::Addressee() | 94 | Addressee::Addressee() |
94 | { | 95 | { |
95 | mData = new AddresseeData; | 96 | mData = new AddresseeData; |
96 | mData->empty = true; | 97 | mData->empty = true; |
97 | mData->changed = false; | 98 | mData->changed = false; |
98 | mData->resource = 0; | 99 | mData->resource = 0; |
99 | mData->mExternalId = ":"; | 100 | mData->mExternalId = ":"; |
100 | mData->revision = QDateTime ( QDate( 2003,1,1)); | 101 | mData->revision = QDateTime ( QDate( 2003,1,1)); |
101 | mData->mTempSyncStat = SYNC_TEMPSTATE_INITIAL; | 102 | mData->mTempSyncStat = SYNC_TEMPSTATE_INITIAL; |
102 | } | 103 | } |
103 | 104 | ||
104 | Addressee::~Addressee() | 105 | Addressee::~Addressee() |
105 | { | 106 | { |
106 | } | 107 | } |
107 | 108 | ||
108 | Addressee::Addressee( const Addressee &a ) | 109 | Addressee::Addressee( const Addressee &a ) |
109 | { | 110 | { |
110 | mData = a.mData; | 111 | mData = a.mData; |
111 | } | 112 | } |
112 | 113 | ||
113 | Addressee &Addressee::operator=( const Addressee &a ) | 114 | Addressee &Addressee::operator=( const Addressee &a ) |
114 | { | 115 | { |
115 | mData = a.mData; | 116 | mData = a.mData; |
116 | return (*this); | 117 | return (*this); |
117 | } | 118 | } |
118 | 119 | ||
119 | Addressee Addressee::copy() | 120 | Addressee Addressee::copy() |
120 | { | 121 | { |
121 | Addressee a; | 122 | Addressee a; |
122 | *(a.mData) = *mData; | 123 | *(a.mData) = *mData; |
123 | return a; | 124 | return a; |
124 | } | 125 | } |
125 | 126 | ||
126 | void Addressee::detach() | 127 | void Addressee::detach() |
127 | { | 128 | { |
128 | if ( mData.count() == 1 ) return; | 129 | if ( mData.count() == 1 ) return; |
129 | *this = copy(); | 130 | *this = copy(); |
130 | } | 131 | } |
131 | 132 | ||
132 | bool Addressee::operator==( const Addressee &a ) const | 133 | bool Addressee::operator==( const Addressee &a ) const |
133 | { | 134 | { |
134 | if ( uid() != a.uid() ) return false; | 135 | if ( uid() != a.uid() ) return false; |
135 | if ( mData->name != a.mData->name ) return false; | 136 | if ( mData->name != a.mData->name ) return false; |
136 | if ( mData->formattedName != a.mData->formattedName ) return false; | 137 | if ( mData->formattedName != a.mData->formattedName ) return false; |
137 | if ( mData->familyName != a.mData->familyName ) return false; | 138 | if ( mData->familyName != a.mData->familyName ) return false; |
138 | if ( mData->givenName != a.mData->givenName ) return false; | 139 | if ( mData->givenName != a.mData->givenName ) return false; |
@@ -1776,96 +1777,107 @@ void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName, | |||
1776 | 1777 | ||
1777 | // Grab the name part | 1778 | // Grab the name part |
1778 | fullName = rawEmail.left(startPos).stripWhiteSpace(); | 1779 | fullName = rawEmail.left(startPos).stripWhiteSpace(); |
1779 | 1780 | ||
1780 | // grab the email part | 1781 | // grab the email part |
1781 | email = rawEmail.mid(startPos+1, endPos-startPos-1).stripWhiteSpace(); | 1782 | email = rawEmail.mid(startPos+1, endPos-startPos-1).stripWhiteSpace(); |
1782 | 1783 | ||
1783 | // Check that we do not have any extra characters on the end of the | 1784 | // Check that we do not have any extra characters on the end of the |
1784 | // strings | 1785 | // strings |
1785 | len = fullName.length(); | 1786 | len = fullName.length(); |
1786 | if (fullName[0]=='"' && fullName[len-1]=='"') | 1787 | if (fullName[0]=='"' && fullName[len-1]=='"') |
1787 | fullName = fullName.mid(1, len-2); | 1788 | fullName = fullName.mid(1, len-2); |
1788 | else if (fullName[0]=='<' && fullName[len-1]=='>') | 1789 | else if (fullName[0]=='<' && fullName[len-1]=='>') |
1789 | fullName = fullName.mid(1, len-2); | 1790 | fullName = fullName.mid(1, len-2); |
1790 | else if (fullName[0]=='(' && fullName[len-1]==')') | 1791 | else if (fullName[0]=='(' && fullName[len-1]==')') |
1791 | fullName = fullName.mid(1, len-2); | 1792 | fullName = fullName.mid(1, len-2); |
1792 | } | 1793 | } |
1793 | } | 1794 | } |
1794 | } | 1795 | } |
1795 | 1796 | ||
1796 | void Addressee::setResource( Resource *resource ) | 1797 | void Addressee::setResource( Resource *resource ) |
1797 | { | 1798 | { |
1798 | detach(); | 1799 | detach(); |
1799 | mData->resource = resource; | 1800 | mData->resource = resource; |
1800 | } | 1801 | } |
1801 | 1802 | ||
1802 | Resource *Addressee::resource() const | 1803 | Resource *Addressee::resource() const |
1803 | { | 1804 | { |
1804 | return mData->resource; | 1805 | return mData->resource; |
1805 | } | 1806 | } |
1806 | 1807 | ||
1807 | //US | 1808 | //US |
1808 | QString Addressee::resourceLabel() | 1809 | QString Addressee::resourceLabel() |
1809 | { | 1810 | { |
1810 | return i18n("Resource"); | 1811 | return i18n("Resource"); |
1811 | } | 1812 | } |
1812 | 1813 | ||
1813 | void Addressee::setChanged( bool value ) | 1814 | void Addressee::setChanged( bool value ) |
1814 | { | 1815 | { |
1815 | detach(); | 1816 | detach(); |
1816 | mData->changed = value; | 1817 | mData->changed = value; |
1817 | } | 1818 | } |
1818 | 1819 | ||
1819 | bool Addressee::changed() const | 1820 | bool Addressee::changed() const |
1820 | { | 1821 | { |
1821 | return mData->changed; | 1822 | return mData->changed; |
1822 | } | 1823 | } |
1823 | 1824 | ||
1825 | void Addressee::setTagged( bool value ) | ||
1826 | { | ||
1827 | detach(); | ||
1828 | mData->tagged = value; | ||
1829 | } | ||
1830 | |||
1831 | bool Addressee::tagged() const | ||
1832 | { | ||
1833 | return mData->tagged; | ||
1834 | } | ||
1835 | |||
1824 | QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a ) | 1836 | QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a ) |
1825 | { | 1837 | { |
1826 | if (!a.mData) return s; | 1838 | if (!a.mData) return s; |
1827 | 1839 | ||
1828 | s << a.uid(); | 1840 | s << a.uid(); |
1829 | 1841 | ||
1830 | s << a.mData->name; | 1842 | s << a.mData->name; |
1831 | s << a.mData->formattedName; | 1843 | s << a.mData->formattedName; |
1832 | s << a.mData->familyName; | 1844 | s << a.mData->familyName; |
1833 | s << a.mData->givenName; | 1845 | s << a.mData->givenName; |
1834 | s << a.mData->additionalName; | 1846 | s << a.mData->additionalName; |
1835 | s << a.mData->prefix; | 1847 | s << a.mData->prefix; |
1836 | s << a.mData->suffix; | 1848 | s << a.mData->suffix; |
1837 | s << a.mData->nickName; | 1849 | s << a.mData->nickName; |
1838 | s << a.mData->birthday; | 1850 | s << a.mData->birthday; |
1839 | s << a.mData->mailer; | 1851 | s << a.mData->mailer; |
1840 | s << a.mData->timeZone; | 1852 | s << a.mData->timeZone; |
1841 | s << a.mData->geo; | 1853 | s << a.mData->geo; |
1842 | s << a.mData->title; | 1854 | s << a.mData->title; |
1843 | s << a.mData->role; | 1855 | s << a.mData->role; |
1844 | s << a.mData->organization; | 1856 | s << a.mData->organization; |
1845 | s << a.mData->note; | 1857 | s << a.mData->note; |
1846 | s << a.mData->productId; | 1858 | s << a.mData->productId; |
1847 | s << a.mData->revision; | 1859 | s << a.mData->revision; |
1848 | s << a.mData->sortString; | 1860 | s << a.mData->sortString; |
1849 | s << a.mData->url; | 1861 | s << a.mData->url; |
1850 | s << a.mData->secrecy; | 1862 | s << a.mData->secrecy; |
1851 | s << a.mData->logo; | 1863 | s << a.mData->logo; |
1852 | s << a.mData->photo; | 1864 | s << a.mData->photo; |
1853 | s << a.mData->sound; | 1865 | s << a.mData->sound; |
1854 | s << a.mData->agent; | 1866 | s << a.mData->agent; |
1855 | s << a.mData->phoneNumbers; | 1867 | s << a.mData->phoneNumbers; |
1856 | s << a.mData->addresses; | 1868 | s << a.mData->addresses; |
1857 | s << a.mData->emails; | 1869 | s << a.mData->emails; |
1858 | s << a.mData->categories; | 1870 | s << a.mData->categories; |
1859 | s << a.mData->custom; | 1871 | s << a.mData->custom; |
1860 | s << a.mData->keys; | 1872 | s << a.mData->keys; |
1861 | return s; | 1873 | return s; |
1862 | } | 1874 | } |
1863 | 1875 | ||
1864 | QDataStream &KABC::operator>>( QDataStream &s, Addressee &a ) | 1876 | QDataStream &KABC::operator>>( QDataStream &s, Addressee &a ) |
1865 | { | 1877 | { |
1866 | if (!a.mData) return s; | 1878 | if (!a.mData) return s; |
1867 | 1879 | ||
1868 | s >> a.mData->uid; | 1880 | s >> a.mData->uid; |
1869 | 1881 | ||
1870 | s >> a.mData->name; | 1882 | s >> a.mData->name; |
1871 | s >> a.mData->formattedName; | 1883 | s >> a.mData->formattedName; |