summaryrefslogtreecommitdiff
path: root/src/gui/gui.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-08-27 01:27:11 +0300
committerAndrei Karas <akaras@inbox.ru>2012-08-27 01:27:11 +0300
commitde476bb95242e10c833394ef007728072eabe60f (patch)
tree033747127a7ea4e36de42cfc99fcee56ce915bbb /src/gui/gui.cpp
parenta33a8dc48761d7cb2b4c1c468e1e3b188bcbf709 (diff)
downloadmanaverse-de476bb95242e10c833394ef007728072eabe60f.tar.gz
manaverse-de476bb95242e10c833394ef007728072eabe60f.tar.bz2
manaverse-de476bb95242e10c833394ef007728072eabe60f.tar.xz
manaverse-de476bb95242e10c833394ef007728072eabe60f.zip
Add const to more classes.
Diffstat (limited to 'src/gui/gui.cpp')
-rw-r--r--src/gui/gui.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 3020168b7..ae2c38d15 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -58,7 +58,7 @@ SDLFont *boldFont = nullptr;
class GuiConfigListener : public ConfigListener
{
public:
- GuiConfigListener(Gui *g):
+ GuiConfigListener(Gui *const g):
mGui(g)
{}
@@ -66,7 +66,7 @@ class GuiConfigListener : public ConfigListener
{
if (name == "customcursor" && mGui)
{
- bool bCustomCursor = config.getBoolValue("customcursor");
+ const bool bCustomCursor = config.getBoolValue("customcursor");
mGui->setUseCustomCursor(bCustomCursor);
}
}
@@ -74,7 +74,7 @@ class GuiConfigListener : public ConfigListener
Gui *mGui;
};
-Gui::Gui(Graphics *graphics):
+Gui::Gui(Graphics *const graphics):
mCustomCursor(false),
mMouseCursors(nullptr),
mMouseCursorAlpha(1.0f),
@@ -94,7 +94,7 @@ Gui::Gui(Graphics *graphics):
mFocusHandler = new FocusHandler;
// Initialize top GUI widget
- WindowContainer *guiTop = new WindowContainer;
+ WindowContainer *const guiTop = new WindowContainer;
guiTop->setFocusable(true);
guiTop->setSize(graphics->mWidth, graphics->mHeight);
guiTop->setOpaque(false);
@@ -256,7 +256,7 @@ Gui::~Gui()
void Gui::logic()
{
- ResourceManager *resman = ResourceManager::getInstance();
+ ResourceManager *const resman = ResourceManager::getInstance();
resman->clearScheduled();
if (!mTop)
@@ -383,12 +383,12 @@ void Gui::draw()
getTop()->draw(mGraphics);
int mouseX, mouseY;
- uint8_t button = SDL_GetMouseState(&mouseX, &mouseY);
+ const uint8_t button = SDL_GetMouseState(&mouseX, &mouseY);
if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS || button & SDL_BUTTON(1))
&& mMouseCursors && mCustomCursor && mMouseCursorAlpha > 0.0f)
{
- Image *mouseCursor = mMouseCursors->get(mCursorType);
+ Image *const mouseCursor = mMouseCursors->get(mCursorType);
if (mouseCursor)
{
mouseCursor->setAlpha(mMouseCursorAlpha);
@@ -403,21 +403,21 @@ void Gui::draw()
mGraphics->popClipArea();
}
-void Gui::videoResized()
+void Gui::videoResized() const
{
- WindowContainer *top = static_cast<WindowContainer*>(getTop());
+ WindowContainer *const top = static_cast<WindowContainer* const>(getTop());
if (top)
{
- int oldWidth = top->getWidth();
- int oldHeight = top->getHeight();
+ const int oldWidth = top->getWidth();
+ const int oldHeight = top->getHeight();
top->setSize(mainGraphics->mWidth, mainGraphics->mHeight);
top->adjustAfterResize(oldWidth, oldHeight);
}
}
-void Gui::setUseCustomCursor(bool customCursor)
+void Gui::setUseCustomCursor(const bool customCursor)
{
if (customCursor != mCustomCursor)
{
@@ -577,7 +577,7 @@ void Gui::distributeMouseEvent(gcn::Widget* source, int type, int button,
break;
}
- gcn::Widget* swap = widget;
+ const gcn::Widget *const swap = widget;
widget = parent;
parent = swap->getParent();