| author | zecke <zecke> | 2004-03-14 17:00:05 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-03-14 17:00:05 (UTC) |
| commit | 59106c8ffcf25181925281c519a2b49d6835ef9e (patch) (side-by-side diff) | |
| tree | 810ff3af82ffb109ad662bf86e2d669b27ef9a32 | |
| parent | 5bf53ecde573239a07faaa713f2a6f8392fa364a (diff) | |
| download | opie-59106c8ffcf25181925281c519a2b49d6835ef9e.zip opie-59106c8ffcf25181925281c519a2b49d6835ef9e.tar.gz opie-59106c8ffcf25181925281c519a2b49d6835ef9e.tar.bz2 | |
but XML Parser back to OPie Core as libtinykate uses it as well
| -rw-r--r-- | libopie2/opiecore/opiecore.pro | 6 | ||||
| -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.pro | 6 | ||||
| -rw-r--r-- | libopie2/opiepim/backend/ocontactaccessbackend_xml.cpp | 5 |
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 @@ -9,7 +9,8 @@ HEADERS = oapplication.h \ oprocess.h \ oprocctrl.h \ osmartpointer.h \ - ostorageinfo.h + ostorageinfo.h \ + xmltree.h SOURCES = oapplication.cpp \ oconfig.cpp \ @@ -18,7 +19,8 @@ SOURCES = oapplication.cpp \ oglobalsettings.cpp \ oprocess.cpp \ oprocctrl.cpp \ - ostorageinfo.cpp + ostorageinfo.cpp \ + xmltree.cpp include ( device/device.pro ) 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 @@ -25,7 +25,7 @@ #include <assert.h> -using namespace Opie::Pim::Private; +using namespace Opie::Core; XMLElement::XMLElement() : m_parent( 0 ), m_next( 0 ), m_prev( 0 ), m_first( 0 ), m_last( 0 ) 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 @@ -26,8 +26,7 @@ #include <qtextstream.h> namespace Opie { -namespace Pim { -namespace Private{ +namespace Core { /** * A small xml lib written by Simon Hausmann. @@ -116,7 +115,6 @@ private: }; } -} } // namespace Opie #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 @@ -10,8 +10,7 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ core/backends/otodoaccessvcal.cpp \ core/backends/otodoaccessxml.cpp \ core/backends/odatebookaccess.cpp \ - core/backends/odatebookaccessbackend_sql.cpp \ - core/backends/private/xmltree.cc + core/backends/odatebookaccessbackend_sql.cpp HEADERS += core/backends/obackendfactory.h \ core/backends/ocontactaccessbackend.h \ @@ -29,5 +28,4 @@ HEADERS += core/backends/obackendfactory.h \ core/backends/otodoaccesssql.h \ core/backends/otodoaccessvcal.h \ core/backends/otodoaccessxml.h \ - core/backends/odatebookaccess.h \ - core/backends/private/xmltree.h + core/backends/odatebookaccess.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 @@ -41,15 +41,14 @@ #include <qpe/global.h> -#include "private/xmltree.h" +#include <opie2/xmltree.h> #include <opie2/ocontactaccessbackend.h> #include <opie2/ocontactaccess.h> #include <stdlib.h> #include <errno.h> -using namespace Opie; -using namespace Opie::Pim::Private; +using namespace Opie::Core; namespace Opie { |