summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-27 22:27:39 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-27 22:27:39 +0300
commit4102bb248ed5f5efcd81d317a876318c91bad4d6 (patch)
tree738800bc14ade7397ff98f036e3bf5500715e63e /src/gui
parentbeb426326518da97747cb5dce6773a13a96ceb2a (diff)
downloadManaVerse-4102bb248ed5f5efcd81d317a876318c91bad4d6.tar.gz
ManaVerse-4102bb248ed5f5efcd81d317a876318c91bad4d6.tar.bz2
ManaVerse-4102bb248ed5f5efcd81d317a876318c91bad4d6.tar.xz
ManaVerse-4102bb248ed5f5efcd81d317a876318c91bad4d6.zip
fix code style and issues with different builds.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/sdlfont.cpp1
-rw-r--r--src/gui/widgets/layout.h2
-rw-r--r--src/gui/widgets/setupitem.cpp2
3 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp
index 749a36b4e..13749895a 100644
--- a/src/gui/sdlfont.cpp
+++ b/src/gui/sdlfont.cpp
@@ -31,7 +31,6 @@
#include "resources/image.h"
#include "resources/imagehelper.h"
-//#include "resources/resourcemanager.h"
#include "resources/surfaceimagehelper.h"
#include "utils/paths.h"
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 1371420f7..8a33f03f6 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -173,7 +173,7 @@ class LayoutCell
FILL
};
- ~LayoutCell();
+ virtual ~LayoutCell();
/**
* Sets the padding around the cell content.
diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp
index 417133ec6..652a1402b 100644
--- a/src/gui/widgets/setupitem.cpp
+++ b/src/gui/widgets/setupitem.cpp
@@ -513,7 +513,7 @@ void SetupItemLabel::createControls()
{
if (mIsSeparator)
{
- const std::string str (" \342\200\225\342\200\225\342\200\225"
+ const std::string str(" \342\200\225\342\200\225\342\200\225"
"\342\200\225\342\200\225 ");
mLabel = new Label(this, std::string(str).append(mText).append(str));
}