| -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 @@ -6,22 +6,24 @@ HEADERS = oapplication.h \ odebug.h \ oglobal.h \ oglobalsettings.h \ oprocess.h \ oprocctrl.h \ osmartpointer.h \ - ostorageinfo.h + ostorageinfo.h \ + xmltree.h SOURCES = oapplication.cpp \ oconfig.cpp \ odebug.cpp \ oglobal.cpp \ oglobalsettings.cpp \ oprocess.cpp \ oprocctrl.cpp \ - ostorageinfo.cpp + ostorageinfo.cpp \ + xmltree.cpp include ( device/device.pro ) INTERFACES = TARGET = opiecore2 VERSION = 1.9.0 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 @@ -22,13 +22,13 @@ #include <qpe/stringutil.h> #include <qxml.h> #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 @@ -23,14 +23,13 @@ #include <qstring.h> #include <qmap.h> #include <qtextstream.h> namespace Opie { -namespace Pim { -namespace Private{ +namespace Core { /** * A small xml lib written by Simon Hausmann. */ class XMLElement { @@ -113,10 +112,9 @@ private: XMLElement &operator=( const XMLElement &rhs ); class Private; Private* d; }; } -} } // 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 @@ -7,14 +7,13 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ core/backends/otodoaccessbackend.cpp \ core/backends/otodoaccess.cpp \ core/backends/otodoaccesssql.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 \ core/backends/ocontactaccessbackend_sql.h \ core/backends/ocontactaccessbackend_vcard.h \ core/backends/ocontactaccessbackend_xml.h \ @@ -26,8 +25,7 @@ HEADERS += core/backends/obackendfactory.h \ core/backends/opimaccesstemplate.h \ core/backends/otodoaccessbackend.h \ core/backends/otodoaccess.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 @@ -38,21 +38,20 @@ #include <qregexp.h> #include <qarray.h> #include <qmap.h> #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 { OPimContactAccessBackend_XML::OPimContactAccessBackend_XML ( const QString& appname, const QString& filename ): m_changed( false ) { |