-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 | |||
@@ -35,6 +35,15 @@ QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>; | |||
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; |
@@ -43,12 +52,18 @@ public: | |||
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 ); } |
@@ -127,6 +142,11 @@ public: | |||
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 ); } |
@@ -196,9 +216,11 @@ public: | |||
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 | ||
@@ -215,6 +237,10 @@ public: | |||
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; |
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 | |||
@@ -35,6 +35,15 @@ QPC_TEMPLATEEXTERN template class QPC_EXPORT QMap<int, QString>; | |||
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; |
@@ -43,12 +52,18 @@ public: | |||
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 ); } |
@@ -127,6 +142,11 @@ public: | |||
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 ); } |
@@ -196,9 +216,11 @@ public: | |||
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 | ||
@@ -215,6 +237,10 @@ public: | |||
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; |