author | zecke <zecke> | 2002-11-15 10:53:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-11-15 10:53:42 (UTC) |
commit | dc68676392f6ac7cced3a9b004fe72a8b408812f (patch) (unidiff) | |
tree | d74a42aef53b57edb9d452806b34695c591f8252 | |
parent | 5fac1f8271dc037d8d3a3a765bccc44c4734e544 (diff) | |
download | opie-dc68676392f6ac7cced3a9b004fe72a8b408812f.zip opie-dc68676392f6ac7cced3a9b004fe72a8b408812f.tar.gz opie-dc68676392f6ac7cced3a9b004fe72a8b408812f.tar.bz2 |
API REVIEW added
Simon if you read that feel free to do an API REVIEW
on libopie but leave out OFileSelector for now...
Stefan: added an explanation for you
-rw-r--r-- | libopie/pim/ocontact.h | 26 | ||||
-rw-r--r-- | libopie2/opiepim/ocontact.h | 26 |
2 files changed, 52 insertions, 0 deletions
diff --git a/libopie/pim/ocontact.h b/libopie/pim/ocontact.h index 81ac1c1..9643e8b 100644 --- a/libopie/pim/ocontact.h +++ b/libopie/pim/ocontact.h | |||
@@ -30,30 +30,45 @@ | |||
30 | 30 | ||
31 | #if defined(QPC_TEMPLATEDLL) | 31 | #if defined(QPC_TEMPLATEDLL) |
32 | // MOC_SKIP_BEGIN | 32 | // MOC_SKIP_BEGIN |
33 | QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>; | 33 | QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>; |
34 | // MOC_SKIP_END | 34 | // MOC_SKIP_END |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | class ContactPrivate; // Wozu ist das gut und wo ist das decrariert ? (se) | 37 | class ContactPrivate; // Wozu ist das gut und wo ist das decrariert ? (se) |
38 | /* Stefan das ist eine forward declaration | ||
39 | * dann machst du in der private section | ||
40 | * ContactPrivate *d; | ||
41 | * | ||
42 | * und wenn du bei Opie1.1 was hinzufuegen moechtest | ||
43 | * packst du es in ContactPrivate damit Opie | ||
44 | * binaer kompatibel bleibt | ||
45 | * -zecke | ||
46 | */ | ||
38 | class QPC_EXPORT OContact : public OPimRecord | 47 | class QPC_EXPORT OContact : public OPimRecord |
39 | { | 48 | { |
40 | friend class DataSet; | 49 | friend class DataSet; |
41 | public: | 50 | public: |
42 | OContact(); | 51 | OContact(); |
43 | OContact( const QMap<int, QString> &fromMap ); | 52 | OContact( const QMap<int, QString> &fromMap ); |
44 | virtual ~OContact(); | 53 | virtual ~OContact(); |
45 | 54 | ||
55 | /* VCARD stuff should vanish! -zecke */ | ||
46 | static void writeVCard( const QString &filename, const QValueList<OContact> &contacts); | 56 | static void writeVCard( const QString &filename, const QValueList<OContact> &contacts); |
47 | static void writeVCard( const QString &filename, const OContact &c ); | 57 | static void writeVCard( const QString &filename, const OContact &c ); |
48 | static QValueList<OContact> readVCard( const QString &filename ); | 58 | static QValueList<OContact> readVCard( const QString &filename ); |
49 | 59 | ||
50 | enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE }; | 60 | enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE }; |
51 | 61 | ||
62 | /* | ||
63 | * do we need to inline them | ||
64 | * if yes do we need to inline them this way? | ||
65 | * -zecke | ||
66 | */ | ||
52 | void setTitle( const QString &v ) { replace( Qtopia::Title, v ); } | 67 | void setTitle( const QString &v ) { replace( Qtopia::Title, v ); } |
53 | void setFirstName( const QString &v ) { replace( Qtopia::FirstName, v ); } | 68 | void setFirstName( const QString &v ) { replace( Qtopia::FirstName, v ); } |
54 | void setMiddleName( const QString &v ) { replace( Qtopia::MiddleName, v ); } | 69 | void setMiddleName( const QString &v ) { replace( Qtopia::MiddleName, v ); } |
55 | void setLastName( const QString &v ) { replace( Qtopia::LastName, v ); } | 70 | void setLastName( const QString &v ) { replace( Qtopia::LastName, v ); } |
56 | void setSuffix( const QString &v ) { replace( Qtopia::Suffix, v ); } | 71 | void setSuffix( const QString &v ) { replace( Qtopia::Suffix, v ); } |
57 | void setFileAs( const QString &v ) { replace( Qtopia::FileAs, v ); } | 72 | void setFileAs( const QString &v ) { replace( Qtopia::FileAs, v ); } |
58 | void setFileAs(); | 73 | void setFileAs(); |
59 | 74 | ||
@@ -122,16 +137,21 @@ public: | |||
122 | QString suffix() const { return find( Qtopia::Suffix ); } | 137 | QString suffix() const { return find( Qtopia::Suffix ); } |
123 | QString fileAs() const { return find( Qtopia::FileAs ); } | 138 | QString fileAs() const { return find( Qtopia::FileAs ); } |
124 | 139 | ||
125 | 140 | ||
126 | QString defaultEmail() const { return find( Qtopia::DefaultEmail ); } | 141 | QString defaultEmail() const { return find( Qtopia::DefaultEmail ); } |
127 | QStringList emailList() const; | 142 | QStringList emailList() const; |
128 | 143 | ||
129 | // home | 144 | // home |
145 | /* | ||
146 | * OPimAddress address(enum Location)const; | ||
147 | * would be some how nicer... | ||
148 | * -zecke | ||
149 | */ | ||
130 | QString homeStreet() const { return find( Qtopia::HomeStreet ); } | 150 | QString homeStreet() const { return find( Qtopia::HomeStreet ); } |
131 | QString homeCity() const { return find( Qtopia::HomeCity ); } | 151 | QString homeCity() const { return find( Qtopia::HomeCity ); } |
132 | QString homeState() const { return find( Qtopia::HomeState ); } | 152 | QString homeState() const { return find( Qtopia::HomeState ); } |
133 | QString homeZip() const { return find( Qtopia::HomeZip ); } | 153 | QString homeZip() const { return find( Qtopia::HomeZip ); } |
134 | QString homeCountry() const { return find( Qtopia::HomeCountry ); } | 154 | QString homeCountry() const { return find( Qtopia::HomeCountry ); } |
135 | QString homePhone() const { return find( Qtopia::HomePhone ); } | 155 | QString homePhone() const { return find( Qtopia::HomePhone ); } |
136 | QString homeFax() const { return find( Qtopia::HomeFax ); } | 156 | QString homeFax() const { return find( Qtopia::HomeFax ); } |
137 | QString homeMobile() const { return find( Qtopia::HomeMobile ); } | 157 | QString homeMobile() const { return find( Qtopia::HomeMobile ); } |
@@ -191,35 +211,41 @@ public: | |||
191 | static QStringList untrfields(); | 211 | static QStringList untrfields(); |
192 | 212 | ||
193 | QString toRichText() const; | 213 | QString toRichText() const; |
194 | QMap<int, QString> toMap() const; | 214 | QMap<int, QString> toMap() const; |
195 | QString field( int key ) const { return find( key ); } | 215 | QString field( int key ) const { return find( key ); } |
196 | 216 | ||
197 | 217 | ||
198 | // journaling... | 218 | // journaling... |
219 | /* do we still need them? Stefan your backend takes care of these -zecke */ | ||
199 | void saveJournal( journal_action action, const QString &key = QString::null ); | 220 | void saveJournal( journal_action action, const QString &key = QString::null ); |
200 | void save( QString &buf ) const; | 221 | void save( QString &buf ) const; |
201 | 222 | ||
223 | /* we shouldn't inline this one -zecke */ | ||
202 | void setUid( int i ) | 224 | void setUid( int i ) |
203 | { OPimRecord::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); } | 225 | { OPimRecord::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); } |
204 | 226 | ||
205 | QString toShortText()const; | 227 | QString toShortText()const; |
206 | QString OContact::type()const; | 228 | QString OContact::type()const; |
207 | QMap<QString,QString> OContact::toExtraMap() const; | 229 | QMap<QString,QString> OContact::toExtraMap() const; |
208 | class QString OContact::recordField(int) const; | 230 | class QString OContact::recordField(int) const; |
209 | 231 | ||
210 | // Why private ? (eilers,se) | 232 | // Why private ? (eilers,se) |
211 | QString emailSeparator() const { return " "; } | 233 | QString emailSeparator() const { return " "; } |
212 | // the emails should be seperated by a comma | 234 | // the emails should be seperated by a comma |
213 | void setEmails( const QString &v ); | 235 | void setEmails( const QString &v ); |
214 | QString emails() const { return find( Qtopia::Emails ); } | 236 | QString emails() const { return find( Qtopia::Emails ); } |
215 | 237 | ||
216 | 238 | ||
217 | private: | 239 | private: |
240 | /* I do not like friends ;) | ||
241 | * besides that I think we do not need them | ||
242 | * anymore -zecke | ||
243 | */ | ||
218 | friend class AbEditor; | 244 | friend class AbEditor; |
219 | friend class AbTable; | 245 | friend class AbTable; |
220 | friend class AddressBookAccessPrivate; | 246 | friend class AddressBookAccessPrivate; |
221 | friend class XMLIO; | 247 | friend class XMLIO; |
222 | 248 | ||
223 | void insert( int key, const QString &value ); | 249 | void insert( int key, const QString &value ); |
224 | void replace( int key, const QString &value ); | 250 | void replace( int key, const QString &value ); |
225 | QString find( int key ) const; | 251 | QString find( int key ) const; |
diff --git a/libopie2/opiepim/ocontact.h b/libopie2/opiepim/ocontact.h index 81ac1c1..9643e8b 100644 --- a/libopie2/opiepim/ocontact.h +++ b/libopie2/opiepim/ocontact.h | |||
@@ -30,30 +30,45 @@ | |||
30 | 30 | ||
31 | #if defined(QPC_TEMPLATEDLL) | 31 | #if defined(QPC_TEMPLATEDLL) |
32 | // MOC_SKIP_BEGIN | 32 | // MOC_SKIP_BEGIN |
33 | QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>; | 33 | QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>; |
34 | // MOC_SKIP_END | 34 | // MOC_SKIP_END |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | class ContactPrivate; // Wozu ist das gut und wo ist das decrariert ? (se) | 37 | class ContactPrivate; // Wozu ist das gut und wo ist das decrariert ? (se) |
38 | /* Stefan das ist eine forward declaration | ||
39 | * dann machst du in der private section | ||
40 | * ContactPrivate *d; | ||
41 | * | ||
42 | * und wenn du bei Opie1.1 was hinzufuegen moechtest | ||
43 | * packst du es in ContactPrivate damit Opie | ||
44 | * binaer kompatibel bleibt | ||
45 | * -zecke | ||
46 | */ | ||
38 | class QPC_EXPORT OContact : public OPimRecord | 47 | class QPC_EXPORT OContact : public OPimRecord |
39 | { | 48 | { |
40 | friend class DataSet; | 49 | friend class DataSet; |
41 | public: | 50 | public: |
42 | OContact(); | 51 | OContact(); |
43 | OContact( const QMap<int, QString> &fromMap ); | 52 | OContact( const QMap<int, QString> &fromMap ); |
44 | virtual ~OContact(); | 53 | virtual ~OContact(); |
45 | 54 | ||
55 | /* VCARD stuff should vanish! -zecke */ | ||
46 | static void writeVCard( const QString &filename, const QValueList<OContact> &contacts); | 56 | static void writeVCard( const QString &filename, const QValueList<OContact> &contacts); |
47 | static void writeVCard( const QString &filename, const OContact &c ); | 57 | static void writeVCard( const QString &filename, const OContact &c ); |
48 | static QValueList<OContact> readVCard( const QString &filename ); | 58 | static QValueList<OContact> readVCard( const QString &filename ); |
49 | 59 | ||
50 | enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE }; | 60 | enum journal_action { ACTION_ADD, ACTION_REMOVE, ACTION_REPLACE }; |
51 | 61 | ||
62 | /* | ||
63 | * do we need to inline them | ||
64 | * if yes do we need to inline them this way? | ||
65 | * -zecke | ||
66 | */ | ||
52 | void setTitle( const QString &v ) { replace( Qtopia::Title, v ); } | 67 | void setTitle( const QString &v ) { replace( Qtopia::Title, v ); } |
53 | void setFirstName( const QString &v ) { replace( Qtopia::FirstName, v ); } | 68 | void setFirstName( const QString &v ) { replace( Qtopia::FirstName, v ); } |
54 | void setMiddleName( const QString &v ) { replace( Qtopia::MiddleName, v ); } | 69 | void setMiddleName( const QString &v ) { replace( Qtopia::MiddleName, v ); } |
55 | void setLastName( const QString &v ) { replace( Qtopia::LastName, v ); } | 70 | void setLastName( const QString &v ) { replace( Qtopia::LastName, v ); } |
56 | void setSuffix( const QString &v ) { replace( Qtopia::Suffix, v ); } | 71 | void setSuffix( const QString &v ) { replace( Qtopia::Suffix, v ); } |
57 | void setFileAs( const QString &v ) { replace( Qtopia::FileAs, v ); } | 72 | void setFileAs( const QString &v ) { replace( Qtopia::FileAs, v ); } |
58 | void setFileAs(); | 73 | void setFileAs(); |
59 | 74 | ||
@@ -122,16 +137,21 @@ public: | |||
122 | QString suffix() const { return find( Qtopia::Suffix ); } | 137 | QString suffix() const { return find( Qtopia::Suffix ); } |
123 | QString fileAs() const { return find( Qtopia::FileAs ); } | 138 | QString fileAs() const { return find( Qtopia::FileAs ); } |
124 | 139 | ||
125 | 140 | ||
126 | QString defaultEmail() const { return find( Qtopia::DefaultEmail ); } | 141 | QString defaultEmail() const { return find( Qtopia::DefaultEmail ); } |
127 | QStringList emailList() const; | 142 | QStringList emailList() const; |
128 | 143 | ||
129 | // home | 144 | // home |
145 | /* | ||
146 | * OPimAddress address(enum Location)const; | ||
147 | * would be some how nicer... | ||
148 | * -zecke | ||
149 | */ | ||
130 | QString homeStreet() const { return find( Qtopia::HomeStreet ); } | 150 | QString homeStreet() const { return find( Qtopia::HomeStreet ); } |
131 | QString homeCity() const { return find( Qtopia::HomeCity ); } | 151 | QString homeCity() const { return find( Qtopia::HomeCity ); } |
132 | QString homeState() const { return find( Qtopia::HomeState ); } | 152 | QString homeState() const { return find( Qtopia::HomeState ); } |
133 | QString homeZip() const { return find( Qtopia::HomeZip ); } | 153 | QString homeZip() const { return find( Qtopia::HomeZip ); } |
134 | QString homeCountry() const { return find( Qtopia::HomeCountry ); } | 154 | QString homeCountry() const { return find( Qtopia::HomeCountry ); } |
135 | QString homePhone() const { return find( Qtopia::HomePhone ); } | 155 | QString homePhone() const { return find( Qtopia::HomePhone ); } |
136 | QString homeFax() const { return find( Qtopia::HomeFax ); } | 156 | QString homeFax() const { return find( Qtopia::HomeFax ); } |
137 | QString homeMobile() const { return find( Qtopia::HomeMobile ); } | 157 | QString homeMobile() const { return find( Qtopia::HomeMobile ); } |
@@ -191,35 +211,41 @@ public: | |||
191 | static QStringList untrfields(); | 211 | static QStringList untrfields(); |
192 | 212 | ||
193 | QString toRichText() const; | 213 | QString toRichText() const; |
194 | QMap<int, QString> toMap() const; | 214 | QMap<int, QString> toMap() const; |
195 | QString field( int key ) const { return find( key ); } | 215 | QString field( int key ) const { return find( key ); } |
196 | 216 | ||
197 | 217 | ||
198 | // journaling... | 218 | // journaling... |
219 | /* do we still need them? Stefan your backend takes care of these -zecke */ | ||
199 | void saveJournal( journal_action action, const QString &key = QString::null ); | 220 | void saveJournal( journal_action action, const QString &key = QString::null ); |
200 | void save( QString &buf ) const; | 221 | void save( QString &buf ) const; |
201 | 222 | ||
223 | /* we shouldn't inline this one -zecke */ | ||
202 | void setUid( int i ) | 224 | void setUid( int i ) |
203 | { OPimRecord::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); } | 225 | { OPimRecord::setUid(i); replace( Qtopia::AddressUid , QString::number(i)); } |
204 | 226 | ||
205 | QString toShortText()const; | 227 | QString toShortText()const; |
206 | QString OContact::type()const; | 228 | QString OContact::type()const; |
207 | QMap<QString,QString> OContact::toExtraMap() const; | 229 | QMap<QString,QString> OContact::toExtraMap() const; |
208 | class QString OContact::recordField(int) const; | 230 | class QString OContact::recordField(int) const; |
209 | 231 | ||
210 | // Why private ? (eilers,se) | 232 | // Why private ? (eilers,se) |
211 | QString emailSeparator() const { return " "; } | 233 | QString emailSeparator() const { return " "; } |
212 | // the emails should be seperated by a comma | 234 | // the emails should be seperated by a comma |
213 | void setEmails( const QString &v ); | 235 | void setEmails( const QString &v ); |
214 | QString emails() const { return find( Qtopia::Emails ); } | 236 | QString emails() const { return find( Qtopia::Emails ); } |
215 | 237 | ||
216 | 238 | ||
217 | private: | 239 | private: |
240 | /* I do not like friends ;) | ||
241 | * besides that I think we do not need them | ||
242 | * anymore -zecke | ||
243 | */ | ||
218 | friend class AbEditor; | 244 | friend class AbEditor; |
219 | friend class AbTable; | 245 | friend class AbTable; |
220 | friend class AddressBookAccessPrivate; | 246 | friend class AddressBookAccessPrivate; |
221 | friend class XMLIO; | 247 | friend class XMLIO; |
222 | 248 | ||
223 | void insert( int key, const QString &value ); | 249 | void insert( int key, const QString &value ); |
224 | void replace( int key, const QString &value ); | 250 | void replace( int key, const QString &value ); |
225 | QString find( int key ) const; | 251 | QString find( int key ) const; |