summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-12-28 02:41:13 +0000
committerCarl Hetherington <cth@carlh.net>2014-12-28 02:41:13 +0000
commit795b049f4a167677a8a2d39a4a09e8f5c2bb8dca (patch)
tree09ed1934110e30e3f5eaa3a1d15cca3e05573572 /src
parent1e0e3f4c2f3c956a4c011aaa1f9fb42a7339b129 (diff)
More tests.
Diffstat (limited to 'src')
-rw-r--r--src/interop_load_font.cc2
-rw-r--r--src/interop_load_font.h7
2 files changed, 3 insertions, 6 deletions
diff --git a/src/interop_load_font.cc b/src/interop_load_font.cc
index c40d64c4..dede5696 100644
--- a/src/interop_load_font.cc
+++ b/src/interop_load_font.cc
@@ -32,7 +32,7 @@ InteropLoadFont::InteropLoadFont (string id_, string uri_)
}
-InteropLoadFont::InteropLoadFont (shared_ptr<const cxml::Node> node)
+InteropLoadFont::InteropLoadFont (cxml::ConstNodePtr node)
{
optional<string> x = node->optional_string_attribute ("Id");
if (!x) {
diff --git a/src/interop_load_font.h b/src/interop_load_font.h
index 61f63ffb..c553b557 100644
--- a/src/interop_load_font.h
+++ b/src/interop_load_font.h
@@ -17,13 +17,10 @@
*/
+#include <libcxml/cxml.h>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
-namespace cxml {
- class Node;
-}
-
namespace dcp {
class InteropLoadFont
@@ -31,7 +28,7 @@ class InteropLoadFont
public:
InteropLoadFont () {}
InteropLoadFont (std::string id, std::string uri);
- InteropLoadFont (boost::shared_ptr<const cxml::Node> node);
+ InteropLoadFont (cxml::ConstNodePtr node);
std::string id;
std::string uri;