-rw-r--r-- | libopie2/opiepim/backend/backends.pro | 6 | ||||
-rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/libopie2/opiepim/backend/backends.pro b/libopie2/opiepim/backend/backends.pro index d4867ba..953d928 100644 --- a/libopie2/opiepim/backend/backends.pro +++ b/libopie2/opiepim/backend/backends.pro | |||
@@ -7,14 +7,13 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ | |||
7 | core/backends/otodoaccessbackend.cpp \ | 7 | core/backends/otodoaccessbackend.cpp \ |
8 | core/backends/otodoaccess.cpp \ | 8 | core/backends/otodoaccess.cpp \ |
9 | core/backends/otodoaccesssql.cpp \ | 9 | core/backends/otodoaccesssql.cpp \ |
10 | core/backends/otodoaccessvcal.cpp \ | 10 | core/backends/otodoaccessvcal.cpp \ |
11 | core/backends/otodoaccessxml.cpp \ | 11 | core/backends/otodoaccessxml.cpp \ |
12 | core/backends/odatebookaccess.cpp \ | 12 | core/backends/odatebookaccess.cpp \ |
13 | core/backends/odatebookaccessbackend_sql.cpp \ | 13 | core/backends/odatebookaccessbackend_sql.cpp |
14 | core/backends/private/xmltree.cc | ||
15 | 14 | ||
16 | HEADERS += core/backends/obackendfactory.h \ | 15 | HEADERS += core/backends/obackendfactory.h \ |
17 | core/backends/ocontactaccessbackend.h \ | 16 | core/backends/ocontactaccessbackend.h \ |
18 | core/backends/ocontactaccessbackend_sql.h \ | 17 | core/backends/ocontactaccessbackend_sql.h \ |
19 | core/backends/ocontactaccessbackend_vcard.h \ | 18 | core/backends/ocontactaccessbackend_vcard.h \ |
20 | core/backends/ocontactaccessbackend_xml.h \ | 19 | core/backends/ocontactaccessbackend_xml.h \ |
@@ -26,8 +25,7 @@ HEADERS += core/backends/obackendfactory.h \ | |||
26 | core/backends/opimaccesstemplate.h \ | 25 | core/backends/opimaccesstemplate.h \ |
27 | core/backends/otodoaccessbackend.h \ | 26 | core/backends/otodoaccessbackend.h \ |
28 | core/backends/otodoaccess.h \ | 27 | core/backends/otodoaccess.h \ |
29 | core/backends/otodoaccesssql.h \ | 28 | core/backends/otodoaccesssql.h \ |
30 | core/backends/otodoaccessvcal.h \ | 29 | core/backends/otodoaccessvcal.h \ |
31 | core/backends/otodoaccessxml.h \ | 30 | core/backends/otodoaccessxml.h \ |
32 | core/backends/odatebookaccess.h \ | 31 | core/backends/odatebookaccess.h |
33 | core/backends/private/xmltree.h | ||
diff --git a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp index f5e76d5..2b467c3 100644 --- a/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp +++ b/libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp | |||
@@ -38,21 +38,20 @@ | |||
38 | #include <qregexp.h> | 38 | #include <qregexp.h> |
39 | #include <qarray.h> | 39 | #include <qarray.h> |
40 | #include <qmap.h> | 40 | #include <qmap.h> |
41 | 41 | ||
42 | #include <qpe/global.h> | 42 | #include <qpe/global.h> |
43 | 43 | ||
44 | #include "private/xmltree.h" | 44 | #include <opie2/xmltree.h> |
45 | #include <opie2/ocontactaccessbackend.h> | 45 | #include <opie2/ocontactaccessbackend.h> |
46 | #include <opie2/ocontactaccess.h> | 46 | #include <opie2/ocontactaccess.h> |
47 | 47 | ||
48 | #include <stdlib.h> | 48 | #include <stdlib.h> |
49 | #include <errno.h> | 49 | #include <errno.h> |
50 | 50 | ||
51 | using namespace Opie; | 51 | using namespace Opie::Core; |
52 | using namespace Opie::Pim::Private; | ||
53 | 52 | ||
54 | 53 | ||
55 | namespace Opie { | 54 | namespace Opie { |
56 | OPimContactAccessBackend_XML::OPimContactAccessBackend_XML ( const QString& appname, const QString& filename ): | 55 | OPimContactAccessBackend_XML::OPimContactAccessBackend_XML ( const QString& appname, const QString& filename ): |
57 | m_changed( false ) | 56 | m_changed( false ) |
58 | { | 57 | { |