fix tab/spaces

src/modules/main/font.cpp

@@ -45,15 +45,12 @@ font::load(void const *data)
 }
 
 font::font() :
-    m_height(0),
-    m_width(0),
 	m_count(0),
 	m_data(nullptr)
 {}
 
 font::font(unsigned height, unsigned width, unsigned count, uint8_t const *data) :
-    m_height(height),
-    m_width(width),
+	m_size(width, height),
 	m_count(count),
 	m_data(data)
 {}
@@ -63,8 +60,8 @@ font::draw_glyph(
 		screen &s,
 		uint32_t glyph,
 		screen::pixel_t color,
-        screen::coord_t x,
-        screen::coord_t y) const
+		unsigned x,
+		unsigned y) const
 {
 	unsigned bwidth = (m_width+7)/8;
 	uint8_t const *data = m_data + (glyph * glyph_bytes());

src/modules/main/font.h

@@ -18,8 +18,8 @@ public:
 			screen &s,
 			uint32_t glyph,
 			screen::pixel_t color,
-            screen::coord_t x,
-            screen::coord_t y) const;
+			unsigned x,
+			unsigned y) const;
 
 private:
 	font();

src/modules/main/screen.h

@@ -13,16 +13,17 @@ public:
 		coord_t hres, coord_t vres,
 		pixel_t rmask, pixel_t gmask, pixel_t bmask);
 
-    void fill(pixel_t color);
-    void draw_pixel(coord_t x, coord_t y, pixel_t color);
 
-    screen() = delete;
-    screen(const screen &) = delete;
+
+	void fill(pixel_t color);
+	void draw_pixel(unsigned x, unsigned y, pixel_t color);
 
     struct color_masks {
         pixel_t r, g, b;
         color_masks(pixel_t r, pixel_t g, pixel_t b);
     };
+	screen() = delete;
+	screen(const screen &) = delete;
 
     struct resolution {
         coord_t w, h;