summaryrefslogtreecommitdiff
path: root/src
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 /src
parent1153a9ee1459576b9a26ccdc0c3d923f7b24019a (diff)
downloadunity-window-decorator-dddbb16680e4f8ef5101c471766ca7fa00213562.tar.gz
unity-window-decorator-dddbb16680e4f8ef5101c471766ca7fa00213562.tar.bz2
Move core headers into core subdirectory.
Diffstat (limited to 'src')
-rw-r--r--src/action.cpp4
-rw-r--r--src/event.cpp2
-rw-r--r--src/icon.cpp2
-rw-r--r--src/main.cpp2
-rw-r--r--src/match.cpp6
-rw-r--r--src/metadata.cpp2
-rw-r--r--src/option.cpp4
-rw-r--r--src/output.cpp4
-rw-r--r--src/plugin.cpp2
-rw-r--r--src/privatematch.h2
-rw-r--r--src/privateobject.h4
-rw-r--r--src/privateoption.h4
-rw-r--r--src/privatescreen.h2
-rw-r--r--src/privatewindow.h2
-rw-r--r--src/rect.cpp2
-rw-r--r--src/screen.cpp4
-rw-r--r--src/session.cpp4
-rw-r--r--src/window.cpp4
-rw-r--r--src/windowgeometry.cpp2
19 files changed, 29 insertions, 29 deletions
diff --git a/src/action.cpp b/src/action.cpp
index 2169da3..ea94e48 100644
--- a/src/action.cpp
+++ b/src/action.cpp
@@ -29,8 +29,8 @@
#include <compiz.h>
-#include <compoption.h>
-#include <compaction.h>
+#include <core/option.h>
+#include <core/action.h>
#include <core/screen.h>
#include "privateaction.h"
#include "privatescreen.h"
diff --git a/src/event.cpp b/src/event.cpp
index 1f828e2..4e4d385 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -36,7 +36,7 @@
#include <X11/extensions/Xrandr.h>
#include <X11/extensions/Xfixes.h>
-#include <compiz-core.h>
+#include <core/core.h>
#include <core/atoms.h>
#include "privatescreen.h"
#include "privatewindow.h"
diff --git a/src/icon.cpp b/src/icon.cpp
index 5dcdd0d..f5fd231 100644
--- a/src/icon.cpp
+++ b/src/icon.cpp
@@ -1,4 +1,4 @@
-#include <compicon.h>
+#include <core/icon.h>
CompIcon::CompIcon (CompScreen *screen, unsigned int width,
unsigned int height) :
diff --git a/src/main.cpp b/src/main.cpp
index 806ff40..8c01333 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,7 @@
#include <string.h>
#include <sys/wait.h>
-#include <compiz-core.h>
+#include <core/core.h>
#include "privatescreen.h"
char *programName;
diff --git a/src/match.cpp b/src/match.cpp
index 8ba56e5..ad0651a 100644
--- a/src/match.cpp
+++ b/src/match.cpp
@@ -29,12 +29,12 @@
#include <boost/foreach.hpp>
#define foreach BOOST_FOREACH
-#include <compiz-core.h>
+#include <core/core.h>
#include <core/screen.h>
-#include <compmatch.h>
+#include <core/match.h>
#include <core/window.h>
-#include <compplugin.h>
+#include <core/plugin.h>
#include "privatematch.h"
#include "privatescreen.h"
#include "privatewindow.h"
diff --git a/src/metadata.cpp b/src/metadata.cpp
index ea91d40..291b808 100644
--- a/src/metadata.cpp
+++ b/src/metadata.cpp
@@ -34,7 +34,7 @@
#define foreach BOOST_FOREACH
#include <compiz.h>
-#include <compmetadata.h>
+#include <core/metadata.h>
#include <core/screen.h>
#include "privatescreen.h"
diff --git a/src/option.cpp b/src/option.cpp
index cc3b1a1..4848f7b 100644
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -32,8 +32,8 @@
#include <boost/foreach.hpp>
#define foreach BOOST_FOREACH
-#include <compiz-core.h>
-#include <compoption.h>
+#include <core/core.h>
+#include <core/option.h>
#include "privateoption.h"
CompOption::Vector noOptions (0);
diff --git a/src/output.cpp b/src/output.cpp
index 3d5fe53..96d687f 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -1,6 +1,6 @@
-#include <compiz-core.h>
-#include <compoutput.h>
+#include <core/core.h>
+#include <core/output.h>
CompOutput::CompOutput ()
{
diff --git a/src/plugin.cpp b/src/plugin.cpp
index e15acea..e455251 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -33,7 +33,7 @@
#include <boost/foreach.hpp>
#define foreach BOOST_FOREACH
-#include <compiz-core.h>
+#include <core/core.h>
#include "privatescreen.h"
CompPlugin::Map pluginsMap;
diff --git a/src/privatematch.h b/src/privatematch.h
index 6cb1608..62b0009 100644
--- a/src/privatematch.h
+++ b/src/privatematch.h
@@ -1,7 +1,7 @@
#ifndef _PRIVATEMATCH_H
#define _PRIVATEMATCH_H
-#include <compmatch.h>
+#include <core/match.h>
#include <boost/shared_ptr.hpp>
#define MATCH_OP_AND_MASK (1 << 0)
diff --git a/src/privateobject.h b/src/privateobject.h
index eb059f3..b2cb7e9 100644
--- a/src/privateobject.h
+++ b/src/privateobject.h
@@ -2,8 +2,8 @@
#define _PRIVATEOBJECT_H
#include <list>
-#include <compiz-core.h>
-#include <compobject.h>
+#include <core/core.h>
+#include <core/object.h>
class PrivateObject {
public :
diff --git a/src/privateoption.h b/src/privateoption.h
index f8ef51c..e1786bd 100644
--- a/src/privateoption.h
+++ b/src/privateoption.h
@@ -3,8 +3,8 @@
#include <vector>
-#include <compaction.h>
-#include <compmatch.h>
+#include <core/action.h>
+#include <core/match.h>
#include <core/screen.h>
typedef struct _CompOptionIntRestriction {
diff --git a/src/privatescreen.h b/src/privatescreen.h
index 0e68698..2104253 100644
--- a/src/privatescreen.h
+++ b/src/privatescreen.h
@@ -1,7 +1,7 @@
#ifndef _PRIVATESCREEN_H
#define _PRIVATESCREEN_H
-#include <compiz-core.h>
+#include <core/core.h>
#include <core/screen.h>
#include <core/size.h>
#include <core/point.h>
diff --git a/src/privatewindow.h b/src/privatewindow.h
index 9151572..489232e 100644
--- a/src/privatewindow.h
+++ b/src/privatewindow.h
@@ -1,7 +1,7 @@
#ifndef _PRIVATEWINDOW_H
#define _PRIVATEWINDOW_H
-#include <compiz-core.h>
+#include <core/core.h>
#include <core/window.h>
#include <core/point.h>
#include <core/timer.h>
diff --git a/src/rect.cpp b/src/rect.cpp
index 52d1608..1b391ce 100644
--- a/src/rect.cpp
+++ b/src/rect.cpp
@@ -1,4 +1,4 @@
-#include <compiz-core.h>
+#include <core/core.h>
#include <core/rect.h>
CompRect::CompRect ()
diff --git a/src/screen.cpp b/src/screen.cpp
index 768d3f5..29e4bd9 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -53,10 +53,10 @@
#include <X11/cursorfont.h>
-#include <compiz-core.h>
+#include <core/core.h>
#include <core/screen.h>
-#include <compicon.h>
+#include <core/icon.h>
#include <core/atoms.h>
#include "privatescreen.h"
#include "privatewindow.h"
diff --git a/src/session.cpp b/src/session.cpp
index 1b2b30d..e70b5e4 100644
--- a/src/session.cpp
+++ b/src/session.cpp
@@ -40,8 +40,8 @@
#include <boost/bind.hpp>
-#include <compsession.h>
-#include <compiz-core.h>
+#include <core/session.h>
+#include <core/core.h>
#define SM_DEBUG(x)
diff --git a/src/window.cpp b/src/window.cpp
index 8c3c24e..23f63cb 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -40,8 +40,8 @@
#include <boost/bind.hpp>
-#include <compiz-core.h>
-#include <compicon.h>
+#include <core/core.h>
+#include <core/icon.h>
#include <core/atoms.h>
#include "privatewindow.h"
#include "privatescreen.h"
diff --git a/src/windowgeometry.cpp b/src/windowgeometry.cpp
index ea969db..2e2fac3 100644
--- a/src/windowgeometry.cpp
+++ b/src/windowgeometry.cpp
@@ -1,4 +1,4 @@
-#include <compiz-core.h>
+#include <core/core.h>
#include <core/window.h>
#include <privatewindow.h>