| -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 @@ -11,3 +11,4 @@ HEADERS = oapplication.h \ osmartpointer.h \ - ostorageinfo.h + ostorageinfo.h \ + xmltree.h @@ -20,3 +21,4 @@ SOURCES = oapplication.cpp \ oprocctrl.cpp \ - ostorageinfo.cpp + ostorageinfo.cpp \ + xmltree.cpp 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 @@ -27,3 +27,3 @@ -using namespace Opie::Pim::Private; +using namespace Opie::Core; 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 @@ -28,4 +28,3 @@ namespace Opie { -namespace Pim { -namespace Private{ +namespace Core { @@ -118,3 +117,2 @@ private: } -} } // namespace Opie 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 @@ -12,4 +12,3 @@ SOURCES += core/backends/ocontactaccessbackend_sql.cpp \ core/backends/odatebookaccess.cpp \ - core/backends/odatebookaccessbackend_sql.cpp \ - core/backends/private/xmltree.cc + core/backends/odatebookaccessbackend_sql.cpp @@ -31,3 +30,2 @@ HEADERS += core/backends/obackendfactory.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 @@ -43,3 +43,3 @@ -#include "private/xmltree.h" +#include <opie2/xmltree.h> #include <opie2/ocontactaccessbackend.h> @@ -50,4 +50,3 @@ -using namespace Opie; -using namespace Opie::Pim::Private; +using namespace Opie::Core; |