summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDennis Kasprzyk <onestone@compiz-fusion.org>2008-08-20 17:05:03 +0200
committerDennis kasprzyk <onestone@compiz-fusion.org>2008-08-20 17:05:03 +0200
commitccdead1b746aecaaeb9f4aa2046a5d70083e5f1f (patch)
treef7f4337b61a09a7f30962cb6c9aad99230cdc601 /src
parent6c1c6625d345d5beecc7051b5eca526f97932f2b (diff)
downloadmobileperf-ccdead1b746aecaaeb9f4aa2046a5d70083e5f1f.tar.gz
mobileperf-ccdead1b746aecaaeb9f4aa2046a5d70083e5f1f.tar.bz2
Renamed WindowPaintAttrib to CompWindowPaintAttrib.
Diffstat (limited to 'src')
-rw-r--r--src/fragment.cpp2
-rw-r--r--src/paint.cpp10
-rw-r--r--src/privatewindow.h4
-rw-r--r--src/window.cpp10
4 files changed, 13 insertions, 13 deletions
diff --git a/src/fragment.cpp b/src/fragment.cpp
index cc0d390..dcda2bf 100644
--- a/src/fragment.cpp
+++ b/src/fragment.cpp
@@ -845,7 +845,7 @@ namespace CompFragment {
return function->id;
}
- Attrib::Attrib (const WindowPaintAttrib *paint) :
+ Attrib::Attrib (const CompWindowPaintAttrib *paint) :
priv (new PrivateAttrib ())
{
priv->opacity = paint->opacity;
diff --git a/src/paint.cpp b/src/paint.cpp
index f9801fd..13d92e1 100644
--- a/src/paint.cpp
+++ b/src/paint.cpp
@@ -36,7 +36,7 @@ ScreenPaintAttrib defaultScreenPaintAttrib = {
0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -DEFAULT_Z_CAMERA
};
-WindowPaintAttrib defaultWindowPaintAttrib = {
+CompWindowPaintAttrib defaultWindowPaintAttrib = {
OPAQUE, BRIGHT, COLOR, 1.0f, 1.0f, 0.0f, 0.0f
};
@@ -1133,10 +1133,10 @@ CompWindow::draw (const CompTransform *transform,
}
bool
-CompWindow::paint (const WindowPaintAttrib *attrib,
- const CompTransform *transform,
- Region region,
- unsigned int mask)
+CompWindow::paint (const CompWindowPaintAttrib *attrib,
+ const CompTransform *transform,
+ Region region,
+ unsigned int mask)
{
WRAPABLE_HND_FUNC_RETURN(bool, paint, attrib, transform, region, mask)
diff --git a/src/privatewindow.h b/src/privatewindow.h
index cc3df8b..a2857f6 100644
--- a/src/privatewindow.h
+++ b/src/privatewindow.h
@@ -209,8 +209,8 @@ class PrivateWindow {
GLushort brightness;
GLushort saturation;
- WindowPaintAttrib paint;
- WindowPaintAttrib lastPaint;
+ CompWindowPaintAttrib paint;
+ CompWindowPaintAttrib lastPaint;
unsigned int lastMask;
diff --git a/src/window.cpp b/src/window.cpp
index b103388..5279812 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -4172,10 +4172,10 @@ WindowInterface::WindowInterface ()
bool
-WindowInterface::paint (const WindowPaintAttrib *attrib,
- const CompTransform *transform,
- Region region,
- unsigned int mask)
+WindowInterface::paint (const CompWindowPaintAttrib *attrib,
+ const CompTransform *transform,
+ Region region,
+ unsigned int mask)
WRAPABLE_DEF_FUNC_RETURN(paint, attrib, transform, region, mask)
bool
@@ -4858,7 +4858,7 @@ CompWindow::clip ()
return priv->clip;
}
-WindowPaintAttrib &
+CompWindowPaintAttrib &
CompWindow::paintAttrib ()
{
return priv->paint;