author | zautrix <zautrix> | 2004-10-09 16:58:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-09 16:58:08 (UTC) |
commit | 59ed933d6c43ecb0ddd3dec53cc289ee8aa68482 (patch) (unidiff) | |
tree | 8b1cbcf9c420e7dffd1e1293bcfa69e8e821f3fa /kabc/addressee.cpp | |
parent | b80a099d9432bdc3d4eea778b1813b82b2680ecf (diff) | |
download | kdepimpi-59ed933d6c43ecb0ddd3dec53cc289ee8aa68482.zip kdepimpi-59ed933d6c43ecb0ddd3dec53cc289ee8aa68482.tar.gz kdepimpi-59ed933d6c43ecb0ddd3dec53cc289ee8aa68482.tar.bz2 |
fixed sync bug
-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 | |||
@@ -67,48 +67,49 @@ struct Addressee::AddresseeData : public KShared | |||
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 | { |
@@ -1800,48 +1801,59 @@ void Addressee::setResource( 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; |