[metacity] compositor: rename files

[Alberts Muktupāvels <muktupavels src gnome org>]

commit d68840d9e8b2a95b3ae6897b6b962b8268f6ce37
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Jan 8 20:19:04 2017 +0200

    compositor: rename files

 src/Makefile.am                                    |   14 +++++++-------
 .../{compositor-none.c => meta-compositor-none.c}  |    4 ++--
 .../{compositor-none.h => meta-compositor-none.h}  |    0
 ...positor-private.h => meta-compositor-private.h} |    2 +-
 ...positor-xrender.c => meta-compositor-xrender.c} |    6 +++---
 ...positor-xrender.h => meta-compositor-xrender.h} |    4 ++--
 src/compositor/{compositor.c => meta-compositor.c} |    6 +++---
 src/core/display.c                                 |    5 +++--
 src/core/screen.c                                  |    5 +++--
 src/core/window.c                                  |    5 +++--
 src/include/{compositor.h => meta-compositor.h}    |    0
 11 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index aecf4f8..062651f 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
similarity index 98%
rename from src/compositor/compositor-none.c
rename to src/compositor/meta-compositor-none.c
index 56044ae..6756faa 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
similarity index 100%
rename from src/compositor/compositor-none.h
rename to src/compositor/meta-compositor-none.h
diff --git a/src/compositor/compositor-private.h b/src/compositor/meta-compositor-private.h
similarity index 99%
rename from src/compositor/compositor-private.h
rename to src/compositor/meta-compositor-private.h
index 2ef817b..8d005d3 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
similarity index 99%
rename from src/compositor/compositor-xrender.c
rename to src/compositor/meta-compositor-xrender.c
index eac8c27..5d1bb44 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
similarity index 93%
rename from src/compositor/compositor-xrender.h
rename to src/compositor/meta-compositor-xrender.h
index 92e963f..add080c 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
similarity index 97%
rename from src/compositor/compositor.c
rename to src/compositor/meta-compositor.c
index 4c565f3..05d8b33 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 695f6e3..8771536 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 bd61928..fd93933 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 d8f8614..e38d9e3 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
similarity index 100%
rename from src/include/compositor.h
rename to src/include/meta-compositor.h