summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/opiecore.pro6
-rw-r--r--libopie2/opiecore/xmltree.cpp (renamed from libopie2/opiepim/core/backends/private/xmltree.cc)2
-rw-r--r--libopie2/opiecore/xmltree.h (renamed from libopie2/opiepim/core/backends/private/xmltree.h)4
-rw-r--r--libopie2/opiepim/backend/backends.pro6
-rw-r--r--libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp5
5 files changed, 10 insertions, 13 deletions
diff --git a/libopie2/opiecore/opiecore.pro b/libopie2/opiecore/opiecore.pro
index ff3c036..67ef072 100644
--- a/libopie2/opiecore/opiecore.pro
+++ b/libopie2/opiecore/opiecore.pro
@@ -8,18 +8,20 @@ HEADERS = oapplication.h \
8 oglobalsettings.h \ 8 oglobalsettings.h \
9 oprocess.h \ 9 oprocess.h \
10 oprocctrl.h \ 10 oprocctrl.h \
11 osmartpointer.h \ 11 osmartpointer.h \
12 ostorageinfo.h 12 ostorageinfo.h \
13 xmltree.h
13 14
14SOURCES = oapplication.cpp \ 15SOURCES = oapplication.cpp \
15 oconfig.cpp \ 16 oconfig.cpp \
16 odebug.cpp \ 17 odebug.cpp \
17 oglobal.cpp \ 18 oglobal.cpp \
18 oglobalsettings.cpp \ 19 oglobalsettings.cpp \
19 oprocess.cpp \ 20 oprocess.cpp \
20 oprocctrl.cpp \ 21 oprocctrl.cpp \
21 ostorageinfo.cpp 22 ostorageinfo.cpp \
23 xmltree.cpp
22 24
23include ( device/device.pro ) 25include ( device/device.pro )
24 26
25INTERFACES = 27INTERFACES =
diff --git a/libopie2/opiepim/core/backends/private/xmltree.cc b/libopie2/opiecore/xmltree.cpp
index 40749ca..72fe9fd 100644
--- a/libopie2/opiepim/core/backends/private/xmltree.cc
+++ b/libopie2/opiecore/xmltree.cpp
@@ -24,9 +24,9 @@
24#include <qxml.h> 24#include <qxml.h>
25 25
26#include <assert.h> 26#include <assert.h>
27 27
28using namespace Opie::Pim::Private; 28using namespace Opie::Core;
29 29
30XMLElement::XMLElement() 30XMLElement::XMLElement()
31 : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) 31 : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 )
32{ 32{
diff --git a/libopie2/opiepim/core/backends/private/xmltree.h b/libopie2/opiecore/xmltree.h
index 9817a02..5fd79e7 100644
--- a/libopie2/opiepim/core/backends/private/xmltree.h
+++ b/libopie2/opiecore/xmltree.h
@@ -25,10 +25,9 @@
25#include <qmap.h> 25#include <qmap.h>
26#include <qtextstream.h> 26#include <qtextstream.h>
27 27
28namespace Opie { 28namespace Opie {
29namespace Pim { 29namespace Core {
30namespace Private{
31 30
32/** 31/**
33 * A small xml lib written by Simon Hausmann. 32 * A small xml lib written by Simon Hausmann.
34 */ 33 */
@@ -115,8 +114,7 @@ private:
115 Private* d; 114 Private* d;
116}; 115};
117 116
118} 117}
119}
120} // namespace Opie 118} // namespace Opie
121 119
122#endif 120#endif
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
@@ -9,10 +9,9 @@ SOURCES += core/backends/ocontactaccessbackend_sql.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
16HEADERS += core/backends/obackendfactory.h \ 15HEADERS += 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 \
@@ -28,6 +27,5 @@ HEADERS += core/backends/obackendfactory.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
@@ -40,17 +40,16 @@
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
51using namespace Opie; 51using namespace Opie::Core;
52using namespace Opie::Pim::Private;
53 52
54 53
55namespace Opie { 54namespace Opie {
56OPimContactAccessBackend_XML::OPimContactAccessBackend_XML ( const QString& appname, const QString& filename ): 55OPimContactAccessBackend_XML::OPimContactAccessBackend_XML ( const QString& appname, const QString& filename ):