third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed XMP.hpp from the XMP-SDK to XMPSDK.hpp to avoid potential name clashes with Exiv2's xmp.hpp

Browse Source
This commit is contained in:
Andreas Huggel 2008-05-21 02:57:21 +00:00
parent 505add251c
commit f8a4d46103
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/convert.cpp
View File

@ -45,7 +45,7 @@ EXIV2_RCSID("@(#) $Id$")
// Adobe XMP Toolkit
#ifdef EXV_HAVE_XMP_TOOLKIT
# define TXMP_STRING_TYPE std::string
# include <XMP.hpp>
# include <XMPSDK.hpp>
# include <MD5.h>
#endif // EXV_HAVE_XMP_TOOLKIT

2
src/xmp.cpp
View File

@ -45,7 +45,7 @@ EXIV2_RCSID("@(#) $Id$")
// Adobe XMP Toolkit
#ifdef EXV_HAVE_XMP_TOOLKIT
# define TXMP_STRING_TYPE std::string
# include <XMP.hpp>
# include <XMPSDK.hpp>
# include <XMP.incl_cpp>
#endif // EXV_HAVE_XMP_TOOLKIT

4
xmpsdk/include/TXMPIterator.hpp
View File

@ -2,7 +2,7 @@
#define __TXMPIterator_hpp__ 1
#if ( ! __XMP_hpp__ )
#error "Do not directly include, use XMP.hpp"
#error "Do not directly include, use XMPSDK.hpp"
#endif
// =================================================================================================
@ -37,7 +37,7 @@
/// are automatically copied and access is fully thread safe. String objects are only necessary
/// for output strings. Input string are literals and passed as typical C <tt>const char *</tt>.
///
/// The template parameter, class \c TtStringObj, is described in the XMP.hpp umbrella header.
/// The template parameter, class \c TtStringObj, is described in the XMPSDK.hpp umbrella header.
///
/// \note Only XMP object iteration is implemented at this time. There are no table iterators yet.
///

6
xmpsdk/include/TXMPMeta.hpp
View File

@ -2,7 +2,7 @@
#define __TXMPMeta_hpp__ 1
#if ( ! __XMP_hpp__ )
#error "Do not directly include, use XMP.hpp"
#error "Do not directly include, use XMPSDK.hpp"
#endif
// =================================================================================================
@ -33,11 +33,11 @@
///
/// This template wraps a string object class around the raw XMP API. This provides two significant
/// benefits, output strings are automatically copied and access is fully thread safe. The
/// umbrella header, \c XMP.hpp, provides an \c SXMPMeta typedef for the instantiated template. String
/// umbrella header, \c XMPSDK.hpp, provides an \c SXMPMeta typedef for the instantiated template. String
/// objects are only necessary for output strings. Input string are literals and passed as typical
/// C <tt>const char *</tt>.
///
/// The template parameter, class \c TtStringObj, is described in the XMP.hpp umbrella header.
/// The template parameter, class \c TtStringObj, is described in the XMPSDK.hpp umbrella header.
///
/// <b>Be aware that the \c TXMPMeta class is a normal C++ template, it is instantiated and local to
/// each client executable. As are the other TXMP* classes. Different clients might not even use the

4
xmpsdk/include/TXMPUtils.hpp
View File

@ -2,7 +2,7 @@
#define __TXMPUtils_hpp__ 1
#if ( ! __XMP_hpp__ )
#error "Do not directly include, use XMP.hpp"
#error "Do not directly include, use XMPSDK.hpp"
#endif
// =================================================================================================
@ -37,7 +37,7 @@
/// copied and access is fully thread safe. String objects are only necessary for output strings.
/// Input strings are literals and passed as typical C <tt>const char *</tt>.
///
/// The template parameter, class \c TtStringObj, is described in the XMP.hpp umbrella header.
/// The template parameter, class \c TtStringObj, is described in the XMPSDK.hpp umbrella header.
// ================================================================================================
template <class tStringObj>

2
xmpsdk/include/XMP.incl_cpp
View File

@ -28,7 +28,7 @@
/// \endcode
#include "XMP.hpp" // ! This must be the first include!
#include "XMPSDK.hpp" // ! This must be the first include!
#define XMP_ClientBuild 1

2
xmpsdk/include/XMP.hpp → xmpsdk/include/XMPSDK.hpp
View File

@ -10,7 +10,7 @@
// =================================================================================================
// ================================================================================================
/// \file XMP.hpp
/// \file XMPSDK.hpp
/// \brief Overall header file for the XMP toolkit.
///
/// This is an overall header file, the only one that C++ clients should #include. The full client

2
xmpsdk/include/client-glue/TXMPIterator.incl_cpp
View File

@ -11,7 +11,7 @@
/// \file TXMPIterator.incl_cpp
/// \brief The implementation of the TXMPIterator template class.
#include "XMP.hpp"
#include "XMPSDK.hpp"
#include "client-glue/WXMP_Common.hpp"
#include "client-glue/WXMPIterator.hpp"

2
xmpsdk/include/client-glue/TXMPMeta.incl_cpp
View File

@ -11,7 +11,7 @@
/// \file TXMPMeta.incl_cpp
/// \brief The implementation of the TXMPMeta template class.
#include "XMP.hpp"
#include "XMPSDK.hpp"
#include "client-glue/WXMP_Common.hpp"
#include "client-glue/WXMPMeta.hpp"

2
xmpsdk/include/client-glue/TXMPUtils.incl_cpp
View File

@ -11,7 +11,7 @@
/// \file TXMPUtils.incl_cpp
/// \brief The implementation of the TXMPUtils template class.
#include "XMP.hpp"
#include "XMPSDK.hpp"
#include "client-glue/WXMP_Common.hpp"
#include "client-glue/WXMPUtils.hpp"