summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-04-13 19:34:10 +0300
committerAndrei Karas <akaras@inbox.ru>2011-04-13 19:34:10 +0300
commit685f380c622178ec8dea189ae94e1a4513f3c9f3 (patch)
tree21f92a33f0db017748f2e954135fcd2f90c31665 /src/gui
parentd0cebb6e0e1ea10dc1d8a2a7670ac9e7e4663417 (diff)
downloadplus-685f380c622178ec8dea189ae94e1a4513f3c9f3.tar.gz
plus-685f380c622178ec8dea189ae94e1a4513f3c9f3.tar.bz2
plus-685f380c622178ec8dea189ae94e1a4513f3c9f3.tar.xz
plus-685f380c622178ec8dea189ae94e1a4513f3c9f3.zip
Fix warnings in clang compilation.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/serverdialog.cpp2
-rw-r--r--src/gui/specialswindow.cpp3
-rw-r--r--src/gui/specialswindow.h2
-rw-r--r--src/gui/statuspopup.cpp2
-rw-r--r--src/gui/statuswindow.cpp2
5 files changed, 4 insertions, 7 deletions
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index ed5a920e7..45ec907fb 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -217,7 +217,7 @@ ServerDialog::ServerDialog(ServerInfo *serverInfo, const std::string &dir):
mDownloadProgress(-1.0f),
mServers(ServerInfos()),
mServerInfo(serverInfo),
- mPersistentIPCheckBox(false)
+ mPersistentIPCheckBox(0)
{
if (isSafeMode)
setCaption("Choose Your Server *** SAFE MODE ***");
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index 51d31f2c9..d3583e0f5 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -54,9 +54,6 @@
#define SPECIALS_WIDTH 200
#define SPECIALS_HEIGHT 32
-class SpecialEntry;
-
-
class SpecialEntry : public Container
{
public:
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index 96ba12dc5..2c7434f40 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -45,7 +45,7 @@ class ScrollArea;
class Tab;
class TabbedArea;
-struct SpecialEntry;
+class SpecialEntry;
class SpecialsWindow : public Window, public gcn::ActionListener
{
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 82416b1d9..fa0e3e437 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -485,7 +485,7 @@ void StatusPopup::updateLabels()
}
mImitationMode->adjustSize();
- switch (player_node->getAwayMode())
+ switch ((int)player_node->getAwayMode())
{
case 0:
setLabelText(mAwayMode, _("(O) on keyboard"), keyboard.KEY_AWAY);
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 82c97ff43..d2fe19792 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -853,7 +853,7 @@ void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent _UNUSED_)
break;
}
- switch (player_node->getAwayMode())
+ switch ((int)player_node->getAwayMode())
{
case 0:
str += translateLetter(N_("(O)"));