Diffstat (limited to 'core/pim/addressbook/abview.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/pim/addressbook/abview.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/core/pim/addressbook/abview.cpp b/core/pim/addressbook/abview.cpp index 8d61582..aa242b7 100644 --- a/core/pim/addressbook/abview.cpp +++ b/core/pim/addressbook/abview.cpp | |||
@@ -16,11 +16,11 @@ | |||
16 | 16 | ||
17 | #include "abview.h" | 17 | #include "abview.h" |
18 | 18 | ||
19 | #include <qlayout.h> | 19 | #include <opie2/ocontactaccessbackend_vcard.h> |
20 | 20 | ||
21 | #include <qpe/global.h> | 21 | #include <qpe/global.h> |
22 | 22 | ||
23 | #include <opie/ocontactaccessbackend_vcard.h> | 23 | #include <qlayout.h> |
24 | 24 | ||
25 | #include <assert.h> | 25 | #include <assert.h> |
26 | 26 | ||
@@ -53,7 +53,7 @@ AbView::AbView ( QWidget* parent, const QValueList<int>& ordered ): | |||
53 | { | 53 | { |
54 | qWarning("AbView::c'tor"); | 54 | qWarning("AbView::c'tor"); |
55 | // Load default database and handle syncing myself.. ! | 55 | // Load default database and handle syncing myself.. ! |
56 | m_contactdb = new OContactAccess ( "addressbook", 0l, 0l, false ); | 56 | m_contactdb = new Opie::OPimContactAccess ( "addressbook", 0l, 0l, false ); |
57 | m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available | 57 | m_contactdb -> setReadAhead( 16 ); // Use ReadAhead-Cache if available |
58 | mCat.load( categoryFileName() ); | 58 | mCat.load( categoryFileName() ); |
59 | 59 | ||
@@ -104,7 +104,7 @@ void AbView::setView( Views view ) | |||
104 | load(); | 104 | load(); |
105 | } | 105 | } |
106 | 106 | ||
107 | void AbView::addEntry( const OContact &newContact ) | 107 | void AbView::addEntry( const Opie::OPimContact &newContact ) |
108 | { | 108 | { |
109 | qWarning("abview:AddContact"); | 109 | qWarning("abview:AddContact"); |
110 | m_contactdb->add ( newContact ); | 110 | m_contactdb->add ( newContact ); |
@@ -118,7 +118,7 @@ void AbView::removeEntry( const int UID ) | |||
118 | load(); | 118 | load(); |
119 | } | 119 | } |
120 | 120 | ||
121 | void AbView::replaceEntry( const OContact &contact ) | 121 | void AbView::replaceEntry( const Opie::OPimContact &contact ) |
122 | { | 122 | { |
123 | qWarning("abview:ReplaceContact"); | 123 | qWarning("abview:ReplaceContact"); |
124 | m_contactdb->replace( contact ); | 124 | m_contactdb->replace( contact ); |
@@ -126,9 +126,9 @@ void AbView::replaceEntry( const OContact &contact ) | |||
126 | 126 | ||
127 | } | 127 | } |
128 | 128 | ||
129 | OContact AbView::currentEntry() | 129 | Opie::OPimContact AbView::currentEntry() |
130 | { | 130 | { |
131 | OContact currentContact; | 131 | Opie::OPimContact currentContact; |
132 | 132 | ||
133 | switch ( (int) m_curr_View ) { | 133 | switch ( (int) m_curr_View ) { |
134 | case TableView: | 134 | case TableView: |
@@ -228,14 +228,14 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) | |||
228 | 228 | ||
229 | assert( mode < AbConfig::LASTELEMENT ); | 229 | assert( mode < AbConfig::LASTELEMENT ); |
230 | 230 | ||
231 | OContact query; | 231 | Opie::OPimContact query; |
232 | if ( c == 0 ){ | 232 | if ( c == 0 ){ |
233 | load(); | 233 | load(); |
234 | return; | 234 | return; |
235 | }else{ | 235 | }else{ |
236 | // If the current Backend is unable to solve the query, we will | 236 | // If the current Backend is unable to solve the query, we will |
237 | // ignore the request .. | 237 | // ignore the request .. |
238 | if ( ! m_contactdb->hasQuerySettings( OContactAccess::WildCards | OContactAccess::IgnoreCase ) ){ | 238 | if ( ! m_contactdb->hasQuerySettings( Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ) ){ |
239 | return; | 239 | return; |
240 | } | 240 | } |
241 | 241 | ||
@@ -251,7 +251,7 @@ void AbView::setShowByLetter( char c, AbConfig::LPSearchMode mode ) | |||
251 | qWarning( "I will ignore it.." ); | 251 | qWarning( "I will ignore it.." ); |
252 | return; | 252 | return; |
253 | } | 253 | } |
254 | m_list = m_contactdb->queryByExample( query, OContactAccess::WildCards | OContactAccess::IgnoreCase ); | 254 | m_list = m_contactdb->queryByExample( query, Opie::OPimContactAccess::WildCards | Opie::OPimContactAccess::IgnoreCase ); |
255 | if ( m_curr_category != -1 ) | 255 | if ( m_curr_category != -1 ) |
256 | clearForCategory(); | 256 | clearForCategory(); |
257 | m_curr_Contact = 0; | 257 | m_curr_Contact = 0; |
@@ -289,9 +289,9 @@ void AbView::showPersonal( bool personal ) | |||
289 | // to avoid unneeded load/stores. | 289 | // to avoid unneeded load/stores. |
290 | m_storedDB = m_contactdb; | 290 | m_storedDB = m_contactdb; |
291 | 291 | ||
292 | OContactAccessBackend* vcard_backend = new OContactAccessBackend_VCard( QString::null, | 292 | Opie::OPimContactAccessBackend* vcard_backend = new Opie::OPimContactAccessBackend_VCard( QString::null, |
293 | addressbookPersonalVCardName() ); | 293 | addressbookPersonalVCardName() ); |
294 | m_contactdb = new OContactAccess ( "addressbook", QString::null , vcard_backend, true ); | 294 | m_contactdb = new Opie::OPimContactAccess ( "addressbook", QString::null , vcard_backend, true ); |
295 | 295 | ||
296 | m_inPersonal = true; | 296 | m_inPersonal = true; |
297 | m_curr_View = CardView; | 297 | m_curr_View = CardView; |
@@ -401,10 +401,10 @@ void AbView::slotSwitch(){ | |||
401 | 401 | ||
402 | void AbView::clearForCategory() | 402 | void AbView::clearForCategory() |
403 | { | 403 | { |
404 | OContactAccess::List::Iterator it; | 404 | Opie::OPimContactAccess::List::Iterator it; |
405 | // Now remove all contacts with wrong category if any category selected | 405 | // Now remove all contacts with wrong category if any category selected |
406 | 406 | ||
407 | OContactAccess::List allList = m_list; | 407 | Opie::OPimContactAccess::List allList = m_list; |
408 | if ( m_curr_category != -1 ){ | 408 | if ( m_curr_category != -1 ){ |
409 | for ( it = allList.begin(); it != allList.end(); ++it ){ | 409 | for ( it = allList.begin(); it != allList.end(); ++it ){ |
410 | if ( !contactCompare( *it, m_curr_category ) ){ | 410 | if ( !contactCompare( *it, m_curr_category ) ){ |
@@ -416,9 +416,9 @@ void AbView::clearForCategory() | |||
416 | 416 | ||
417 | } | 417 | } |
418 | 418 | ||
419 | bool AbView::contactCompare( const OContact &cnt, int category ) | 419 | bool AbView::contactCompare( const Opie::OPimContact &cnt, int category ) |
420 | { | 420 | { |
421 | //qWarning ("bool AbView::contactCompare( const OContact &cnt, %d )", category); | 421 | //qWarning ("bool AbView::contactCompare( const Opie::OPimContact &cnt, %d )", category); |
422 | 422 | ||
423 | bool returnMe; | 423 | bool returnMe; |
424 | QArray<int> cats; | 424 | QArray<int> cats; |