author | eilers <eilers> | 2004-05-04 18:50:47 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-05-04 18:50:47 (UTC) |
commit | fa24fb520b91f060b8bd7d6f756a8e7f1b809e1b (patch) (unidiff) | |
tree | 561073a52f13bee6bf1bd59bceafbcb8c3c537bc /libopie2 | |
parent | f1a3fc696787ae946464469b3f252aa425dbe51b (diff) | |
download | opie-fa24fb520b91f060b8bd7d6f756a8e7f1b809e1b.zip opie-fa24fb520b91f060b8bd7d6f756a8e7f1b809e1b.tar.gz opie-fa24fb520b91f060b8bd7d6f756a8e7f1b809e1b.tar.bz2 |
OOps.. Forgot to commit modification of rtti from static to nonstatic (virtual)
-rw-r--r-- | libopie2/opiepim/TODO | 3 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimcontact.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimcontact.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimevent.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimevent.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimrecord.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimrecord.h | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimtodo.cpp | 2 | ||||
-rw-r--r-- | libopie2/opiepim/core/opimtodo.h | 2 |
9 files changed, 11 insertions, 8 deletions
diff --git a/libopie2/opiepim/TODO b/libopie2/opiepim/TODO index cdde11c..c3420cf 100644 --- a/libopie2/opiepim/TODO +++ b/libopie2/opiepim/TODO | |||
@@ -1,12 +1,15 @@ | |||
1 | As to popular request.... | 1 | As to popular request.... |
2 | 2 | ||
3 | 1.) fix up the core/backend mess. | 3 | 1.) fix up the core/backend mess. |
4 | The actual Backend Implementation + Interface should be there | 4 | The actual Backend Implementation + Interface should be there |
5 | The API frontend used by the developer should not be used | 5 | The API frontend used by the developer should not be used |
6 | 6 | ||
7 | Rename ODateBookAccess* to OPimDateBookAccess* | ||
8 | Fix filenames to OPim* ... | ||
9 | |||
7 | 2.) Move sorting, Query By Example, Exposing of Attributes of a Record | 10 | 2.) Move sorting, Query By Example, Exposing of Attributes of a Record |
8 | available to the Ptr base class and have sane implementation | 11 | available to the Ptr base class and have sane implementation |
9 | on the template level | 12 | on the template level |
10 | 13 | ||
11 | 3.) Have something like QProperty to expose attributes from OPimRecord. | 14 | 3.) Have something like QProperty to expose attributes from OPimRecord. |
12 | This would include exporting,importing of data, and translated names. | 15 | This would include exporting,importing of data, and translated names. |
diff --git a/libopie2/opiepim/core/opimcontact.cpp b/libopie2/opiepim/core/opimcontact.cpp index 4a774e8..c1e06c8 100644 --- a/libopie2/opiepim/core/opimcontact.cpp +++ b/libopie2/opiepim/core/opimcontact.cpp | |||
@@ -1272,13 +1272,13 @@ void OPimContact::insertEmails( const QStringList &v ) | |||
1272 | { | 1272 | { |
1273 | for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it ) | 1273 | for ( QStringList::ConstIterator it = v.begin(); it != v.end(); ++it ) |
1274 | insertEmail( *it ); | 1274 | insertEmail( *it ); |
1275 | } | 1275 | } |
1276 | 1276 | ||
1277 | 1277 | ||
1278 | int OPimContact::rtti() | 1278 | int OPimContact::rtti() const |
1279 | { | 1279 | { |
1280 | return OPimResolver::AddressBook; | 1280 | return OPimResolver::AddressBook; |
1281 | } | 1281 | } |
1282 | 1282 | ||
1283 | 1283 | ||
1284 | void OPimContact::setUid( int i ) | 1284 | void OPimContact::setUid( int i ) |
diff --git a/libopie2/opiepim/core/opimcontact.h b/libopie2/opiepim/core/opimcontact.h index 9d3cacc..6891dd6 100644 --- a/libopie2/opiepim/core/opimcontact.h +++ b/libopie2/opiepim/core/opimcontact.h | |||
@@ -225,13 +225,13 @@ class QPC_EXPORT OPimContact : public OPimRecord | |||
225 | // Why private ? (eilers,se) | 225 | // Why private ? (eilers,se) |
226 | QString emailSeparator() const { return " "; } | 226 | QString emailSeparator() const { return " "; } |
227 | 227 | ||
228 | // the emails should be seperated by a comma | 228 | // the emails should be seperated by a comma |
229 | void setEmails( const QString &v ); | 229 | void setEmails( const QString &v ); |
230 | QString emails() const { return find( Qtopia::Emails ); } | 230 | QString emails() const { return find( Qtopia::Emails ); } |
231 | static int rtti(); | 231 | int rtti() const; |
232 | 232 | ||
233 | private: | 233 | private: |
234 | // The XML Backend needs some access to the private functions | 234 | // The XML Backend needs some access to the private functions |
235 | friend class OPimContactAccessBackend_XML; | 235 | friend class OPimContactAccessBackend_XML; |
236 | 236 | ||
237 | void insert( int key, const QString &value ); | 237 | void insert( int key, const QString &value ); |
diff --git a/libopie2/opiepim/core/opimevent.cpp b/libopie2/opiepim/core/opimevent.cpp index 77730e9..8bf8b25 100644 --- a/libopie2/opiepim/core/opimevent.cpp +++ b/libopie2/opiepim/core/opimevent.cpp | |||
@@ -478,13 +478,13 @@ QString OPimEvent::type() const | |||
478 | QString OPimEvent::recordField( int /*id */ ) const | 478 | QString OPimEvent::recordField( int /*id */ ) const |
479 | { | 479 | { |
480 | return QString::null; | 480 | return QString::null; |
481 | } | 481 | } |
482 | 482 | ||
483 | 483 | ||
484 | int OPimEvent::rtti() | 484 | int OPimEvent::rtti() const |
485 | { | 485 | { |
486 | return OPimResolver::DateBook; | 486 | return OPimResolver::DateBook; |
487 | } | 487 | } |
488 | 488 | ||
489 | 489 | ||
490 | bool OPimEvent::loadFromStream( QDataStream& ) | 490 | bool OPimEvent::loadFromStream( QDataStream& ) |
diff --git a/libopie2/opiepim/core/opimevent.h b/libopie2/opiepim/core/opimevent.h index 949f263..56fe917 100644 --- a/libopie2/opiepim/core/opimevent.h +++ b/libopie2/opiepim/core/opimevent.h | |||
@@ -180,13 +180,13 @@ class OPimEvent : public OPimRecord | |||
180 | QString type() const; | 180 | QString type() const; |
181 | 181 | ||
182 | QMap<int, QString> toMap() const; | 182 | QMap<int, QString> toMap() const; |
183 | void fromMap( const QMap<int, QString>& map ); | 183 | void fromMap( const QMap<int, QString>& map ); |
184 | QString recordField( int ) const; | 184 | QString recordField( int ) const; |
185 | 185 | ||
186 | static int rtti(); | 186 | int rtti() const; |
187 | 187 | ||
188 | bool loadFromStream( QDataStream& ); | 188 | bool loadFromStream( QDataStream& ); |
189 | bool saveToStream( QDataStream& ) const; | 189 | bool saveToStream( QDataStream& ) const; |
190 | 190 | ||
191 | /* bool operator==( const OPimEvent& ); | 191 | /* bool operator==( const OPimEvent& ); |
192 | bool operator!=( const OPimEvent& ); | 192 | bool operator!=( const OPimEvent& ); |
diff --git a/libopie2/opiepim/core/opimrecord.cpp b/libopie2/opiepim/core/opimrecord.cpp index 67eed41..c783092 100644 --- a/libopie2/opiepim/core/opimrecord.cpp +++ b/libopie2/opiepim/core/opimrecord.cpp | |||
@@ -144,13 +144,13 @@ Qtopia::UidGen &OPimRecord::uidGen() | |||
144 | OPimXRefManager &OPimRecord::xrefmanager() | 144 | OPimXRefManager &OPimRecord::xrefmanager() |
145 | { | 145 | { |
146 | return m_xrefman; | 146 | return m_xrefman; |
147 | } | 147 | } |
148 | 148 | ||
149 | 149 | ||
150 | int OPimRecord::rtti() | 150 | int OPimRecord::rtti() const |
151 | { | 151 | { |
152 | return 0; | 152 | return 0; |
153 | } | 153 | } |
154 | 154 | ||
155 | /** | 155 | /** |
156 | * now let's put our data into the stream | 156 | * now let's put our data into the stream |
diff --git a/libopie2/opiepim/core/opimrecord.h b/libopie2/opiepim/core/opimrecord.h index 4981a41..127439a 100644 --- a/libopie2/opiepim/core/opimrecord.h +++ b/libopie2/opiepim/core/opimrecord.h | |||
@@ -157,13 +157,13 @@ class OPimRecord : public Qtopia::Record | |||
157 | virtual void setUid( int uid ); | 157 | virtual void setUid( int uid ); |
158 | 158 | ||
159 | /* | 159 | /* |
160 | * used inside the Templates for casting | 160 | * used inside the Templates for casting |
161 | * REIMPLEMENT in your .... | 161 | * REIMPLEMENT in your .... |
162 | */ | 162 | */ |
163 | static int rtti(); | 163 | virtual int rtti() const; |
164 | 164 | ||
165 | /** | 165 | /** |
166 | * some marshalling and de marshalling code | 166 | * some marshalling and de marshalling code |
167 | * saves the OPimRecord | 167 | * saves the OPimRecord |
168 | * to and from a DataStream | 168 | * to and from a DataStream |
169 | */ | 169 | */ |
diff --git a/libopie2/opiepim/core/opimtodo.cpp b/libopie2/opiepim/core/opimtodo.cpp index f246bfd..47433e0 100644 --- a/libopie2/opiepim/core/opimtodo.cpp +++ b/libopie2/opiepim/core/opimtodo.cpp | |||
@@ -700,12 +700,12 @@ QString OPimTodo::type() const | |||
700 | QString OPimTodo::recordField( int /*id*/ ) const | 700 | QString OPimTodo::recordField( int /*id*/ ) const |
701 | { | 701 | { |
702 | return QString::null; | 702 | return QString::null; |
703 | } | 703 | } |
704 | 704 | ||
705 | 705 | ||
706 | int OPimTodo::rtti() | 706 | int OPimTodo::rtti() const |
707 | { | 707 | { |
708 | return OPimResolver::TodoList; | 708 | return OPimResolver::TodoList; |
709 | } | 709 | } |
710 | 710 | ||
711 | } | 711 | } |
diff --git a/libopie2/opiepim/core/opimtodo.h b/libopie2/opiepim/core/opimtodo.h index 5304180..e17fe6a 100644 --- a/libopie2/opiepim/core/opimtodo.h +++ b/libopie2/opiepim/core/opimtodo.h | |||
@@ -292,13 +292,13 @@ class OPimTodo : public OPimRecord | |||
292 | bool operator!=( const OPimTodo &toDoEvent ) const; | 292 | bool operator!=( const OPimTodo &toDoEvent ) const; |
293 | bool operator>( const OPimTodo &toDoEvent ) const; | 293 | bool operator>( const OPimTodo &toDoEvent ) const; |
294 | bool operator>=( const OPimTodo &toDoEvent ) const; | 294 | bool operator>=( const OPimTodo &toDoEvent ) const; |
295 | bool operator==( const OPimTodo &toDoEvent ) const; | 295 | bool operator==( const OPimTodo &toDoEvent ) const; |
296 | OPimTodo &operator=( const OPimTodo &toDoEvent ); | 296 | OPimTodo &operator=( const OPimTodo &toDoEvent ); |
297 | 297 | ||
298 | static int rtti(); | 298 | int rtti() const; |
299 | 299 | ||
300 | private: | 300 | private: |
301 | class OPimTodoPrivate; | 301 | class OPimTodoPrivate; |
302 | struct OPimTodoData; | 302 | struct OPimTodoData; |
303 | 303 | ||
304 | void deref(); | 304 | void deref(); |