summaryrefslogtreecommitdiff
path: root/src/guichan
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-16 20:39:33 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-16 20:39:33 +0300
commitbc92643d8db723b5049db2dbad1ce052a0ae77a9 (patch)
tree4471be99711ee310c811e990d7c210e2393aeb6e /src/guichan
parent82cc576b7896f39bcf71aa85c8c4b3ef786c065b (diff)
downloadManaVerse-bc92643d8db723b5049db2dbad1ce052a0ae77a9.tar.gz
ManaVerse-bc92643d8db723b5049db2dbad1ce052a0ae77a9.tar.bz2
ManaVerse-bc92643d8db723b5049db2dbad1ce052a0ae77a9.tar.xz
ManaVerse-bc92643d8db723b5049db2dbad1ce052a0ae77a9.zip
Fix code style and some other minor issues.
Diffstat (limited to 'src/guichan')
-rw-r--r--src/guichan/basiccontainer.cpp2
-rw-r--r--src/guichan/gui.cpp4
-rw-r--r--src/guichan/rectangle.cpp2
-rw-r--r--src/guichan/widgets/label.cpp2
-rw-r--r--src/guichan/widgets/listbox.cpp4
5 files changed, 7 insertions, 7 deletions
diff --git a/src/guichan/basiccontainer.cpp b/src/guichan/basiccontainer.cpp
index 4598c4e8d..f3f61b65a 100644
--- a/src/guichan/basiccontainer.cpp
+++ b/src/guichan/basiccontainer.cpp
@@ -149,7 +149,7 @@ namespace gcn
break;
}
- WidgetListReverseIterator end = it;
+ const WidgetListReverseIterator end = it;
++ it;
diff --git a/src/guichan/gui.cpp b/src/guichan/gui.cpp
index 41ff39797..41b9fe30f 100644
--- a/src/guichan/gui.cpp
+++ b/src/guichan/gui.cpp
@@ -343,7 +343,7 @@ namespace gcn
mWidgetWithMouseQueue.push_front(widget);
}
- Widget *const swap = widget;
+ const Widget *const swap = widget;
widget = parent;
parent = swap->getParent();
}
@@ -637,7 +637,7 @@ namespace gcn
break;
}
- Widget *const swap = widget;
+ const Widget *const swap = widget;
widget = parent;
parent = swap->getParent();
diff --git a/src/guichan/rectangle.cpp b/src/guichan/rectangle.cpp
index eb87bff50..165f94aab 100644
--- a/src/guichan/rectangle.cpp
+++ b/src/guichan/rectangle.cpp
@@ -90,7 +90,7 @@ namespace gcn
if (x_ < 0)
{
width_ += x_;
- x_ = 0;
+// x_ = 0;
}
else if (x_ + width_ > rectangle.width)
{
diff --git a/src/guichan/widgets/label.cpp b/src/guichan/widgets/label.cpp
index dc88deb69..8879407f7 100644
--- a/src/guichan/widgets/label.cpp
+++ b/src/guichan/widgets/label.cpp
@@ -91,7 +91,7 @@ namespace gcn
return mAlignment;
}
- void Label::draw(Graphics* graphics)
+ void Label::draw(Graphics* graphics A_UNUSED)
{
}
diff --git a/src/guichan/widgets/listbox.cpp b/src/guichan/widgets/listbox.cpp
index 10e37841a..42f2d8d8b 100644
--- a/src/guichan/widgets/listbox.cpp
+++ b/src/guichan/widgets/listbox.cpp
@@ -132,11 +132,11 @@ namespace gcn
distributeValueChangedEvent();
}
- void ListBox::keyPressed(KeyEvent& keyEvent A_UNUSED)
+ void ListBox::keyPressed(KeyEvent &keyEvent A_UNUSED)
{
}
- void ListBox::mousePressed(MouseEvent& mouseEvent)
+ void ListBox::mousePressed(MouseEvent &mouseEvent A_UNUSED)
{
}