diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-26 23:46:08 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-26 23:46:08 +0000 |
| commit | d6b24c1540e9a7f388dd1500c762f73586119280 (patch) | |
| tree | 09b01572b9201c4bb18880202cf29fa9e420716f /src | |
| parent | Fix check for X11 backend with Gtk+ 2 (diff) | |
| download | inkscape-d6b24c1540e9a7f388dd1500c762f73586119280.tar.gz inkscape-d6b24c1540e9a7f388dd1500c762f73586119280.zip | |
Stop using top-level glibmm header
(bzr r12251)
Diffstat (limited to 'src')
| -rw-r--r-- | src/dropper-context.cpp | 1 | ||||
| -rw-r--r-- | src/helper/geom.cpp | 26 | ||||
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 4 | ||||
| -rw-r--r-- | src/registrytool.h | 5 |
4 files changed, 17 insertions, 19 deletions
diff --git a/src/dropper-context.cpp b/src/dropper-context.cpp index d41e4059d..05d22017e 100644 --- a/src/dropper-context.cpp +++ b/src/dropper-context.cpp @@ -15,7 +15,6 @@ # include <config.h> #endif -#include <glibmm.h> #include <glibmm/i18n.h> #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp index 3e63df1ac..077344380 100644 --- a/src/helper/geom.cpp +++ b/src/helper/geom.cpp @@ -9,6 +9,7 @@ * Released under GNU GPL */ +#include <algorithm> #include "helper/geom.h" #include "helper/geom-curves.h" #include <typeinfo> @@ -20,7 +21,6 @@ #include <2geom/rect.h> #include <2geom/coord.h> #include <2geom/sbasis-to-bezier.h> -#include <glibmm.h> using Geom::X; using Geom::Y; @@ -275,18 +275,18 @@ geom_cubic_bbox_wind_distance (Geom::Coord x000, Geom::Coord y000, if (bbox) cubic_bbox (x000, y000, x001, y001, x011, y011, x111, y111, *bbox); - x0 = MIN (x000, x001); - x0 = MIN (x0, x011); - x0 = MIN (x0, x111); - y0 = MIN (y000, y001); - y0 = MIN (y0, y011); - y0 = MIN (y0, y111); - x1 = MAX (x000, x001); - x1 = MAX (x1, x011); - x1 = MAX (x1, x111); - y1 = MAX (y000, y001); - y1 = MAX (y1, y011); - y1 = MAX (y1, y111); + x0 = std::min (x000, x001); + x0 = std::min (x0, x011); + x0 = std::min (x0, x111); + y0 = std::min (y000, y001); + y0 = std::min (y0, y011); + y0 = std::min (y0, y111); + x1 = std::min (x000, x001); + x1 = std::min (x1, x011); + x1 = std::min (x1, x111); + y1 = std::min (y000, y001); + y1 = std::min (y1, y011); + y1 = std::min (y1, y111); if (best) { /* Quickly adjust to endpoints */ diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index bb8b0887f..74c706a1b 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -14,9 +14,7 @@ # include "config.h" #endif -#include <glibmm.h> -#include <glib.h> -#include <glibmm/i18n.h> // _() +#include <glibmm/i18n.h> #include <pango/pangoft2.h> #include "libnrtype/FontFactory.h" #include "libnrtype/font-instance.h" diff --git a/src/registrytool.h b/src/registrytool.h index 0a8139184..335a8bd52 100644 --- a/src/registrytool.h +++ b/src/registrytool.h @@ -21,8 +21,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <string> -#include <glibmm.h> +namespace Glib { + class ustring; +} /** * Inkscape Registry Tool |