Shut up compiler warnings.

9 files changed, 18 insertions, 15 deletions

diff --git a/src/action.cpp b/src/action.cpp
index 90fd243..e456bda 100644
--- a/src/action.cpp
+++ b/src/action.cpp
@@ -154,7 +154,8 @@ bool
 CompAction::KeyBinding::fromString (CompDisplay *d, const CompString str)
 {
     CompString   sStr;
-    unsigned int mods, pos;
+    unsigned int mods;
+    size_t       pos;
     KeySym	 keysym;
 
     mods = stringToModifiers (d, str);
@@ -261,7 +262,8 @@ CompAction::ButtonBinding::button ()
 bool
 CompAction::ButtonBinding::fromString (CompDisplay *d, const CompString str)
 {
-    unsigned int mods, pos;
+    unsigned int mods;
+    size_t       pos;
 
     mods = stringToModifiers (d, str);
 
@@ -467,7 +469,8 @@ CompAction::buttonFromString (CompDisplay *d, const CompString str)
 void
 CompAction::edgeMaskFromString (const CompString str)
 {
-    unsigned int edgeMask = 0, pos;
+    unsigned int edgeMask = 0;
+    size_t       pos;
 
     for (int i = 0; i < SCREEN_EDGE_NUM; i++)
     {
diff --git a/src/core.cpp b/src/core.cpp
index ec9ee00..f739c3b 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -643,4 +643,4 @@ bool
 CompCore::Timer::active ()
 {
     return mActive;
-}
\ No newline at end of file
+}
diff --git a/src/event.cpp b/src/event.cpp
index 7f508a3..b2eb09c 100644
--- a/src/event.cpp
+++ b/src/event.cpp
@@ -661,7 +661,7 @@ PrivateDisplay::triggerEdgeEnter (unsigned int       edge,
 
 	edgeDelayTimer.start  (
 	    boost::bind (delayedEdgeTimeout, display, &edgeDelaySettings),
-			 delay, (float) delay * 1.2);
+			 delay, (unsigned int)((float) delay * 1.2));
 
 	delayState = CompAction::StateNoEdgeDelay;
 	if (triggerAllEdgeEnterBindings (display, state, delayState,
@@ -1842,7 +1842,7 @@ CompDisplay::handleEvent (XEvent *event)
 				priv->autoRaiseWindow = w->id ();
 				priv->autoRaiseTimer.start (
 				    boost::bind (autoRaiseTimeout, this),
-				    delay, (float) delay * 1.2);
+				    delay, (unsigned int)((float) delay * 1.2));
 			    }
 			    else
 			    {
diff --git a/src/fragment.cpp b/src/fragment.cpp
index abc2587..f5ccb9a 100644
--- a/src/fragment.cpp
+++ b/src/fragment.cpp
@@ -639,7 +639,7 @@ namespace CompFragment {
 
 	foreach (HeaderOp &h, header)
 	{
-	    unsigned int pos = data.find (h.name);
+	    size_t pos = data.find (h.name);
 	    while (pos != std::string::npos)
 	    {
 		data.insert (pos,inPrefix);
@@ -1083,4 +1083,4 @@ namespace CompFragment {
 	functions.clear ();
     }
 
-};
\ No newline at end of file
+};
diff --git a/src/icon.cpp b/src/icon.cpp
index 856ceaf..f15a278 100644
--- a/src/icon.cpp
+++ b/src/icon.cpp
@@ -46,4 +46,4 @@ CompIcon::data ()
 {
     mUpdateTex = true;
     return mData;
-}
\ No newline at end of file
+}
diff --git a/src/match.cpp b/src/match.cpp
index 12e1e68..ef543bd 100644
--- a/src/match.cpp
+++ b/src/match.cpp
@@ -40,6 +40,8 @@
 
 class CoreExp : public CompMatch::Expression {
     public:
+	virtual ~CoreExp () {};
+
 	typedef enum {
 	    TypeXid,
 	    TypeState,
diff --git a/src/privateobject.h b/src/privateobject.h
index 2678368..eb059f3 100644
--- a/src/privateobject.h
+++ b/src/privateobject.h
@@ -17,5 +17,4 @@ class PrivateObject {
 	std::list<CompObject *> children;
 };
 
-
-#endif
\ No newline at end of file
+#endif
diff --git a/src/privatetexture.h b/src/privatetexture.h
index 1e14e6b..809925f 100644
--- a/src/privatetexture.h
+++ b/src/privatetexture.h
@@ -32,5 +32,4 @@ class PrivateTexture {
 	unsigned int        height;
 };
 
-
-#endif
\ No newline at end of file
+#endif
diff --git a/src/screen.cpp b/src/screen.cpp
index 3ab9312..8610393 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -3200,8 +3200,8 @@ CompScreen::runCommand (CompString command)
 
     if (fork () == 0)
     {
-	unsigned int pos;
-	CompString   env = priv->display->displayString ();
+	size_t     pos;
+	CompString env = priv->display->displayString ();
 
 	setsid ();