projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put Font and Screen into dcpomatic namespace.
[dcpomatic.git]
/
src
/
lib
/
font.cc
diff --git
a/src/lib/font.cc
b/src/lib/font.cc
index 333539aa4b7cbc6441dbc2e5c75dae4d0f7752a3..019c9ab076fe8f83e362c8030f2542b4beceb1df 100644
(file)
--- a/
src/lib/font.cc
+++ b/
src/lib/font.cc
@@
-24,6
+24,7
@@
#include <boost/foreach.hpp>
using std::string;
#include <boost/foreach.hpp>
using std::string;
+using namespace dcpomatic;
Font::Font (cxml::NodePtr node)
: _id (node->string_child ("Id"))
Font::Font (cxml::NodePtr node)
: _id (node->string_child ("Id"))
@@
-47,7
+48,7
@@
Font::as_xml (xmlpp::Node* node)
bool
bool
-operator== (Font const & a, Font const & b)
+
dcpomatic::
operator== (Font const & a, Font const & b)
{
if (a.id() != b.id()) {
return false;
{
if (a.id() != b.id()) {
return false;
@@
-57,7
+58,7
@@
operator== (Font const & a, Font const & b)
}
bool
}
bool
-operator!= (Font const & a, Font const & b)
+
dcpomatic::
operator!= (Font const & a, Font const & b)
{
return !(a == b);
}
{
return !(a == b);
}