commit 97546fef

Poul Sander · 2020-08-08 17:21
97546fef5ed6da4dba349d9091f1fa02ae34d9e5 patch · browse files
parent b1f06489696240f7a7c8c1672b9ea9ba0c4a08f6

Removed more using

Changed files

M	source/code/menudef.cpp before

diff --git a/source/code/menudef.cpp b/source/code/menudef.cpp index 9b2cfbf..293ab75 100644 --- a/source/code/menudef.cpp +++ b/source/code/menudef.cpp

@@ -30,8 +30,6 @@ http://blockattack.net

#include "HelpAboutState.hpp"

#include "ShowFileState.hpp"

-using std::string;

-using std::vector;

#if 0

//Menu

@@ -54,8 +52,8 @@ void OpenScoresDisplay();

extern control keySettings[3];

//Function to return the name of a key, to be displayed...

-string getKeyName(SDL_Keycode key) {

- string keyname(SDL_GetKeyName(key));

+std::string getKeyName(SDL_Keycode key) {

+ std::string keyname(SDL_GetKeyName(key));

if (key == SDLK_UP) {

keyname = _("Up arrow");

}

@@ -101,7 +99,7 @@ string getKeyName(SDL_Keycode key) {

class Button_changekey : public Button {

private:

SDL_Keycode* m_key2change;

- string m_keyname;

+ std::string m_keyname;

public:

Button_changekey(SDL_Keycode* key, const char* keyname);

void doAction();