[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r12343: cleanup a few warnings.
From: |
Rob Savoye |
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r12343: cleanup a few warnings. |
Date: |
Fri, 30 Jul 2010 09:06:49 -0600 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 12343
committer: Rob Savoye <address@hidden>
branch nick: trunk
timestamp: Fri 2010-07-30 09:06:49 -0600
message:
cleanup a few warnings.
modified:
gui/MouseDevice.cpp
=== modified file 'gui/MouseDevice.cpp'
--- a/gui/MouseDevice.cpp 2010-07-29 16:02:59 +0000
+++ b/gui/MouseDevice.cpp 2010-07-30 15:06:49 +0000
@@ -73,13 +73,13 @@
};
struct mouse_types mice[] = {
- InputDevice::MOUSE, "/dev/input/mice", // PS/2 Mouse
+ {InputDevice::MOUSE, "/dev/input/mice"}, // PS/2 Mouse
#ifdef MULTIPLE_DEVICES
- InputDevice::MOUSE, "/dev/input/mouse0",
- InputDevice::MOUSE, "/dev/input/mouse1",
- InputDevice::MOUSE, "/dev/usb/tkpanel0", // eTurboTouch touchscreen
+ {InputDevice::MOUSE, "/dev/input/mouse0"},
+ {InputDevice::MOUSE, "/dev/input/mouse1"},
+ {InputDevice::MOUSE, "/dev/usb/tkpanel0"}, // eTurboTouch
touchscreen
#endif
- InputDevice::UNKNOWN, 0
+ {InputDevice::UNKNOWN, 0}
};
int i = 0;
@@ -225,8 +225,7 @@
return false; // no mouse available
}
- int i;
- int xmove, ymove, btn, btn_changed;
+ int xmove, ymove, btn;
boost::shared_array<boost::uint8_t> buf;
if (_type == InputDevice::TOUCHMOUSE) {
// The eTurboTouch has a 4 byte packet
@@ -291,11 +290,11 @@
if (_y < 0) {
_y = 0;
}
- if (_x > _gui->getStage()->getStageWidth()) {
- _x = _gui->getStage()->getStageWidth();
+ if (_x > static_cast<int>(_gui->getStage()->getStageWidth())) {
+ _x = static_cast<int>(_gui->getStage()->getStageWidth());
}
- if (_y > _gui->getStage()->getStageHeight()) {
- _y = _gui->getStage()->getStageHeight();
+ if (_y > static_cast<int>(_gui->getStage()->getStageHeight())) {
+ _y = static_cast<int>(_gui->getStage()->getStageHeight());
}
} // end of InputDevice::MOUSE
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r12343: cleanup a few warnings.,
Rob Savoye <=