From 6fa62a3029571dbecc6fa8eef8b465223659b768 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Mon, 14 Sep 2009 20:26:33 +0200 Subject: [PATCH] widgets: move into objects Signed-off-by: Julien Danjou --- CMakeLists.txt | 8 ++++---- event.c | 2 +- ewmh.c | 2 +- mouse.c | 2 +- widget.c => objects/widget.c | 0 widget.h => objects/widget.h | 0 {widgets => objects/widgets}/imagebox.c | 2 +- {widgets => objects/widgets}/systray.c | 2 +- {widgets => objects/widgets}/textbox.c | 2 +- property.c | 2 +- screen.c | 2 +- systray.c | 4 ++-- titlebar.c | 2 +- wibox.h | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) rename widget.c => objects/widget.c (100%) rename widget.h => objects/widget.h (100%) rename {widgets => objects/widgets}/imagebox.c (99%) rename {widgets => objects/widgets}/systray.c (99%) rename {widgets => objects/widgets}/textbox.c (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bcf0d592..cfc2c614 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/event.c b/event.c index 92943f11..630fa480 100644 --- a/event.c +++ b/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" diff --git a/ewmh.c b/ewmh.c index 2ae6238b..61822bd7 100644 --- a/ewmh.c +++ b/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" diff --git a/mouse.c b/mouse.c index c77752bc..dce53707 100644 --- a/mouse.c +++ b/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" diff --git a/widget.c b/objects/widget.c similarity index 100% rename from widget.c rename to objects/widget.c diff --git a/widget.h b/objects/widget.h similarity index 100% rename from widget.h rename to objects/widget.h diff --git a/widgets/imagebox.c b/objects/widgets/imagebox.c similarity index 99% rename from widgets/imagebox.c rename to objects/widgets/imagebox.c index f62f53f0..d92adcd7 100644 --- a/widgets/imagebox.c +++ b/objects/widgets/imagebox.c @@ -19,7 +19,7 @@ * */ -#include "widget.h" +#include "objects/widget.h" #include "luaa.h" #include "titlebar.h" diff --git a/widgets/systray.c b/objects/widgets/systray.c similarity index 99% rename from widgets/systray.c rename to objects/widgets/systray.c index 19fd6a23..44901e79 100644 --- a/widgets/systray.c +++ b/objects/widgets/systray.c @@ -22,7 +22,7 @@ #include #include -#include "widget.h" +#include "objects/widget.h" #include "screen.h" #include "wibox.h" #include "globalconf.h" diff --git a/widgets/textbox.c b/objects/widgets/textbox.c similarity index 99% rename from widgets/textbox.c rename to objects/widgets/textbox.c index e5e63735..705b725f 100644 --- a/widgets/textbox.c +++ b/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" diff --git a/property.c b/property.c index bad6d12b..2c2752a1 100644 --- a/property.c +++ b/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" diff --git a/screen.c b/screen.c index f5ae7500..f8149f21 100644 --- a/screen.c +++ b/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" diff --git a/systray.c b/systray.c index 1f573eef..c2c330a1 100644 --- a/systray.c +++ b/systray.c @@ -1,7 +1,7 @@ /* * systray.c - systray handling * - * Copyright © 2008 Julien Danjou + * Copyright © 2008-2009 Julien Danjou * * 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" diff --git a/titlebar.c b/titlebar.c index f3a07490..ab708446 100644 --- a/titlebar.c +++ b/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" diff --git a/wibox.h b/wibox.h index fe7050a9..8bbeed1b 100644 --- a/wibox.h +++ b/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"