widgets: move into objects

Signed-off-by: Julien Danjou <julien@danjou.info>

CMakeLists.txt

@@ -59,7 +59,7 @@ set(AWE_SRCS
     ${SOURCE_DIR}/systray.c
     ${SOURCE_DIR}/objects/tag.c
     ${SOURCE_DIR}/titlebar.c
-    ${SOURCE_DIR}/widget.c
+    ${SOURCE_DIR}/objects/widget.c
     ${SOURCE_DIR}/window.c
     ${SOURCE_DIR}/image.c
     ${SOURCE_DIR}/draw.c
@@ -76,9 +76,9 @@ set(AWE_SRCS
     ${SOURCE_DIR}/common/backtrace.c
     ${SOURCE_DIR}/common/luaobject.c
     ${SOURCE_DIR}/common/luaclass.c
-    ${SOURCE_DIR}/widgets/textbox.c
-    ${SOURCE_DIR}/widgets/systray.c
-    ${SOURCE_DIR}/widgets/imagebox.c)
+    ${SOURCE_DIR}/objects/widgets/textbox.c
+    ${SOURCE_DIR}/objects/widgets/systray.c
+    ${SOURCE_DIR}/objects/widgets/imagebox.c)
 
 set(AWE_MAN_SRCS
     ${SOURCE_DIR}/manpages/awesome.1.txt

event.c

@@ -31,7 +31,7 @@
 #include "window.h"
 #include "ewmh.h"
 #include "objects/client.h"
-#include "widget.h"
+#include "objects/widget.h"
 #include "titlebar.h"
 #include "key.h"
 #include "keygrabber.h"

ewmh.c

@@ -29,7 +29,7 @@
 #include "objects/tag.h"
 #include "screen.h"
 #include "objects/client.h"
-#include "widget.h"
+#include "objects/widget.h"
 #include "wibox.h"
 #include "luaa.h"
 #include "common/atoms.h"

mouse.c

@@ -21,7 +21,7 @@
 
 #include "mouse.h"
 #include "screen.h"
-#include "client.h"
+#include "objects/client.h"
 #include "globalconf.h"
 #include "wibox.h"
 #include "luaa.h"

objects/widgets/imagebox.c

@@ -19,7 +19,7 @@
  *
  */
 
-#include "widget.h"
+#include "objects/widget.h"
 #include "luaa.h"
 #include "titlebar.h"
 

objects/widgets/systray.c

@@ -22,7 +22,7 @@
 #include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
 
-#include "widget.h"
+#include "objects/widget.h"
 #include "screen.h"
 #include "wibox.h"
 #include "globalconf.h"

objects/widgets/textbox.c

@@ -19,7 +19,7 @@
  *
  */
 
-#include "widget.h"
+#include "objects/widget.h"
 #include "wibox.h"
 #include "luaa.h"
 #include "common/tokenize.h"

property.c

@@ -23,7 +23,7 @@
 
 #include "screen.h"
 #include "property.h"
-#include "client.h"
+#include "objects/client.h"
 #include "ewmh.h"
 #include "wibox.h"
 #include "window.h"

screen.c

@@ -28,7 +28,7 @@
 #include "ewmh.h"
 #include "objects/tag.h"
 #include "objects/client.h"
-#include "widget.h"
+#include "objects/widget.h"
 #include "wibox.h"
 #include "luaa.h"
 #include "common/xutil.h"

systray.c

@@ -1,7 +1,7 @@
 /*
  * systray.c - systray handling
  *
- * Copyright © 2008 Julien Danjou <julien@danjou.info>
+ * Copyright © 2008-2009 Julien Danjou <julien@danjou.info>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@
 #include "screen.h"
 #include "systray.h"
 #include "window.h"
-#include "widget.h"
+#include "objects/widget.h"
 #include "common/atoms.h"
 #include "common/xutil.h"
 

titlebar.c

@@ -23,7 +23,7 @@
 
 #include "titlebar.h"
 #include "objects/client.h"
-#include "widget.h"
+#include "objects/widget.h"
 #include "wibox.h"
 #include "screen.h"
 #include "luaa.h"

wibox.h

@@ -22,7 +22,7 @@
 #ifndef AWESOME_WIBOX_H
 #define AWESOME_WIBOX_H
 
-#include "widget.h"
+#include "objects/widget.h"
 #include "strut.h"
 #include "common/luaobject.h"