You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by pm...@apache.org on 2014/12/17 14:29:31 UTC
[81/92] [abbrv] incubator-corinthia git commit: Move necessary
headers into api/headers
Move necessary headers into api/headers
The DFError.h, DFStorage.h, and DFXMLForward.h files all need to go into
the public API headers directory, as they are needed by other headers in
that directory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/54c407e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/54c407e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/54c407e9
Branch: refs/heads/stable
Commit: 54c407e9ca9df349ec302d2ce980e5a1d0fe2c95
Parents: 8337d18
Author: Peter Kelly <pe...@uxproductivity.com>
Authored: Mon Dec 8 15:17:01 2014 +0700
Committer: Peter Kelly <pe...@uxproductivity.com>
Committed: Mon Dec 8 15:17:43 2014 +0700
----------------------------------------------------------------------
.../w3c-tidy-html5/experimental/httpio.h | 2 +-
.../external/w3c-tidy-html5/src/version.h | 2 +-
DocFormats/CMakeLists.txt | 6 +--
DocFormats/api/headers/DocFormats/DFError.h | 40 ++++++++++++++++++++
DocFormats/api/headers/DocFormats/DFStorage.h | 39 +++++++++++++++++++
.../api/headers/DocFormats/DFXMLForward.h | 24 ++++++++++++
DocFormats/api/headers/DocFormats/DocFormats.h | 3 ++
DocFormats/api/headers/DocFormats/Operations.h | 6 +--
DocFormats/api/src/Operations.c | 2 +-
DocFormats/core/src/common/DFBDT.h | 2 +-
DocFormats/core/src/common/DFTable.h | 2 +-
DocFormats/core/src/css/CSSClassNames.h | 2 +-
DocFormats/core/src/css/CSSSelector.h | 2 +-
DocFormats/core/src/css/CSSStyle.h | 2 +-
DocFormats/core/src/html/DFHTDocument.h | 2 +-
DocFormats/core/src/html/DFHTML.h | 4 +-
DocFormats/core/src/html/DFHTMLNormalization.h | 2 +-
DocFormats/core/src/html/DFHTMLTables.h | 2 +-
DocFormats/core/src/lib/DFBuffer.h | 4 +-
DocFormats/core/src/lib/DFError.c | 2 +-
DocFormats/core/src/lib/DFError.h | 30 ---------------
DocFormats/core/src/lib/DFFilesystem.c | 2 +-
DocFormats/core/src/lib/DFFilesystem.h | 2 +-
DocFormats/core/src/lib/DFStorage.c | 2 +-
DocFormats/core/src/lib/DFStorage.h | 39 -------------------
DocFormats/core/src/lib/DFString.h | 2 +-
DocFormats/core/src/lib/DFZipFile.h | 4 +-
DocFormats/core/src/xml/DFDOM.h | 2 +-
DocFormats/core/src/xml/DFXML.h | 6 +--
DocFormats/core/src/xml/DFXMLForward.h | 24 ------------
DocFormats/filters/odf/src/ODFPackage.h | 4 +-
DocFormats/filters/odf/src/ODFSheet.h | 2 +-
DocFormats/filters/ooxml/src/common/OPC.h | 6 +--
DocFormats/filters/ooxml/src/word/Word.h | 4 +-
DocFormats/filters/ooxml/src/word/WordCaption.h | 2 +-
.../filters/ooxml/src/word/WordConverter.h | 4 +-
.../filters/ooxml/src/word/WordNumbering.h | 2 +-
DocFormats/filters/ooxml/src/word/WordObjects.h | 2 +-
DocFormats/filters/ooxml/src/word/WordPackage.h | 4 +-
DocFormats/filters/ooxml/src/word/WordSheet.h | 2 +-
.../filters/ooxml/src/word/WordWhitespace.h | 2 +-
.../ooxml/src/word/lenses/WordBookmark.h | 2 +-
DocFormats/platform/headers/DFPlatform.h | 2 +-
consumers/dfutil/src/Commands.h | 2 +-
consumers/dfutil/src/Plain.h | 4 +-
consumers/dfutil/src/TestCase.h | 4 +-
consumers/dfutil/src/TextPackage.h | 2 +-
47 files changed, 163 insertions(+), 150 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/3rdparty/external/w3c-tidy-html5/experimental/httpio.h
----------------------------------------------------------------------
diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/experimental/httpio.h b/DocFormats/3rdparty/external/w3c-tidy-html5/experimental/httpio.h
index ac8b052..0181c49 100644
--- a/DocFormats/3rdparty/external/w3c-tidy-html5/experimental/httpio.h
+++ b/DocFormats/3rdparty/external/w3c-tidy-html5/experimental/httpio.h
@@ -45,4 +45,4 @@ int openURL( HTTPInputSource* source, tmbstr pUrl );
void closeURL( HTTPInputSource *source );
-#endif
\ No newline at end of file
+#endif
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/3rdparty/external/w3c-tidy-html5/src/version.h
----------------------------------------------------------------------
diff --git a/DocFormats/3rdparty/external/w3c-tidy-html5/src/version.h b/DocFormats/3rdparty/external/w3c-tidy-html5/src/version.h
index 3baa5cf..93dbb89 100644
--- a/DocFormats/3rdparty/external/w3c-tidy-html5/src/version.h
+++ b/DocFormats/3rdparty/external/w3c-tidy-html5/src/version.h
@@ -1 +1 @@
-static const char TY_(release_date)[] = "https://github.com/w3c/tidy-html5/tree/c63cc39";
\ No newline at end of file
+static const char TY_(release_date)[] = "https://github.com/w3c/tidy-html5/tree/c63cc39";
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/CMakeLists.txt b/DocFormats/CMakeLists.txt
index d78acc9..7d0dac0 100644
--- a/DocFormats/CMakeLists.txt
+++ b/DocFormats/CMakeLists.txt
@@ -35,6 +35,9 @@ set(GroupRoot
DFTypes.h)
set(GroupAPI
+ api/headers/DocFormats/DFError.h
+ api/headers/DocFormats/DFStorage.h
+ api/headers/DocFormats/DFXMLForward.h
api/headers/DocFormats/DocFormats.h
api/headers/DocFormats/Formats.h
api/headers/DocFormats/Operations.h
@@ -110,7 +113,6 @@ set(GroupCoreLib
core/src/lib/DFCharacterSet.c
core/src/lib/DFCharacterSet.h
core/src/lib/DFError.c
- core/src/lib/DFError.h
core/src/lib/DFFilesystem.c
core/src/lib/DFFilesystem.h
core/src/lib/DFHashTable.c
@@ -118,7 +120,6 @@ set(GroupCoreLib
core/src/lib/DFString.c
core/src/lib/DFString.h
core/src/lib/DFStorage.c
- core/src/lib/DFStorage.h
core/src/lib/DFZipFile.c
core/src/lib/DFZipFile.h
core/tests/lib/LibTests.c)
@@ -224,7 +225,6 @@ set(GroupCoreXML
core/src/xml/DFNameMap.h
core/src/xml/DFXML.c
core/src/xml/DFXML.h
- core/src/xml/DFXMLForward.h
core/tests/xml/XMLTests.c)
add_library(DocFormats
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/api/headers/DocFormats/DFError.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DFError.h b/DocFormats/api/headers/DocFormats/DFError.h
new file mode 100644
index 0000000..42ca67c
--- /dev/null
+++ b/DocFormats/api/headers/DocFormats/DFError.h
@@ -0,0 +1,40 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef DocFormats_DFError_h
+#define DocFormats_DFError_h
+
+//#include "DFTypes.h"
+#include <stdarg.h>
+
+// It's really not nice having this here, but is the only way to get the compiler to typecheck the
+// DFErrorFormat arguments when such functionality is available.
+#ifndef ATTRIBUTE_FORMAT
+#ifdef _MSC_VER
+#define ATTRIBUTE_FORMAT(archetype,index,first)
+#else
+#define ATTRIBUTE_FORMAT(archetype,index,first) __attribute__((format(archetype,index,first)))
+#endif
+#endif
+
+typedef struct DFError DFError;
+
+void DFErrorSetPosix(DFError **error, int code);
+void DFErrorVFormat(DFError **error, const char *format, va_list ap);
+void DFErrorFormat(DFError **error, const char *format, ...) ATTRIBUTE_FORMAT(printf,2,3);
+DFError *DFErrorRetain(DFError *error);
+void DFErrorRelease(DFError *error);
+const char *DFErrorMessage(DFError **error);
+
+#endif
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/api/headers/DocFormats/DFStorage.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DFStorage.h b/DocFormats/api/headers/DocFormats/DFStorage.h
new file mode 100644
index 0000000..34bee44
--- /dev/null
+++ b/DocFormats/api/headers/DocFormats/DFStorage.h
@@ -0,0 +1,39 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef DocFormats_DFStorage_h
+#define DocFormats_DFStorage_h
+
+#include <DocFormats/DFError.h>
+#include <DocFormats/Formats.h>
+#include <stddef.h>
+
+typedef struct DFStorage DFStorage;
+
+DFStorage *DFStorageNewFilesystem(const char *rootPath, DFFileFormat format);
+DFStorage *DFStorageNewMemory(DFFileFormat format);
+DFStorage *DFStorageCreateZip(const char *filename, DFError **error);
+DFStorage *DFStorageOpenZip(const char *filename, DFError **error);
+DFStorage *DFStorageRetain(DFStorage *storage);
+void DFStorageRelease(DFStorage *storage);
+DFFileFormat DFStorageFormat(DFStorage *storage);
+int DFStorageSave(DFStorage *storage, DFError **error);
+
+int DFStorageRead(DFStorage *storage, const char *path, void **buf, size_t *nbytes, DFError **error);
+int DFStorageWrite(DFStorage *storage, const char *path, void *buf, size_t nbytes, DFError **error);
+int DFStorageExists(DFStorage *storage, const char *path);
+int DFStorageDelete(DFStorage *storage, const char *path, DFError **error);
+const char **DFStorageList(DFStorage *storage, DFError **error);
+
+#endif
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/api/headers/DocFormats/DFXMLForward.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DFXMLForward.h b/DocFormats/api/headers/DocFormats/DFXMLForward.h
new file mode 100644
index 0000000..ddfa7f6
--- /dev/null
+++ b/DocFormats/api/headers/DocFormats/DFXMLForward.h
@@ -0,0 +1,24 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef DocFormats_DFXMLForward_h
+#define DocFormats_DFXMLForward_h
+
+/** This class is described in DFDOM.h */
+typedef struct DFNode DFNode;
+
+/** This class is described in DFDOM.h */
+typedef struct DFDocument DFDocument;
+
+#endif
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/api/headers/DocFormats/DocFormats.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/DocFormats.h b/DocFormats/api/headers/DocFormats/DocFormats.h
index 3723f7d..6de204f 100644
--- a/DocFormats/api/headers/DocFormats/DocFormats.h
+++ b/DocFormats/api/headers/DocFormats/DocFormats.h
@@ -14,3 +14,6 @@
#include <DocFormats/Operations.h>
#include <DocFormats/Formats.h>
+#include <DocFormats/DFStorage.h>
+#include <DocFormats/DFError.h>
+#include <DocFormats/DFXMLForward.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/api/headers/DocFormats/Operations.h
----------------------------------------------------------------------
diff --git a/DocFormats/api/headers/DocFormats/Operations.h b/DocFormats/api/headers/DocFormats/Operations.h
index 40aab83..804bebc 100644
--- a/DocFormats/api/headers/DocFormats/Operations.h
+++ b/DocFormats/api/headers/DocFormats/Operations.h
@@ -15,9 +15,9 @@
#ifndef DocFormats_Operations_h
#define DocFormats_Operations_h
-#include "DFError.h"
-#include "DFStorage.h"
-#include "DFXMLForward.h"
+#include <DocFormats/DFError.h>
+#include <DocFormats/DFStorage.h>
+#include <DocFormats/DFXMLForward.h>
// Abstraction level 2
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/api/src/Operations.c
----------------------------------------------------------------------
diff --git a/DocFormats/api/src/Operations.c b/DocFormats/api/src/Operations.c
index ae305b0..ad7fb5a 100644
--- a/DocFormats/api/src/Operations.c
+++ b/DocFormats/api/src/Operations.c
@@ -15,7 +15,7 @@
#include <DocFormats/Operations.h>
#include "DFFilesystem.h"
#include "DFString.h"
-#include "DFStorage.h"
+#include <DocFormats/DFStorage.h>
#include "Word.h"
#include "DFHTML.h"
#include "DFDOM.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/common/DFBDT.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/common/DFBDT.h b/DocFormats/core/src/common/DFBDT.h
index 1a9517e..253049a 100644
--- a/DocFormats/core/src/common/DFBDT.h
+++ b/DocFormats/core/src/common/DFBDT.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_DFBDT_h
#define DocFormats_DFBDT_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
typedef DFNode *(*DFLookupConcreteFunction)(void *ctx, DFNode *abstract);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/common/DFTable.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/common/DFTable.h b/DocFormats/core/src/common/DFTable.h
index 6f3c377..f34a7b2 100644
--- a/DocFormats/core/src/common/DFTable.h
+++ b/DocFormats/core/src/common/DFTable.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_DFTable_h
#define DocFormats_DFTable_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "DFTypes.h"
typedef struct {
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/css/CSSClassNames.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSClassNames.h b/DocFormats/core/src/css/CSSClassNames.h
index 5a4e239..2f29b62 100644
--- a/DocFormats/core/src/css/CSSClassNames.h
+++ b/DocFormats/core/src/css/CSSClassNames.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_CSSClassNames_h
#define DocFormats_CSSClassNames_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "CSSSheet.h"
void CSSEnsureReferencedStylesPresent(DFDocument *htmlDoc, CSSSheet *styleSheet);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/css/CSSSelector.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSSelector.h b/DocFormats/core/src/css/CSSSelector.h
index bb55ced..6e9c283 100644
--- a/DocFormats/core/src/css/CSSSelector.h
+++ b/DocFormats/core/src/css/CSSSelector.h
@@ -16,7 +16,7 @@
#define DocFormats_CSSSelector_h
#include "DFXMLNames.h"
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
////////////////////////////////////////////////////////////////////////////////////////////////////
// //
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/css/CSSStyle.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/css/CSSStyle.h b/DocFormats/core/src/css/CSSStyle.h
index 2564e9a..8059ec4 100644
--- a/DocFormats/core/src/css/CSSStyle.h
+++ b/DocFormats/core/src/css/CSSStyle.h
@@ -114,7 +114,7 @@
*/
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "CSSSelector.h"
#include "CSSProperties.h"
#include "DFCallback.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/html/DFHTDocument.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTDocument.h b/DocFormats/core/src/html/DFHTDocument.h
index 25202d9..6b5860d 100644
--- a/DocFormats/core/src/html/DFHTDocument.h
+++ b/DocFormats/core/src/html/DFHTDocument.h
@@ -17,7 +17,7 @@
#include "tidy.h"
#include "buffio.h"
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFBuffer.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/html/DFHTML.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTML.h b/DocFormats/core/src/html/DFHTML.h
index 67429fe..a4a5bab 100644
--- a/DocFormats/core/src/html/DFHTML.h
+++ b/DocFormats/core/src/html/DFHTML.h
@@ -17,8 +17,8 @@
#include "DFXMLNames.h"
#include "CSSSheet.h"
-#include "DFXMLForward.h"
-#include "DFError.h"
+#include <DocFormats/DFXMLForward.h>
+#include <DocFormats/DFError.h>
#include "CSSLength.h"
typedef struct CSSSize CSSSize;
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/html/DFHTMLNormalization.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTMLNormalization.h b/DocFormats/core/src/html/DFHTMLNormalization.h
index d6b9bba..b899903 100644
--- a/DocFormats/core/src/html/DFHTMLNormalization.h
+++ b/DocFormats/core/src/html/DFHTMLNormalization.h
@@ -16,7 +16,7 @@
#define DocFormats_DFHTMLNormalization_h
#include "DFXMLNames.h"
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
void HTML_normalizeDocument(DFDocument *doc);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/html/DFHTMLTables.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/html/DFHTMLTables.h b/DocFormats/core/src/html/DFHTMLTables.h
index 8d3f45e..9291de7 100644
--- a/DocFormats/core/src/html/DFHTMLTables.h
+++ b/DocFormats/core/src/html/DFHTMLTables.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_DFHTMLTables_h
#define DocFormats_DFHTMLTables_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "DFTable.h"
DFTable *HTML_tableStructure(DFNode *table);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/lib/DFBuffer.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFBuffer.h b/DocFormats/core/src/lib/DFBuffer.h
index ca739fe..fa013d4 100644
--- a/DocFormats/core/src/lib/DFBuffer.h
+++ b/DocFormats/core/src/lib/DFBuffer.h
@@ -15,9 +15,9 @@
#ifndef DocFormats_DFBuffer_h
#define DocFormats_DFBuffer_h
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFTypes.h"
-#include "DFStorage.h"
+#include <DocFormats/DFStorage.h>
#include <stdarg.h>
////////////////////////////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/lib/DFError.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFError.c b/DocFormats/core/src/lib/DFError.c
index a70cb91..22a543f 100644
--- a/DocFormats/core/src/lib/DFError.c
+++ b/DocFormats/core/src/lib/DFError.c
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFCommon.h"
#include <assert.h>
#include <stdio.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/lib/DFError.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFError.h b/DocFormats/core/src/lib/DFError.h
deleted file mode 100644
index 49791ad..0000000
--- a/DocFormats/core/src/lib/DFError.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef DocFormats_DFError_h
-#define DocFormats_DFError_h
-
-#include "DFTypes.h"
-#include <stdarg.h>
-
-typedef struct DFError DFError;
-
-void DFErrorSetPosix(DFError **error, int code);
-void DFErrorVFormat(DFError **error, const char *format, va_list ap);
-void DFErrorFormat(DFError **error, const char *format, ...) ATTRIBUTE_FORMAT(printf,2,3);
-DFError *DFErrorRetain(DFError *error);
-void DFErrorRelease(DFError *error);
-const char *DFErrorMessage(DFError **error);
-
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/lib/DFFilesystem.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFFilesystem.c b/DocFormats/core/src/lib/DFFilesystem.c
index bfcdfda..24afc0c 100644
--- a/DocFormats/core/src/lib/DFFilesystem.c
+++ b/DocFormats/core/src/lib/DFFilesystem.c
@@ -16,7 +16,7 @@
#include "DFString.h"
#include "DFArray.h"
#include "DFBuffer.h"
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFCharacterSet.h"
#include "DFPlatform.h"
#include "DFCommon.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/lib/DFFilesystem.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFFilesystem.h b/DocFormats/core/src/lib/DFFilesystem.h
index a52c0d7..f597720 100644
--- a/DocFormats/core/src/lib/DFFilesystem.h
+++ b/DocFormats/core/src/lib/DFFilesystem.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_DFUtil_h
#define DocFormats_DFUtil_h
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFHashTable.h"
int DFFileExists(const char *path);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/lib/DFStorage.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFStorage.c b/DocFormats/core/src/lib/DFStorage.c
index 67a0b2d..c4f24e5 100644
--- a/DocFormats/core/src/lib/DFStorage.c
+++ b/DocFormats/core/src/lib/DFStorage.c
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "DFStorage.h"
+#include <DocFormats/DFStorage.h>
#include "DFCommon.h"
#include "DFString.h"
#include "DFFilesystem.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/lib/DFStorage.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFStorage.h b/DocFormats/core/src/lib/DFStorage.h
deleted file mode 100644
index 9ef9a6a..0000000
--- a/DocFormats/core/src/lib/DFStorage.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef DocFormats_DFStorage_h
-#define DocFormats_DFStorage_h
-
-#include "DFError.h"
-#include "DFTypes.h"
-#include <DocFormats/Formats.h>
-
-typedef struct DFStorage DFStorage;
-
-DFStorage *DFStorageNewFilesystem(const char *rootPath, DFFileFormat format);
-DFStorage *DFStorageNewMemory(DFFileFormat format);
-DFStorage *DFStorageCreateZip(const char *filename, DFError **error);
-DFStorage *DFStorageOpenZip(const char *filename, DFError **error);
-DFStorage *DFStorageRetain(DFStorage *storage);
-void DFStorageRelease(DFStorage *storage);
-DFFileFormat DFStorageFormat(DFStorage *storage);
-int DFStorageSave(DFStorage *storage, DFError **error);
-
-int DFStorageRead(DFStorage *storage, const char *path, void **buf, size_t *nbytes, DFError **error);
-int DFStorageWrite(DFStorage *storage, const char *path, void *buf, size_t nbytes, DFError **error);
-int DFStorageExists(DFStorage *storage, const char *path);
-int DFStorageDelete(DFStorage *storage, const char *path, DFError **error);
-const char **DFStorageList(DFStorage *storage, DFError **error);
-
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/lib/DFString.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFString.h b/DocFormats/core/src/lib/DFString.h
index c2b1639..5530c61 100644
--- a/DocFormats/core/src/lib/DFString.h
+++ b/DocFormats/core/src/lib/DFString.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_DFString_h
#define DocFormats_DFString_h
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFArray.h"
#include "DFTypes.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/lib/DFZipFile.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/lib/DFZipFile.h b/DocFormats/core/src/lib/DFZipFile.h
index 21b5041..332cace 100644
--- a/DocFormats/core/src/lib/DFZipFile.h
+++ b/DocFormats/core/src/lib/DFZipFile.h
@@ -15,8 +15,8 @@
#ifndef DocFormats_DFZipFile_h
#define DocFormats_DFZipFile_h
-#include "DFError.h"
-#include "DFStorage.h"
+#include <DocFormats/DFError.h>
+#include <DocFormats/DFStorage.h>
int DFUnzip(const char *zipFilename, DFStorage *storage, DFError **error);
int DFZip(const char *zipFilename, DFStorage *storage, DFError **error);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/xml/DFDOM.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFDOM.h b/DocFormats/core/src/xml/DFDOM.h
index e2ec88d..1ea863e 100644
--- a/DocFormats/core/src/xml/DFDOM.h
+++ b/DocFormats/core/src/xml/DFDOM.h
@@ -90,7 +90,7 @@
#include "DFXMLNamespaces.h"
#include "DFXMLNames.h"
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "DFBuffer.h"
#include <stdarg.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/xml/DFXML.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFXML.h b/DocFormats/core/src/xml/DFXML.h
index b57025a..3318706 100644
--- a/DocFormats/core/src/xml/DFXML.h
+++ b/DocFormats/core/src/xml/DFXML.h
@@ -17,10 +17,10 @@
#include "DFXMLNamespaces.h"
#include "DFXMLNames.h"
-#include "DFXMLForward.h"
-#include "DFError.h"
+#include <DocFormats/DFXMLForward.h>
+#include <DocFormats/DFError.h>
#include "DFBuffer.h"
-#include "DFStorage.h"
+#include <DocFormats/DFStorage.h>
DFDocument *DFParseXMLString(const char *str, DFError **error);
DFDocument *DFParseXMLFile(const char *filename, DFError **error);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/core/src/xml/DFXMLForward.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/src/xml/DFXMLForward.h b/DocFormats/core/src/xml/DFXMLForward.h
deleted file mode 100644
index ddfa7f6..0000000
--- a/DocFormats/core/src/xml/DFXMLForward.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef DocFormats_DFXMLForward_h
-#define DocFormats_DFXMLForward_h
-
-/** This class is described in DFDOM.h */
-typedef struct DFNode DFNode;
-
-/** This class is described in DFDOM.h */
-typedef struct DFDocument DFDocument;
-
-#endif
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/odf/src/ODFPackage.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFPackage.h b/DocFormats/filters/odf/src/ODFPackage.h
index 2fb51e6..834fef6 100644
--- a/DocFormats/filters/odf/src/ODFPackage.h
+++ b/DocFormats/filters/odf/src/ODFPackage.h
@@ -15,8 +15,8 @@
#ifndef DocFormats_ODFPackage_h
#define DocFormats_ODFPackage_h
-#include "DFXMLForward.h"
-#include "DFError.h"
+#include <DocFormats/DFXMLForward.h>
+#include <DocFormats/DFError.h>
#include "ODFManifest.h"
#include "ODFSheet.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/odf/src/ODFSheet.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/src/ODFSheet.h b/DocFormats/filters/odf/src/ODFSheet.h
index dbf9211..8d1fff1 100644
--- a/DocFormats/filters/odf/src/ODFSheet.h
+++ b/DocFormats/filters/odf/src/ODFSheet.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_ODFSheet_h
#define DocFormats_ODFSheet_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "DFTypes.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/common/OPC.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/common/OPC.h b/DocFormats/filters/ooxml/src/common/OPC.h
index a7a8050..76021c7 100644
--- a/DocFormats/filters/ooxml/src/common/OPC.h
+++ b/DocFormats/filters/ooxml/src/common/OPC.h
@@ -15,10 +15,10 @@
#ifndef DocFormats_OPC_h
#define DocFormats_OPC_h
-#include "DFXMLForward.h"
-#include "DFError.h"
+#include <DocFormats/DFXMLForward.h>
+#include <DocFormats/DFError.h>
#include "DFBuffer.h"
-#include "DFStorage.h"
+#include <DocFormats/DFStorage.h>
#include "OOXMLTypedefs.h"
// Essentials of the Open Packaging Conventions
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/word/Word.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/Word.h b/DocFormats/filters/ooxml/src/word/Word.h
index e727786..e871754 100644
--- a/DocFormats/filters/ooxml/src/word/Word.h
+++ b/DocFormats/filters/ooxml/src/word/Word.h
@@ -15,8 +15,8 @@
#ifndef DocFormats_Word_h
#define DocFormats_Word_h
-#include "DFError.h"
-#include "DFStorage.h"
+#include <DocFormats/DFError.h>
+#include <DocFormats/DFStorage.h>
#include "CSSStyle.h"
#include "CSSSheet.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/word/WordCaption.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordCaption.h b/DocFormats/filters/ooxml/src/word/WordCaption.h
index c49abd1..2110f99 100644
--- a/DocFormats/filters/ooxml/src/word/WordCaption.h
+++ b/DocFormats/filters/ooxml/src/word/WordCaption.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_WordCaption_h
#define DocFormats_WordCaption_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "DFTypes.h"
#include "OOXMLTypedefs.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/word/WordConverter.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordConverter.h b/DocFormats/filters/ooxml/src/word/WordConverter.h
index 0900e65..cd31e68 100644
--- a/DocFormats/filters/ooxml/src/word/WordConverter.h
+++ b/DocFormats/filters/ooxml/src/word/WordConverter.h
@@ -20,11 +20,11 @@
#include "DFBDT.h"
#include "DFDOM.h"
#include "DFClassNames.h"
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "CSSSelector.h"
#include "CSSSheet.h"
#include "OOXMLTypedefs.h"
-#include "DFStorage.h"
+#include <DocFormats/DFStorage.h>
#define EMUS_PER_POINT 12700
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/word/WordNumbering.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordNumbering.h b/DocFormats/filters/ooxml/src/word/WordNumbering.h
index bf65aca..8d0e1cb 100644
--- a/DocFormats/filters/ooxml/src/word/WordNumbering.h
+++ b/DocFormats/filters/ooxml/src/word/WordNumbering.h
@@ -16,7 +16,7 @@
#define DocFormats_WordNumbering_h
#include "WordConverter.h"
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "OOXMLTypedefs.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/word/WordObjects.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordObjects.h b/DocFormats/filters/ooxml/src/word/WordObjects.h
index 779d2cd..0a08525 100644
--- a/DocFormats/filters/ooxml/src/word/WordObjects.h
+++ b/DocFormats/filters/ooxml/src/word/WordObjects.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_WordObjects_h
#define DocFormats_WordObjects_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "WordSheet.h"
#include "WordPackage.h"
#include "OOXMLTypedefs.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/word/WordPackage.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordPackage.h b/DocFormats/filters/ooxml/src/word/WordPackage.h
index 9862861..e074c5e 100644
--- a/DocFormats/filters/ooxml/src/word/WordPackage.h
+++ b/DocFormats/filters/ooxml/src/word/WordPackage.h
@@ -15,9 +15,9 @@
#ifndef DocFormats_WordPackage_h
#define DocFormats_WordPackage_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "OPC.h"
-#include "DFStorage.h"
+#include <DocFormats/DFStorage.h>
#include "OOXMLTypedefs.h"
////////////////////////////////////////////////////////////////////////////////////////////////////
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/word/WordSheet.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordSheet.h b/DocFormats/filters/ooxml/src/word/WordSheet.h
index cba9fc6..0a08714 100644
--- a/DocFormats/filters/ooxml/src/word/WordSheet.h
+++ b/DocFormats/filters/ooxml/src/word/WordSheet.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_WordSheet_h
#define DocFormats_WordSheet_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "DFHashTable.h"
#include "DFTypes.h"
#include "OOXMLTypedefs.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/word/WordWhitespace.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/WordWhitespace.h b/DocFormats/filters/ooxml/src/word/WordWhitespace.h
index 63e7661..5b9d1aa 100644
--- a/DocFormats/filters/ooxml/src/word/WordWhitespace.h
+++ b/DocFormats/filters/ooxml/src/word/WordWhitespace.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_WordWhitespace_h
#define DocFormats_WordWhitespace_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
void WordAddNbsps(DFDocument *doc);
void WordRemoveNbsps(DFDocument *doc);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h b/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h
index 774b14a..18f2d87 100644
--- a/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h
+++ b/DocFormats/filters/ooxml/src/word/lenses/WordBookmark.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_WordBookmark_h
#define DocFormats_WordBookmark_h
-#include "DFXMLForward.h"
+#include <DocFormats/DFXMLForward.h>
#include "WordSheet.h"
#include "OOXMLTypedefs.h"
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/DocFormats/platform/headers/DFPlatform.h
----------------------------------------------------------------------
diff --git a/DocFormats/platform/headers/DFPlatform.h b/DocFormats/platform/headers/DFPlatform.h
index 238a09f..0719c33 100755
--- a/DocFormats/platform/headers/DFPlatform.h
+++ b/DocFormats/platform/headers/DFPlatform.h
@@ -15,7 +15,7 @@
#ifndef DocFormats_DFPlatform_h
#define DocFormats_DFPlatform_h
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFArray.h"
#include <stddef.h>
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/consumers/dfutil/src/Commands.h
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/Commands.h b/consumers/dfutil/src/Commands.h
index 4add6c9..8933f08 100644
--- a/consumers/dfutil/src/Commands.h
+++ b/consumers/dfutil/src/Commands.h
@@ -15,7 +15,7 @@
#ifndef dfutil_Commands_h
#define dfutil_Commands_h
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFBuffer.h"
int prettyPrintFile(const char *filename, DFError **error);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/consumers/dfutil/src/Plain.h
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/Plain.h b/consumers/dfutil/src/Plain.h
index 8e73560..96ad5bb 100644
--- a/consumers/dfutil/src/Plain.h
+++ b/consumers/dfutil/src/Plain.h
@@ -15,10 +15,10 @@
#ifndef dfutil_Plain_h
#define dfutil_Plain_h
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFHashTable.h"
#include "DFDOM.h"
-#include "DFStorage.h"
+#include <DocFormats/DFStorage.h>
char *Word_toPlain(DFStorage *rawStorage, DFHashTable *parts);
DFStorage *Word_fromPlain(const char *plain, const char *plainPath, DFError **error);
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/consumers/dfutil/src/TestCase.h
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/TestCase.h b/consumers/dfutil/src/TestCase.h
index f9dfd8e..43b59ab 100644
--- a/consumers/dfutil/src/TestCase.h
+++ b/consumers/dfutil/src/TestCase.h
@@ -17,8 +17,8 @@
#include "DFHashTable.h"
#include "DFBuffer.h"
-#include "DFStorage.h"
-#include "DFXMLForward.h"
+#include <DocFormats/DFStorage.h>
+#include <DocFormats/DFXMLForward.h>
////////////////////////////////////////////////////////////////////////////////////////////////////
// //
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/54c407e9/consumers/dfutil/src/TextPackage.h
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/TextPackage.h b/consumers/dfutil/src/TextPackage.h
index 936309d..077f84e 100644
--- a/consumers/dfutil/src/TextPackage.h
+++ b/consumers/dfutil/src/TextPackage.h
@@ -15,7 +15,7 @@
#ifndef dfutil_TextPackage_h
#define dfutil_TextPackage_h
-#include "DFError.h"
+#include <DocFormats/DFError.h>
#include "DFHashTable.h"
////////////////////////////////////////////////////////////////////////////////////////////////////