author | eilers <eilers> | 2002-10-02 16:18:11 (UTC) |
---|---|---|
committer | eilers <eilers> | 2002-10-02 16:18:11 (UTC) |
commit | 1400bbe439c47f0bd168d602d961235c638a861b (patch) (unidiff) | |
tree | 2612a28330ee6b48d6f06b476448cee66308c9f3 | |
parent | 140d28d0fd72015616351702f085ca9f0c9a959c (diff) | |
download | opie-1400bbe439c47f0bd168d602d961235c638a861b.zip opie-1400bbe439c47f0bd168d602d961235c638a861b.tar.gz opie-1400bbe439c47f0bd168d602d961235c638a861b.tar.bz2 |
debugged and seems to work almost perfectly ..
-rw-r--r-- | libopie/pim/ocontactaccess.cpp | 8 | ||||
-rw-r--r-- | libopie2/opiepim/core/ocontactaccess.cpp | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/libopie/pim/ocontactaccess.cpp b/libopie/pim/ocontactaccess.cpp index 2d808f7..8a8ff08 100644 --- a/libopie/pim/ocontactaccess.cpp +++ b/libopie/pim/ocontactaccess.cpp | |||
@@ -18,12 +18,15 @@ | |||
18 | * | 18 | * |
19 | * ===================================================================== | 19 | * ===================================================================== |
20 | * Version: $Id$ | 20 | * Version: $Id$ |
21 | * ===================================================================== | 21 | * ===================================================================== |
22 | * History: | 22 | * History: |
23 | * $Log$ | 23 | * $Log$ |
24 | * Revision 1.2 2002/10/02 16:18:11 eilers | ||
25 | * debugged and seems to work almost perfectly .. | ||
26 | * | ||
24 | * Revision 1.1 2002/09/27 17:11:44 eilers | 27 | * Revision 1.1 2002/09/27 17:11:44 eilers |
25 | * Added API for accessing the Contact-Database ! It is compiling, but | 28 | * Added API for accessing the Contact-Database ! It is compiling, but |
26 | * please do not expect that anything is working ! | 29 | * please do not expect that anything is working ! |
27 | * I will debug that stuff in the next time .. | 30 | * I will debug that stuff in the next time .. |
28 | * Please read README_COMPILE for compiling ! | 31 | * Please read README_COMPILE for compiling ! |
29 | * | 32 | * |
@@ -58,13 +61,16 @@ OContactAccess::OContactAccess ( const QString appname, const QString filename, | |||
58 | /* take care of the backend. If there is no one defined, we | 61 | /* take care of the backend. If there is no one defined, we |
59 | * will use the XML-Backend as default (until we have a cute SQL-Backend..). | 62 | * will use the XML-Backend as default (until we have a cute SQL-Backend..). |
60 | */ | 63 | */ |
61 | if( end == 0 ) { | 64 | if( end == 0 ) { |
62 | end = new OContactAccessBackend_XML( appname, filename ); | 65 | end = new OContactAccessBackend_XML( appname, filename ); |
63 | } | 66 | } |
67 | // Set backend locally and in template | ||
64 | m_backEnd = end; | 68 | m_backEnd = end; |
69 | OPimAccessTemplate<OContact>::setBackEnd (end); | ||
70 | |||
65 | 71 | ||
66 | /* Connect signal of external db change to function */ | 72 | /* Connect signal of external db change to function */ |
67 | QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this ); | 73 | QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this ); |
68 | connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)), | 74 | connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)), |
69 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); | 75 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); |
70 | if ( autosync ){ | 76 | if ( autosync ){ |
@@ -79,13 +85,13 @@ OContactAccess::~OContactAccess () | |||
79 | { | 85 | { |
80 | /* The user may forget to save the changed database, therefore try to | 86 | /* The user may forget to save the changed database, therefore try to |
81 | * do it for him.. | 87 | * do it for him.. |
82 | */ | 88 | */ |
83 | if ( m_changed ) | 89 | if ( m_changed ) |
84 | save(); | 90 | save(); |
85 | delete m_backEnd; | 91 | // delete m_backEnd; is done by template.. |
86 | } | 92 | } |
87 | 93 | ||
88 | bool OContactAccess::load() | 94 | bool OContactAccess::load() |
89 | { | 95 | { |
90 | return ( m_backEnd->load() ); | 96 | return ( m_backEnd->load() ); |
91 | } | 97 | } |
diff --git a/libopie2/opiepim/core/ocontactaccess.cpp b/libopie2/opiepim/core/ocontactaccess.cpp index 2d808f7..8a8ff08 100644 --- a/libopie2/opiepim/core/ocontactaccess.cpp +++ b/libopie2/opiepim/core/ocontactaccess.cpp | |||
@@ -18,12 +18,15 @@ | |||
18 | * | 18 | * |
19 | * ===================================================================== | 19 | * ===================================================================== |
20 | * Version: $Id$ | 20 | * Version: $Id$ |
21 | * ===================================================================== | 21 | * ===================================================================== |
22 | * History: | 22 | * History: |
23 | * $Log$ | 23 | * $Log$ |
24 | * Revision 1.2 2002/10/02 16:18:11 eilers | ||
25 | * debugged and seems to work almost perfectly .. | ||
26 | * | ||
24 | * Revision 1.1 2002/09/27 17:11:44 eilers | 27 | * Revision 1.1 2002/09/27 17:11:44 eilers |
25 | * Added API for accessing the Contact-Database ! It is compiling, but | 28 | * Added API for accessing the Contact-Database ! It is compiling, but |
26 | * please do not expect that anything is working ! | 29 | * please do not expect that anything is working ! |
27 | * I will debug that stuff in the next time .. | 30 | * I will debug that stuff in the next time .. |
28 | * Please read README_COMPILE for compiling ! | 31 | * Please read README_COMPILE for compiling ! |
29 | * | 32 | * |
@@ -58,13 +61,16 @@ OContactAccess::OContactAccess ( const QString appname, const QString filename, | |||
58 | /* take care of the backend. If there is no one defined, we | 61 | /* take care of the backend. If there is no one defined, we |
59 | * will use the XML-Backend as default (until we have a cute SQL-Backend..). | 62 | * will use the XML-Backend as default (until we have a cute SQL-Backend..). |
60 | */ | 63 | */ |
61 | if( end == 0 ) { | 64 | if( end == 0 ) { |
62 | end = new OContactAccessBackend_XML( appname, filename ); | 65 | end = new OContactAccessBackend_XML( appname, filename ); |
63 | } | 66 | } |
67 | // Set backend locally and in template | ||
64 | m_backEnd = end; | 68 | m_backEnd = end; |
69 | OPimAccessTemplate<OContact>::setBackEnd (end); | ||
70 | |||
65 | 71 | ||
66 | /* Connect signal of external db change to function */ | 72 | /* Connect signal of external db change to function */ |
67 | QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this ); | 73 | QCopChannel *dbchannel = new QCopChannel( "QPE/PIM", this ); |
68 | connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)), | 74 | connect( dbchannel, SIGNAL(received(const QCString &, const QByteArray &)), |
69 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); | 75 | this, SLOT(copMessage( const QCString &, const QByteArray &)) ); |
70 | if ( autosync ){ | 76 | if ( autosync ){ |
@@ -79,13 +85,13 @@ OContactAccess::~OContactAccess () | |||
79 | { | 85 | { |
80 | /* The user may forget to save the changed database, therefore try to | 86 | /* The user may forget to save the changed database, therefore try to |
81 | * do it for him.. | 87 | * do it for him.. |
82 | */ | 88 | */ |
83 | if ( m_changed ) | 89 | if ( m_changed ) |
84 | save(); | 90 | save(); |
85 | delete m_backEnd; | 91 | // delete m_backEnd; is done by template.. |
86 | } | 92 | } |
87 | 93 | ||
88 | bool OContactAccess::load() | 94 | bool OContactAccess::load() |
89 | { | 95 | { |
90 | return ( m_backEnd->load() ); | 96 | return ( m_backEnd->load() ); |
91 | } | 97 | } |