From b57c2e0beeeb846cf6ca312899fcb4206669ca72 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Tue, 28 Jun 2011 15:18:48 +0000
Subject: Move rectangle type to utils/types.h

svn path=/trunk/netsurf/; revision=12525
---
 desktop/browser.h  |  2 +-
 desktop/plotters.h |  2 +-
 desktop/shape.h    | 32 --------------------------------
 framebuffer/gui.c  |  2 +-
 render/box.h       |  2 +-
 riscos/save_draw.c |  2 +-
 utils/types.h      | 32 ++++++++++++++++++++++++++++++++
 7 files changed, 37 insertions(+), 37 deletions(-)
 delete mode 100644 desktop/shape.h
 create mode 100644 utils/types.h

diff --git a/desktop/browser.h b/desktop/browser.h
index c1f07db09..6a313f032 100644
--- a/desktop/browser.h
+++ b/desktop/browser.h
@@ -31,8 +31,8 @@
 #include "content/content.h"
 #include "desktop/gui.h"
 #include "desktop/mouse.h"
-#include "desktop/shape.h"
 #include "render/html.h"
+#include "utils/types.h"
 
 struct box;
 struct hlcache_handle;
diff --git a/desktop/plotters.h b/desktop/plotters.h
index 02735a15f..ff5e8a9c7 100644
--- a/desktop/plotters.h
+++ b/desktop/plotters.h
@@ -27,7 +27,7 @@
 #include "css/css.h"
 #include "content/content.h"
 #include "desktop/plot_style.h"
-#include "desktop/shape.h"
+#include "utils/types.h"
 
 struct bitmap;
 
diff --git a/desktop/shape.h b/desktop/shape.h
deleted file mode 100644
index 5baf629b6..000000000
--- a/desktop/shape.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2011 Michael Drake <tlsa@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-/** \file
- * Core shapes.
- */
-
-#ifndef _NETSURF_DESKTOP_SHAPE_H_
-#define _NETSURF_DESKTOP_SHAPE_H_
-
-/* Rectangle coordinates */
-struct rect {
-	int x0, y0; /* Top left */
-	int x1, y1; /* Bottom right */
-};
-
-#endif
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 4df9d5bf8..7df3a9173 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -36,11 +36,11 @@
 #include "desktop/plotters.h"
 #include "desktop/netsurf.h"
 #include "desktop/options.h"
-#include "desktop/shape.h"
 #include "utils/filepath.h"
 #include "utils/log.h"
 #include "utils/messages.h"
 #include "utils/schedule.h"
+#include "utils/types.h"
 #include "utils/url.h"
 #include "utils/utils.h"
 #include "desktop/textinput.h"
diff --git a/render/box.h b/render/box.h
index 9c8161373..28dd007da 100644
--- a/render/box.h
+++ b/render/box.h
@@ -92,8 +92,8 @@
 #include <libxml/HTMLparser.h>
 
 #include "desktop/browser.h"
-#include "desktop/shape.h"
 #include "css/css.h"
+#include "utils/types.h"
 
 struct box;
 struct column;
diff --git a/riscos/save_draw.c b/riscos/save_draw.c
index dcc0af5fa..63730bd00 100644
--- a/riscos/save_draw.c
+++ b/riscos/save_draw.c
@@ -32,11 +32,11 @@
 #include "content/content.h"
 #include "content/hlcache.h"
 #include "desktop/plotters.h"
-#include "desktop/shape.h"
 #include "riscos/bitmap.h"
 #include "riscos/gui.h"
 #include "riscos/save_draw.h"
 #include "utils/log.h"
+#include "utils/types.h"
 #include "utils/utils.h"
 
 static bool ro_save_draw_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style);
diff --git a/utils/types.h b/utils/types.h
new file mode 100644
index 000000000..40427b658
--- /dev/null
+++ b/utils/types.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2011 Michael Drake <tlsa@netsurf-browser.org>
+ *
+ * This file is part of NetSurf, http://www.netsurf-browser.org/
+ *
+ * NetSurf is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * NetSurf is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/** \file
+ * Core types.
+ */
+
+#ifndef _NETSURF_UTILS_TYPES_H_
+#define _NETSURF_UTILS_TYPES_H_
+
+/* Rectangle coordinates */
+struct rect {
+	int x0, y0; /* Top left */
+	int x1, y1; /* Bottom right */
+};
+
+#endif
-- 
cgit v1.2.3