summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/blur/src/blur.cpp1
-rw-r--r--plugins/decor/src/decor.cpp1
-rw-r--r--plugins/fade/src/fade.cpp1
-rw-r--r--plugins/gnomecompat/src/gnomecompat.cpp2
-rw-r--r--plugins/imgsvg/src/imgsvg.cpp2
-rw-r--r--plugins/ini/src/ini.cpp7
-rw-r--r--plugins/place/src/place.cpp3
-rw-r--r--plugins/regex/src/regex.cpp1
-rw-r--r--plugins/resize/src/resize.cpp1
-rw-r--r--plugins/scale/src/scale.cpp3
-rw-r--r--plugins/switcher/src/switcher.cpp7
-rw-r--r--plugins/water/src/water.cpp2
-rw-r--r--plugins/zoom/src/zoom.cpp2
-rw-r--r--src/match.cpp2
-rw-r--r--src/option.cpp2
-rw-r--r--src/window.cpp1
16 files changed, 16 insertions, 22 deletions
diff --git a/plugins/blur/src/blur.cpp b/plugins/blur/src/blur.cpp
index ecb86c5..8689ee1 100644
--- a/plugins/blur/src/blur.cpp
+++ b/plugins/blur/src/blur.cpp
@@ -1593,7 +1593,6 @@ BlurWindow::glDraw (const GLMatrix &transform,
bool clipped = FALSE;
CompRect box (0, 0, 0, 0);
CompRegion reg;
- int i;
bScreen->mvp = GLMatrix (bScreen->gScreen->projectionMatrix ());
bScreen->mvp *= transform;
diff --git a/plugins/decor/src/decor.cpp b/plugins/decor/src/decor.cpp
index 2eef20d..f46dc51 100644
--- a/plugins/decor/src/decor.cpp
+++ b/plugins/decor/src/decor.cpp
@@ -1475,7 +1475,6 @@ bool
DecorScreen::setOption (const CompString &name,
CompOption::Value &value)
{
- CompOption *o;
unsigned int index;
bool rv = DecorOptions::setOption (name, value);
diff --git a/plugins/fade/src/fade.cpp b/plugins/fade/src/fade.cpp
index 1426a75..fa0d5f6 100644
--- a/plugins/fade/src/fade.cpp
+++ b/plugins/fade/src/fade.cpp
@@ -326,7 +326,6 @@ bool
FadeScreen::setOption (const CompString &name,
CompOption::Value &value)
{
- CompOption *o;
unsigned int index;
bool rv = FadeOptions::setOption (name, value);
diff --git a/plugins/gnomecompat/src/gnomecompat.cpp b/plugins/gnomecompat/src/gnomecompat.cpp
index b8b35d5..1e241e6 100644
--- a/plugins/gnomecompat/src/gnomecompat.cpp
+++ b/plugins/gnomecompat/src/gnomecompat.cpp
@@ -35,8 +35,6 @@ runCommand (CompAction *action,
{
Window xid;
- GNOME_SCREEN (screen);
-
xid = CompOption::getIntOptionNamed (options, "root", 0);
if (xid != screen->root ())
return false;
diff --git a/plugins/imgsvg/src/imgsvg.cpp b/plugins/imgsvg/src/imgsvg.cpp
index a97aafd..328680e 100644
--- a/plugins/imgsvg/src/imgsvg.cpp
+++ b/plugins/imgsvg/src/imgsvg.cpp
@@ -234,7 +234,6 @@ SvgWindow::glDraw (const GLMatrix &transform,
if (context && reg.numRects ())
{
GLTexture::MatrixList matrix (1);
- REGION r;
int i, j;
int x1, y1, x2, y2;
CompRect rect = context->box.boundingRect ();
@@ -263,7 +262,6 @@ SvgWindow::glDraw (const GLMatrix &transform,
float xScale, yScale;
float dx, dy;
int width, height;
- int saveFilter;
rect.setGeometry (rect.x1 () - 1,
rect.y1 () - 1,
diff --git a/plugins/ini/src/ini.cpp b/plugins/ini/src/ini.cpp
index 7c3948a..cf03d2a 100644
--- a/plugins/ini/src/ini.cpp
+++ b/plugins/ini/src/ini.cpp
@@ -196,6 +196,8 @@ IniFile::optionValueToString (CompOption::Value &value,
case CompOption::TypeMatch:
retval = value.match ().toString ();
break;
+ default:
+ break;
}
return retval;
@@ -366,6 +368,9 @@ IniFile::stringToOptionValue (CompString &string,
action.setBell (false);
else
retval = false;
+ break;
+ default:
+ break;
}
if (retval)
@@ -378,6 +383,8 @@ IniFile::stringToOptionValue (CompString &string,
value.set (match);
}
break;
+ default:
+ break;
}
return retval;
diff --git a/plugins/place/src/place.cpp b/plugins/place/src/place.cpp
index ee8482f..a23a725 100644
--- a/plugins/place/src/place.cpp
+++ b/plugins/place/src/place.cpp
@@ -804,7 +804,6 @@ PlaceWindow::cascadeFindFirstFit (const CompWindowList &windows,
* existing window in each of those cases.
*/
bool retval = FALSE;
- unsigned int i;
CompWindowList belowSorted, rightSorted;
CompRect rect;
@@ -891,7 +890,7 @@ PlaceWindow::cascadeFindNext (const CompWindowList &windows,
int cascadeX, cascadeY;
int xThreshold, yThreshold;
int winWidth, winHeight;
- int i, cascadeStage;
+ int cascadeStage;
sorted = windows;
sorted.sort (compareNorthWestCorner);
diff --git a/plugins/regex/src/regex.cpp b/plugins/regex/src/regex.cpp
index ae7fd56..85c3c4a 100644
--- a/plugins/regex/src/regex.cpp
+++ b/plugins/regex/src/regex.cpp
@@ -173,7 +173,6 @@ RegexWindow::getStringProperty (Atom nameAtom,
unsigned long bytesAfter;
unsigned char *str = NULL;
int format, result;
- char *retval;
result = XGetWindowProperty (screen->dpy (), window->id (), nameAtom, 0,
LONG_MAX, FALSE, typeAtom, &type, &format,
diff --git a/plugins/resize/src/resize.cpp b/plugins/resize/src/resize.cpp
index 2d706a8..71efeb1 100644
--- a/plugins/resize/src/resize.cpp
+++ b/plugins/resize/src/resize.cpp
@@ -191,7 +191,6 @@ resizeInitiate (CompAction *action,
unsigned int mask;
int x, y;
int button;
- int i;
RESIZE_SCREEN (screen);
diff --git a/plugins/scale/src/scale.cpp b/plugins/scale/src/scale.cpp
index 334033c..c2f4665 100644
--- a/plugins/scale/src/scale.cpp
+++ b/plugins/scale/src/scale.cpp
@@ -480,7 +480,6 @@ PrivateScaleScreen::getSlotAreas ()
void
PrivateScaleScreen::layoutSlots ()
{
- int i;
int moMode;
moMode = getMultioutputMode ();
@@ -559,7 +558,7 @@ bool
PrivateScaleScreen::fillInWindows ()
{
CompWindow *w;
- int i, width, height;
+ int width, height;
float sx, sy, cx, cy;
foreach (ScaleWindow *sw, windows)
diff --git a/plugins/switcher/src/switcher.cpp b/plugins/switcher/src/switcher.cpp
index 5bc4011..2056d63 100644
--- a/plugins/switcher/src/switcher.cpp
+++ b/plugins/switcher/src/switcher.cpp
@@ -522,7 +522,6 @@ switchTerminate (CompAction *action,
CompAction::State state,
CompOption::Vector &options)
{
- CompScreen *s;
Window xid;
xid = CompOption::getIntOptionNamed (options, "root");
@@ -607,7 +606,6 @@ switchInitiateCommon (CompAction *action,
bool showPopup,
bool nextWindow)
{
- CompScreen *s;
Window xid;
xid = CompOption::getIntOptionNamed (options, "root");
@@ -644,7 +642,7 @@ SwitchScreen::windowRemove (Window id)
if (w)
{
bool inList = false;
- int count, j, i = 0;
+ int count;
Window selected, old;
SWITCH_WINDOW (w);
@@ -801,8 +799,6 @@ SwitchScreen::updateForegroundColor ()
void
SwitchScreen::handleEvent (XEvent *event)
{
- CompWindow *w;
-
screen->handleEvent (event);
switch (event->type) {
@@ -1446,7 +1442,6 @@ SwitchWindow::damageRect (bool initial, const CompRect &rect)
if (sScreen->grabIndex)
{
CompWindow *popup;
- int i;
foreach (CompWindow *w, sScreen->windows)
{
diff --git a/plugins/water/src/water.cpp b/plugins/water/src/water.cpp
index 08fffeb..a423bae 100644
--- a/plugins/water/src/water.cpp
+++ b/plugins/water/src/water.cpp
@@ -167,7 +167,6 @@ WaterScreen::getBumpMapFragmentFunction (GLTexture *texture,
}
static const char *temp[] = { "normal", "temp", "total", "bump", "offset" };
- char str[1024];
for (unsigned int i = 0; i < sizeof (temp) / sizeof (temp[0]); i++)
data.addTempHeaderOp (temp[i]);
@@ -1035,7 +1034,6 @@ waterInitiate (CompAction *action,
CompAction::State state,
CompOption::Vector &options)
{
- CompScreen *s;
unsigned int ui;
Window root, child;
int xRoot, yRoot, i;
diff --git a/plugins/zoom/src/zoom.cpp b/plugins/zoom/src/zoom.cpp
index 629ff41..d3ec3e4 100644
--- a/plugins/zoom/src/zoom.cpp
+++ b/plugins/zoom/src/zoom.cpp
@@ -511,6 +511,8 @@ zoomTerminate (CompAction *action,
}
action->setState (action->state () & ~(CompAction::StateTermKey |
CompAction::StateTermButton));
+
+ return true;
}
static bool
diff --git a/src/match.cpp b/src/match.cpp
index 663bd69..ff46aae 100644
--- a/src/match.cpp
+++ b/src/match.cpp
@@ -566,6 +566,8 @@ MatchGroupOp::operator= (const MatchGroupOp &gr)
break;
}
}
+
+ return *this;
}
PrivateMatch::PrivateMatch () :
diff --git a/src/option.cpp b/src/option.cpp
index dbe0df6..c2b6cee 100644
--- a/src/option.cpp
+++ b/src/option.cpp
@@ -930,6 +930,8 @@ CompOption::typeToString (CompOption::Type type)
return "match";
case CompOption::TypeList:
return "list";
+ default:
+ break;
}
return "unknown";
diff --git a/src/window.cpp b/src/window.cpp
index 2d5fbe4..e93cb21 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -4378,7 +4378,6 @@ PrivateWindow::processMap ()
if (!priv->placed)
{
- int newX, newY;
int gravity = priv->sizeHints.win_gravity;
XWindowChanges xwc;
unsigned int xwcm;