include/rays/bitmap.h in rays-0.1.3 vs include/rays/bitmap.h in rays-0.1.4

@@ -2,23 +2,25 @@
 #pragma once
 #ifndef __RAYS_BITMAP_H__
 #define __RAYS_BITMAP_H__
 
 
+#include <xot/pimpl.h>
 #include <rays/defs.h>
 #include <rays/colorspace.h>
 #include <rays/font.h>
-#include <rays/helpers.h>
 
 
 namespace Rays
 {
 
 
 	class Bitmap
 	{
 
+		typedef Bitmap This;
+
 		public:
 
 			Bitmap ();
 
 			Bitmap (int width, int height, const ColorSpace& cs = RGBA);
@@ -48,19 +50,19 @@
 				return (T*) (((char*) data()) + pitch() * y + x * color_space().Bpp());
 			}
 
 			template <typename T> const T* at (int x, int y) const
 			{
-				return const_cast<Bitmap*>(this)->at<T>(x, y);
+				return const_cast<This*>(this)->at<T>(x, y);
 			}
 
 			operator bool () const;
 
 			bool operator ! () const;
 
 			struct Data;
 
-			Impl<Data> self;
+			Xot::PImpl<Data, true> self;
 
 	};// Bitmap
 
 
 	bool load_bitmap (Bitmap* bitmap, const char* path);