more namespacing with Rr*

[chaz/openbox] / render / theme.h

diff --git a/render/theme.h b/render/theme.h
index a60d5cac431973f636f05a34fe727027c90fc439..5c39b3dfc276d9ea72d8c0299a21daddb8842289 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -2,9 +2,6 @@
 #define __theme_h
 
 #include "render.h"
-#include "color.h"
-#include "font.h"
-#include "mask.h"
 
 typedef struct _RrTheme RrTheme;
 
@@ -24,17 +21,17 @@ struct _RrTheme {
     gint grip_width;
 
     /* style settings - colors */
-    color_rgb *b_color;
-    color_rgb *cb_focused_color;
-    color_rgb *cb_unfocused_color;
-    color_rgb *title_focused_color;
-    color_rgb *title_unfocused_color;
-    color_rgb *titlebut_focused_color;
-    color_rgb *titlebut_unfocused_color;
-    color_rgb *menu_title_color;
-    color_rgb *menu_color;
-    color_rgb *menu_disabled_color;
-    color_rgb *menu_hilite_color;
+    RrColor *b_color;
+    RrColor *cb_focused_color;
+    RrColor *cb_unfocused_color;
+    RrColor *title_focused_color;
+    RrColor *title_unfocused_color;
+    RrColor *titlebut_focused_color;
+    RrColor *titlebut_unfocused_color;
+    RrColor *menu_title_color;
+    RrColor *menu_color;
+    RrColor *menu_disabled_color;
+    RrColor *menu_hilite_color;
 
     /* style settings - fonts */
     gint winfont_height;