1 files changed, 36 insertions, 36 deletions

diff --git a/src/request.h b/src/request.h
index c28468e..7c21731 100644
--- a/src/request.h
+++ b/src/request.h
@@ -8,8 +8,8 @@
  * Client callback wrappers
  */
 
-#ifndef nslayout_request_h_
-#define nslayout_request_h_
+#ifndef nsl_request_h_
+#define nsl_request_h_
 
 #include <libnslayout/nslayout.h>
 
@@ -19,17 +19,17 @@
  * \param[in]  layout	Layout object that the request concerns.
  * \param[in]  url	Absolute URL to request replaced object handle for.
  * \param[out] replaced	Returns the replaced element content handle.
- * \return NSLAYOUT_OK on success, appropriate error otherwise.
+ * \return NSL_OK on success, appropriate error otherwise.
  */
-static inline nslayout_error nsl_request_get_resource(
-		nslayout_layout *layout,
+static inline nsl_error nsl_request_get_resource(
+		nsl_layout *layout,
 		const char *url,
-		nslayout_replaced **replaced)
+		nsl_replaced **replaced)
 {
-	nslayout_error err;
-	nslayout_request req;
+	nsl_error err;
+	nsl_request req;
 
-	req.type = NSLAYOUT_GET_RESOURCE;
+	req.type = NSL_GET_RESOURCE;
 	req.request.get_resource.url = url;
 
 	err = layout->cb(layout, layout->pw, &req);
@@ -44,17 +44,17 @@ static inline nslayout_error nsl_request_get_resource(
  * \param[in]  layout	Layout object that the request concerns.
  * \param[in]  element	DOM element that needs replacement object.
  * \param[out] replaced	Returns the replaced element content handle.
- * \return NSLAYOUT_OK on success, appropriate error otherwise.
+ * \return NSL_OK on success, appropriate error otherwise.
  */
-static inline nslayout_error nsl_request_create_replaced(
-		nslayout_layout *layout,
+static inline nsl_error nsl_request_create_replaced(
+		nsl_layout *layout,
 		dom_element *element,
-		nslayout_replaced **replaced)
+		nsl_replaced **replaced)
 {
-	nslayout_error err;
-	nslayout_request req;
+	nsl_error err;
+	nsl_request req;
 
-	req.type = NSLAYOUT_CREATE_REPLACED;
+	req.type = NSL_CREATE_REPLACED;
 	req.request.create_replaced.element = element;
 
 	err = layout->cb(layout, layout->pw, &req);
@@ -68,16 +68,16 @@ static inline nslayout_error nsl_request_create_replaced(
  *
  * \param[in] layout	Layout object being rendered.
  * \param[in] list	Render list to render.
- * \return NSLAYOUT_OK on success, appropriate error otherwise.
+ * \return NSL_OK on success, appropriate error otherwise.
  */
-static inline nslayout_error nsl_request_render(
-		nslayout_layout *layout,
-		nslayout_render_list *list)
+static inline nsl_error nsl_request_render(
+		nsl_layout *layout,
+		nsl_render_list *list)
 {
-	nslayout_error err;
-	nslayout_request req;
+	nsl_error err;
+	nsl_request req;
 
-	req.type = NSLAYOUT_RENDER;
+	req.type = NSL_RENDER;
 	req.request.render.list = list;
 
 	err = layout->cb(layout, layout->pw, &req);
@@ -91,17 +91,17 @@ static inline nslayout_error nsl_request_render(
  * \param[in] layout	Layout object that the request concerns.
  * \param[in] width	The layout's full width.
  * \param[in] height	The layout's full height.
- * \return NSLAYOUT_OK on success, appropriate error otherwise.
+ * \return NSL_OK on success, appropriate error otherwise.
  */
-static inline nslayout_error nsl_request_set_extents(
-		nslayout_layout *layout,
+static inline nsl_error nsl_request_set_extents(
+		nsl_layout *layout,
 		unsigned int width,
 		unsigned int height)
 {
-	nslayout_error err;
-	nslayout_request req;
+	nsl_error err;
+	nsl_request req;
 
-	req.type = NSLAYOUT_SET_EXTENTS;
+	req.type = NSL_SET_EXTENTS;
 	req.request.set_extents.width  = width;
 	req.request.set_extents.height = height;
 
@@ -117,18 +117,18 @@ static inline nslayout_error nsl_request_set_extents(
  * \param[in]  replaced	Replaced object to get intrinsic size of.
  * \param[out] width	Returns the replaced object's width.
  * \param[out] height	Returns the replaced object's height.
- * \return NSLAYOUT_OK on success, appropriate error otherwise.
+ * \return NSL_OK on success, appropriate error otherwise.
  */
-static inline nslayout_error nsl_request_get_intrinsic_size(
-		nslayout_layout *layout,
-		nslayout_replaced *replaced,
+static inline nsl_error nsl_request_get_intrinsic_size(
+		nsl_layout *layout,
+		nsl_replaced *replaced,
 		unsigned int *width,
 		unsigned int *height)
 {
-	nslayout_error err;
-	nslayout_request req;
+	nsl_error err;
+	nsl_request req;
 
-	req.type = NSLAYOUT_GET_INTRINSIC_SIZE;
+	req.type = NSL_GET_INTRINSIC_SIZE;
 	req.request.get_intrinsic_size.replaced = replaced;
 
 	err = layout->cb(layout, layout->pw, &req);