diff options
author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2017-01-08 20:19:04 +0200 |
---|---|---|
committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2017-01-08 20:19:04 +0200 |
commit | d68840d9e8b2a95b3ae6897b6b962b8268f6ce37 (patch) | |
tree | dcee60331ec24398e8444e77fbb0aaa028b2e04c | |
parent | d259ff5b7ad5dc72cdca2df50c45acc18b4e4076 (diff) | |
download | metacity-d68840d9e8b2a95b3ae6897b6b962b8268f6ce37.tar.gz |
compositor: rename files
-rw-r--r-- | src/Makefile.am | 14 | ||||
-rw-r--r-- | src/compositor/meta-compositor-none.c (renamed from src/compositor/compositor-none.c) | 4 | ||||
-rw-r--r-- | src/compositor/meta-compositor-none.h (renamed from src/compositor/compositor-none.h) | 0 | ||||
-rw-r--r-- | src/compositor/meta-compositor-private.h (renamed from src/compositor/compositor-private.h) | 2 | ||||
-rw-r--r-- | src/compositor/meta-compositor-xrender.c (renamed from src/compositor/compositor-xrender.c) | 6 | ||||
-rw-r--r-- | src/compositor/meta-compositor-xrender.h (renamed from src/compositor/compositor-xrender.h) | 4 | ||||
-rw-r--r-- | src/compositor/meta-compositor.c (renamed from src/compositor/compositor.c) | 6 | ||||
-rw-r--r-- | src/core/display.c | 5 | ||||
-rw-r--r-- | src/core/screen.c | 5 | ||||
-rw-r--r-- | src/core/window.c | 5 | ||||
-rw-r--r-- | src/include/meta-compositor.h (renamed from src/include/compositor.h) | 0 |
11 files changed, 27 insertions, 24 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index aecf4f8b..062651f1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -30,13 +30,13 @@ metacity_SOURCES= \ core/util.c \ include/util.h \ include/common.h \ - compositor/compositor.c \ - compositor/compositor-none.c \ - compositor/compositor-none.h \ - compositor/compositor-private.h \ - compositor/compositor-xrender.c \ - compositor/compositor-xrender.h \ - include/compositor.h \ + compositor/meta-compositor.c \ + compositor/meta-compositor-none.c \ + compositor/meta-compositor-none.h \ + compositor/meta-compositor-private.h \ + compositor/meta-compositor-xrender.c \ + compositor/meta-compositor-xrender.h \ + include/meta-compositor.h \ core/above-tab-keycode.c \ core/constraints.c \ core/constraints.h \ diff --git a/src/compositor/compositor-none.c b/src/compositor/meta-compositor-none.c index 56044ae9..6756faa5 100644 --- a/src/compositor/compositor-none.c +++ b/src/compositor/meta-compositor-none.c @@ -17,8 +17,8 @@ #include "config.h" -#include "compositor-none.h" -#include "compositor-private.h" +#include "meta-compositor-none.h" +#include "meta-compositor-private.h" typedef struct { diff --git a/src/compositor/compositor-none.h b/src/compositor/meta-compositor-none.h index c81dceb5..c81dceb5 100644 --- a/src/compositor/compositor-none.h +++ b/src/compositor/meta-compositor-none.h diff --git a/src/compositor/compositor-private.h b/src/compositor/meta-compositor-private.h index 2ef817b1..8d005d36 100644 --- a/src/compositor/compositor-private.h +++ b/src/compositor/meta-compositor-private.h @@ -19,7 +19,7 @@ #ifndef META_COMPOSITOR_PRIVATE_H #define META_COMPOSITOR_PRIVATE_H -#include "compositor.h" +#include "meta-compositor.h" struct _MetaCompositor { diff --git a/src/compositor/compositor-xrender.c b/src/compositor/meta-compositor-xrender.c index eac8c274..5d1bb442 100644 --- a/src/compositor/compositor-xrender.c +++ b/src/compositor/meta-compositor-xrender.c @@ -22,7 +22,7 @@ #define _GNU_SOURCE #define _XOPEN_SOURCE 600 /* for usleep() */ -#include <config.h> +#include "config.h" #include <stdlib.h> #include <string.h> @@ -40,8 +40,8 @@ #include "errors.h" #include "prefs.h" #include "window.h" -#include "compositor-private.h" -#include "compositor-xrender.h" +#include "meta-compositor-private.h" +#include "meta-compositor-xrender.h" #include "xprops.h" #include "util.h" #include <X11/Xatom.h> diff --git a/src/compositor/compositor-xrender.h b/src/compositor/meta-compositor-xrender.h index 92e963f8..add080ca 100644 --- a/src/compositor/compositor-xrender.h +++ b/src/compositor/meta-compositor-xrender.h @@ -19,8 +19,8 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#ifndef META_COMPOSITOR_XRENDER_H_ -#define META_COMPOSITOR_XRENDER_H_ +#ifndef META_COMPOSITOR_XRENDER_H +#define META_COMPOSITOR_XRENDER_H #include "types.h" diff --git a/src/compositor/compositor.c b/src/compositor/meta-compositor.c index 4c565f3d..05d8b33a 100644 --- a/src/compositor/compositor.c +++ b/src/compositor/meta-compositor.c @@ -18,9 +18,9 @@ #include "config.h" -#include "compositor-none.h" -#include "compositor-private.h" -#include "compositor-xrender.h" +#include "meta-compositor-none.h" +#include "meta-compositor-private.h" +#include "meta-compositor-xrender.h" MetaCompositor * meta_compositor_new (MetaCompositorType type, diff --git a/src/core/display.c b/src/core/display.c index 695f6e3d..87715363 100644 --- a/src/core/display.c +++ b/src/core/display.c @@ -28,7 +28,8 @@ * The display is represented as a MetaDisplay struct. */ -#include <config.h> +#include "config.h" + #include "display-private.h" #include "util.h" #include "main.h" @@ -45,7 +46,7 @@ #include "workspace.h" #include "bell.h" #include "effects.h" -#include "compositor.h" +#include "meta-compositor.h" #include <gdk/gdkx.h> #include <libmetacity/meta-frame-borders.h> #include <X11/Xatom.h> diff --git a/src/core/screen.c b/src/core/screen.c index bd619280..fd93933e 100644 --- a/src/core/screen.c +++ b/src/core/screen.c @@ -24,7 +24,8 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <config.h> +#include "config.h" + #include "screen-private.h" #include "util.h" #include "errors.h" @@ -35,7 +36,7 @@ #include "keybindings.h" #include "stack.h" #include "xprops.h" -#include "compositor.h" +#include "meta-compositor.h" #ifdef HAVE_SOLARIS_XINERAMA #include <X11/extensions/xinerama.h> diff --git a/src/core/window.c b/src/core/window.c index d8f8614f..e38d9e3c 100644 --- a/src/core/window.c +++ b/src/core/window.c @@ -22,7 +22,8 @@ * along with this program; if not, see <http://www.gnu.org/licenses/>. */ -#include <config.h> +#include "config.h" + #include "window-private.h" #include "edge-resistance.h" #include "util.h" @@ -41,7 +42,7 @@ #include "group.h" #include "window-props.h" #include "constraints.h" -#include "compositor.h" +#include "meta-compositor.h" #include "effects.h" #include <X11/Xatom.h> diff --git a/src/include/compositor.h b/src/include/meta-compositor.h index f3abc194..f3abc194 100644 --- a/src/include/compositor.h +++ b/src/include/meta-compositor.h |