summaryrefslogtreecommitdiff
path: root/src/gui/sdlinput.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 13:24:16 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 21:23:10 +0100
commit306ad2effe4d0897453e61ad787e01dc47c33076 (patch)
tree75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/gui/sdlinput.h
parent66599a9896e0cf69b58c0a73152aba4750d87af2 (diff)
downloadmana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip
General code cleanups
* Use default member initializers * Use range-based for loops * Avoid needless pointer references for ShopItem::mDuplicates * Removed type aliases that are only used once or twice * Removed more unused includes * Removed some unused functions * Removed superfluous .c_str() * Rely on default copy and assignment operators for Vector class * Use std::unique_ptr in some places * Removed duplicated mPlayerMoney updating in SellDialog * Removed duplicated Game::handleInput call * Removed unused SDLInput::mMouseInWindow * Removed remnant of manual widget positioning in HelpWindow * Removed superfluous initialization of static pointers
Diffstat (limited to 'src/gui/sdlinput.h')
-rw-r--r--src/gui/sdlinput.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 4fe5be44..a29f17ca 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -162,18 +162,18 @@ public:
* only use SDL and plan sticking with SDL you can safely ignore this
* function as it in the SDL case does nothing.
*/
- virtual void _pollInput() { }
+ void _pollInput() override { }
// Inherited from Input
- virtual bool isKeyQueueEmpty();
+ bool isKeyQueueEmpty() override;
- virtual gcn::KeyInput dequeueKeyInput();
+ gcn::KeyInput dequeueKeyInput() override;
- virtual bool isMouseQueueEmpty();
+ bool isMouseQueueEmpty() override;
- virtual gcn::MouseInput dequeueMouseInput();
+ gcn::MouseInput dequeueMouseInput() override;
bool isTextQueueEmpty() const;
@@ -187,7 +187,7 @@ protected:
* @param button an SDL mouse button.
* @return a Guichan mouse button.
*/
- int convertMouseButton(int button);
+ static int convertMouseButton(int button);
/**
* Converts an SDL event key to a key value.
@@ -196,14 +196,13 @@ protected:
* @return a key value.
* @see Key
*/
- int convertKeyCharacter(SDL_Event event);
+ static int convertKeyCharacter(SDL_Event event);
std::queue<gcn::KeyInput> mKeyInputQueue;
std::queue<gcn::MouseInput> mMouseInputQueue;
std::queue<TextInput> mTextInputQueue;
bool mMouseDown = false;
- bool mMouseInWindow = true;
};
#endif