diff --git a/src/common/davcollectionsfetchjob.cpp b/src/common/davcollectionsfetchjob.cpp --- a/src/common/davcollectionsfetchjob.cpp +++ b/src/common/davcollectionsfetchjob.cpp @@ -23,6 +23,7 @@ #include "davprincipalhomesetsfetchjob.h" #include "davprotocolbase_p.h" #include "utils.h" +#include "utils_p.h" #include "daverror.h" #include "libkdav_debug.h" diff --git a/src/common/davitemsfetchjob.cpp b/src/common/davitemsfetchjob.cpp --- a/src/common/davitemsfetchjob.cpp +++ b/src/common/davitemsfetchjob.cpp @@ -23,6 +23,7 @@ #include "davmanager_p.h" #include "davmultigetprotocol_p.h" #include "utils.h" +#include "utils_p.h" #include "daverror.h" #include diff --git a/src/common/davitemslistjob.cpp b/src/common/davitemslistjob.cpp --- a/src/common/davitemslistjob.cpp +++ b/src/common/davitemslistjob.cpp @@ -24,6 +24,7 @@ #include "davprotocolbase_p.h" #include "davurl.h" #include "utils.h" +#include "utils_p.h" #include "etagcache.h" #include diff --git a/src/common/davprincipalhomesetsfetchjob.cpp b/src/common/davprincipalhomesetsfetchjob.cpp --- a/src/common/davprincipalhomesetsfetchjob.cpp +++ b/src/common/davprincipalhomesetsfetchjob.cpp @@ -24,6 +24,7 @@ #include "daverror.h" #include "protocolinfo.h" #include "utils.h" +#include "utils_p.h" #include #include diff --git a/src/common/utils.h b/src/common/utils.h --- a/src/common/utils.h +++ b/src/common/utils.h @@ -46,21 +46,6 @@ */ Q_REQUIRED_RESULT QDomElement KPIMKDAV_EXPORT firstChildElementNS(const QDomElement &parent, const QString &namespaceUri, const QString &tagName); -/** - * Returns the next sibling element of @p element that has the given @p tagName and is part of the @p namespaceUri. - */ -Q_REQUIRED_RESULT QDomElement KPIMKDAV_EXPORT nextSiblingElementNS(const QDomElement &element, const QString &namespaceUri, const QString &tagName); - -/** - * Extracts privileges from @p element. The tags are expected to be first level children of @p element. - */ -Q_REQUIRED_RESULT Privileges KPIMKDAV_EXPORT extractPrivileges(const QDomElement &element); - -/** - * Parses a single tag and returns the final Privileges. - */ -Q_REQUIRED_RESULT Privileges KPIMKDAV_EXPORT parsePrivilege(const QDomElement &element); - /** * Creates a unique identifier that can be used as a file name to upload the dav item */ diff --git a/src/common/utils.cpp b/src/common/utils.cpp --- a/src/common/utils.cpp +++ b/src/common/utils.cpp @@ -17,6 +17,7 @@ */ #include "utils.h" +#include "utils_p.h" #include "enums.h" diff --git a/src/common/utils_p.h b/src/common/utils_p.h new file mode 100644 --- /dev/null +++ b/src/common/utils_p.h @@ -0,0 +1,45 @@ +/* + Copyright (c) 2010 Tobias Koenig + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +*/ + +#ifndef KDAV_DAVUTILS_P_H +#define KDAV_DAVUTILS_P_H + +#include + +namespace KDAV { +namespace Utils { +/** + * Returns the next sibling element of @p element that has the given @p tagName and is part of the @p namespaceUri. + */ +Q_REQUIRED_RESULT QDomElement nextSiblingElementNS(const QDomElement &element, const QString &namespaceUri, const QString &tagName); + +/** + * Extracts privileges from @p element. The tags are expected to be first level children of @p element. + */ +Q_REQUIRED_RESULT Privileges extractPrivileges(const QDomElement &element); + +/** + * Parses a single tag and returns the final Privileges. + */ +Q_REQUIRED_RESULT Privileges parsePrivilege(const QDomElement &element); + +} +} + +#endif + diff --git a/src/protocols/caldavprotocol.cpp b/src/protocols/caldavprotocol.cpp --- a/src/protocols/caldavprotocol.cpp +++ b/src/protocols/caldavprotocol.cpp @@ -18,6 +18,7 @@ #include "caldavprotocol_p.h" #include "common/utils.h" +#include "common/utils_p.h" #include #include