summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2008-09-17 21:08:46 +0200
committerDennis Kasprzyk <onestone@compiz-fusion.org>2008-09-17 21:08:46 +0200
commitdddbb16680e4f8ef5101c471766ca7fa00213562 (patch)
treeb5ae90c4d935af656688023d8994530532f26629 /include
parent1153a9ee1459576b9a26ccdc0c3d923f7b24019a (diff)
downloadmobileperf-dddbb16680e4f8ef5101c471766ca7fa00213562.tar.gz
mobileperf-dddbb16680e4f8ef5101c471766ca7fa00213562.tar.bz2
Move core headers into core subdirectory.
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am1
-rw-r--r--include/composite/composite.h4
-rw-r--r--include/core/action.h (renamed from include/compaction.h)2
-rw-r--r--include/core/core.h (renamed from include/compiz-core.h)17
-rw-r--r--include/core/icon.h (renamed from include/compicon.h)0
-rw-r--r--include/core/match.h (renamed from include/compmatch.h)2
-rw-r--r--include/core/metadata.h (renamed from include/compmetadata.h)2
-rw-r--r--include/core/option.h (renamed from include/compoption.h)0
-rw-r--r--include/core/output.h (renamed from include/compoutput.h)2
-rw-r--r--include/core/plugin.h (renamed from include/compplugin.h)2
-rw-r--r--include/core/privatehandler.h (renamed from include/compprivatehandler.h)0
-rw-r--r--include/core/screen.h10
-rw-r--r--include/core/session.h (renamed from include/compsession.h)0
-rw-r--r--include/core/window.h4
-rw-r--r--include/core/wrapsystem.h (renamed from include/compwrapsystem.h)0
-rw-r--r--include/opengl/opengl.h2
16 files changed, 23 insertions, 25 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 9cb22da..03718e6 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -1,7 +1,6 @@
compizincludedir = $(includedir)/compiz
compizinclude_HEADERS = \
compiz.h \
- compiz-core.h \
compiz-cube.h \
compiz-scale.h \
decoration.h
diff --git a/include/composite/composite.h b/include/composite/composite.h
index fcd3b3a..8b21a8a 100644
--- a/include/composite/composite.h
+++ b/include/composite/composite.h
@@ -6,9 +6,9 @@
#define COMPIZ_COMPOSITE_ABI 1
#define PLUGIN Composite
-#include <compprivatehandler.h>
+#include <core/privatehandler.h>
#include <core/timer.h>
-#include <compiz-core.h>
+#include <core/core.h>
#define COMPOSITE_SCREEN_DAMAGE_PENDING_MASK (1 << 0)
#define COMPOSITE_SCREEN_DAMAGE_REGION_MASK (1 << 1)
diff --git a/include/compaction.h b/include/core/action.h
index 0ae702c..e317a25 100644
--- a/include/compaction.h
+++ b/include/core/action.h
@@ -5,7 +5,7 @@
#include <X11/Xlib-xcb.h>
-#include <compoption.h>
+#include <core/option.h>
class PrivateAction;
diff --git a/include/compiz-core.h b/include/core/core.h
index b5d96b0..d8c45ce 100644
--- a/include/compiz-core.h
+++ b/include/core/core.h
@@ -69,17 +69,16 @@ typedef XBool Bool;
#include <core/privates.h>
#include <core/screen.h>
#include <core/window.h>
-#include <compplugin.h>
-#include <compoption.h>
-#include <compmetadata.h>
-#include <compaction.h>
-#include <compicon.h>
-#include <compmatch.h>
-#include <compoutput.h>
+#include <core/plugin.h>
+#include <core/option.h>
+#include <core/metadata.h>
+#include <core/action.h>
+#include <core/icon.h>
+#include <core/match.h>
+#include <core/output.h>
#include <core/point.h>
#include <core/rect.h>
-#include <compsession.h>
+#include <core/session.h>
#include <core/size.h>
-
#endif
diff --git a/include/compicon.h b/include/core/icon.h
index 34cfce8..34cfce8 100644
--- a/include/compicon.h
+++ b/include/core/icon.h
diff --git a/include/compmatch.h b/include/core/match.h
index 3a0c5f4..227175e 100644
--- a/include/compmatch.h
+++ b/include/core/match.h
@@ -1,7 +1,7 @@
#ifndef _COMPMATCH_H
#define _COMPMATCH_H
-#include <compiz-core.h>
+#include <core/core.h>
class PrivateMatch;
class CompWindow;
diff --git a/include/compmetadata.h b/include/core/metadata.h
index e482fe5..1e2fcf2 100644
--- a/include/compmetadata.h
+++ b/include/core/metadata.h
@@ -5,7 +5,7 @@
#include <libxml/parser.h>
-#include <compaction.h>
+#include <core/action.h>
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY (x)
diff --git a/include/compoption.h b/include/core/option.h
index 227c156..227c156 100644
--- a/include/compoption.h
+++ b/include/core/option.h
diff --git a/include/compoutput.h b/include/core/output.h
index 400e09c..6c1e1dd 100644
--- a/include/compoutput.h
+++ b/include/core/output.h
@@ -1,7 +1,7 @@
#ifndef _COMPOUTPUT_H
#define _COMPOUTPUT_H
-#include <compiz-core.h>
+#include <core/core.h>
#include <core/rect.h>
class CompOutput : public CompRect {
diff --git a/include/compplugin.h b/include/core/plugin.h
index 6e6cfd2..d78a70f 100644
--- a/include/compplugin.h
+++ b/include/core/plugin.h
@@ -27,7 +27,7 @@
#define _COMPIZ_PLUGIN_H
#include <compiz.h>
-#include <compoption.h>
+#include <core/option.h>
#include <map>
diff --git a/include/compprivatehandler.h b/include/core/privatehandler.h
index fc911a2..fc911a2 100644
--- a/include/compprivatehandler.h
+++ b/include/core/privatehandler.h
diff --git a/include/core/screen.h b/include/core/screen.h
index 52b3fbf..8037d4e 100644
--- a/include/core/screen.h
+++ b/include/core/screen.h
@@ -2,11 +2,11 @@
#define _COMPSCREEN_H
#include <core/window.h>
-#include <compoutput.h>
-#include <compsession.h>
-#include <compmetadata.h>
-#include <compplugin.h>
-#include <compmatch.h>
+#include <core/output.h>
+#include <core/session.h>
+#include <core/metadata.h>
+#include <core/plugin.h>
+#include <core/match.h>
#include <core/privates.h>
class CompScreen;
diff --git a/include/compsession.h b/include/core/session.h
index b4d5631..b4d5631 100644
--- a/include/compsession.h
+++ b/include/core/session.h
diff --git a/include/core/window.h b/include/core/window.h
index d91642f..b771895 100644
--- a/include/core/window.h
+++ b/include/core/window.h
@@ -9,12 +9,12 @@
#include <X11/extensions/Xdamage.h>
#include <X11/extensions/sync.h>
-#include <compaction.h>
+#include <core/action.h>
#include <core/privates.h>
#include <core/size.h>
#include <core/point.h>
-#include <compwrapsystem.h>
+#include <core/wrapsystem.h>
#include <map>
diff --git a/include/compwrapsystem.h b/include/core/wrapsystem.h
index 93319b5..93319b5 100644
--- a/include/compwrapsystem.h
+++ b/include/core/wrapsystem.h
diff --git a/include/opengl/opengl.h b/include/opengl/opengl.h
index 963938d..e74feaf 100644
--- a/include/opengl/opengl.h
+++ b/include/opengl/opengl.h
@@ -11,7 +11,7 @@
#define COMPIZ_OPENGL_ABI 1
#define PLUGIN OpenGL
-#include <compprivatehandler.h>
+#include <core/privatehandler.h>
class PrivateGLScreen;
class PrivateGLWindow;