summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2008-09-17 20:48:31 +0200
committerDennis Kasprzyk <onestone@compiz-fusion.org>2008-09-17 20:48:31 +0200
commit1153a9ee1459576b9a26ccdc0c3d923f7b24019a (patch)
tree7b7e12b3347315540e70cd691db6b840252e92f9 /src
parente73a1df3bf2a5871a2c7fd1a97d3e1a961cfd96b (diff)
downloadmobileperf-1153a9ee1459576b9a26ccdc0c3d923f7b24019a.tar.gz
mobileperf-1153a9ee1459576b9a26ccdc0c3d923f7b24019a.tar.bz2
Optimize rect,point and size classes and move headers to core/*
Diffstat (limited to 'src')
-rw-r--r--src/point.cpp14
-rw-r--r--src/privatescreen.h4
-rw-r--r--src/privatewindow.h2
-rw-r--r--src/rect.cpp50
-rw-r--r--src/size.cpp14
5 files changed, 6 insertions, 78 deletions
diff --git a/src/point.cpp b/src/point.cpp
index 5eda20b..0f52dfc 100644
--- a/src/point.cpp
+++ b/src/point.cpp
@@ -1,4 +1,4 @@
-#include <comppoint.h>
+#include <core/point.h>
CompPoint::CompPoint () :
mX (0),
@@ -12,18 +12,6 @@ CompPoint::CompPoint (int x, int y) :
{
}
-int
-CompPoint::x ()
-{
- return mX;
-}
-
-int
-CompPoint::y ()
-{
- return mY;
-}
-
void
CompPoint::setX (int x)
{
diff --git a/src/privatescreen.h b/src/privatescreen.h
index 970c67a..0e68698 100644
--- a/src/privatescreen.h
+++ b/src/privatescreen.h
@@ -3,8 +3,8 @@
#include <compiz-core.h>
#include <core/screen.h>
-#include <compsize.h>
-#include <comppoint.h>
+#include <core/size.h>
+#include <core/point.h>
#include <core/timer.h>
extern bool shutDown;
diff --git a/src/privatewindow.h b/src/privatewindow.h
index 7f89289..9151572 100644
--- a/src/privatewindow.h
+++ b/src/privatewindow.h
@@ -3,7 +3,7 @@
#include <compiz-core.h>
#include <core/window.h>
-#include <comppoint.h>
+#include <core/point.h>
#include <core/timer.h>
#include "privatescreen.h"
diff --git a/src/rect.cpp b/src/rect.cpp
index e8769ef..52d1608 100644
--- a/src/rect.cpp
+++ b/src/rect.cpp
@@ -1,5 +1,5 @@
#include <compiz-core.h>
-#include <comprect.h>
+#include <core/rect.h>
CompRect::CompRect ()
{
@@ -27,54 +27,6 @@ CompRect::CompRect (const CompRect& r)
mRegion.rects = &mRegion.extents;
}
-int
-CompRect::x ()
-{
- return mRegion.extents.x1;
-}
-
-int
-CompRect::y ()
-{
- return mRegion.extents.y1;
-}
-
-int
-CompRect::x1 ()
-{
- return mRegion.extents.x1;
-}
-
-int
-CompRect::y1 ()
-{
- return mRegion.extents.y1;
-}
-
-int
-CompRect::x2 ()
-{
- return mRegion.extents.x2;
-}
-
-int
-CompRect::y2 ()
-{
- return mRegion.extents.y2;
-}
-
-unsigned int
-CompRect::width ()
-{
- return mRegion.extents.x2 - mRegion.extents.x1;
-}
-
-unsigned int
-CompRect::height ()
-{
- return mRegion.extents.y2 - mRegion.extents.y1;
-}
-
Region
CompRect::region ()
{
diff --git a/src/size.cpp b/src/size.cpp
index 63cd83a..81d0a7c 100644
--- a/src/size.cpp
+++ b/src/size.cpp
@@ -1,4 +1,4 @@
-#include <compsize.h>
+#include <core/size.h>
CompSize::CompSize () :
mWidth (0),
@@ -12,18 +12,6 @@ CompSize::CompSize (unsigned int width, unsigned int height) :
{
}
-unsigned int
-CompSize::width ()
-{
- return mWidth;
-}
-
-unsigned int
-CompSize::height ()
-{
- return mHeight;
-}
-
void
CompSize::setWidth (unsigned int width)
{