summaryrefslogtreecommitdiff
path: root/plugins/scale/src/scale.cpp
diff options
context:
space:
mode:
authorSam Spilsbury <smspillaz@gmail.com>2010-02-05 01:16:02 +0800
committerSam Spilsbury <smspillaz@gmail.com>2010-02-05 01:16:02 +0800
commit0813bc61659e212af9df22e30c655fd35f9fbc3d (patch)
tree3ec00a4a294e6843a35daf174a34d482d350b9f1 /plugins/scale/src/scale.cpp
parentda75fba9478b5fd7461ae31500f95bb21227c412 (diff)
downloadcompiz-with-glib-mainloop-0813bc61659e212af9df22e30c655fd35f9fbc3d.tar.gz
compiz-with-glib-mainloop-0813bc61659e212af9df22e30c655fd35f9fbc3d.tar.bz2
plugins: fix warnings
Diffstat (limited to 'plugins/scale/src/scale.cpp')
-rw-r--r--plugins/scale/src/scale.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/scale/src/scale.cpp b/plugins/scale/src/scale.cpp
index d266008..939e345 100644
--- a/plugins/scale/src/scale.cpp
+++ b/plugins/scale/src/scale.cpp
@@ -90,7 +90,8 @@ PrivateScaleWindow::isScaleWin () const
return false;
break;
case ScaleTypeOutput:
- if (window->outputDevice () != screen->currentOutputDev ().id ())
+ if ((unsigned int) window->outputDevice () !=
+ (unsigned int) screen->currentOutputDev ().id ())
return false;
default:
break;
@@ -411,7 +412,7 @@ PrivateScaleScreen::layoutSlotsForArea (const CompRect& workArea,
SlotArea::vector
PrivateScaleScreen::getSlotAreas ()
{
- int i = 0;
+ unsigned int i = 0;
CompRect workArea;
std::vector<float> size;
float sizePerWindow, sum = 0.0f;
@@ -494,8 +495,10 @@ PrivateScaleScreen::layoutSlots ()
{
SlotArea::vector slotAreas = getSlotAreas ();
if (slotAreas.size ())
+ {
foreach (SlotArea &sa, slotAreas)
layoutSlotsForArea (sa.workArea, sa.nWindows);
+ }
}
break;
case ScaleOptions::MultioutputModeOnCurrentOutputDevice: