Skip to content
Permalink
Browse files

Nuke using namespace std;

  • Loading branch information...
LBPHacker committed Apr 20, 2019
1 parent 0179cef commit e1b3ddcbcb4bf7e9587fb7537353afce7c7b5de1
@@ -50,8 +50,6 @@
#include "gui/Style.h"
#include "gui/interface/Engine.h"

using namespace std;

#define INCLUDE_SYSWM
#include "SDLCompat.h"

@@ -78,8 +78,6 @@
# undef GetUserName // dammit windows
#endif

using namespace std;

class GameController::SearchCallback: public ControllerCallback
{
GameController * cc;
@@ -1394,17 +1392,18 @@ void GameController::OpenProfile()

void GameController::OpenElementSearch()
{
vector<Tool*> toolList;
vector<Menu*> menuList = gameModel->GetMenuList();
for(std::vector<Menu*>::iterator iter = menuList.begin(), end = menuList.end(); iter!=end; ++iter) {
if(!(*iter))
std::vector<Tool*> toolList;
std::vector<Menu*> menuList = gameModel->GetMenuList();
for(auto *mm : menuList)
{
if(!mm)
continue;
vector<Tool*> menuToolList = (*iter)->GetToolList();
std::vector<Tool*> menuToolList = mm->GetToolList();
if(!menuToolList.size())
continue;
toolList.insert(toolList.end(), menuToolList.begin(), menuToolList.end());
}
vector<Tool*> hiddenTools = gameModel->GetUnlistedTools();
std::vector<Tool*> hiddenTools = gameModel->GetUnlistedTools();
toolList.insert(toolList.end(), hiddenTools.begin(), hiddenTools.end());
new ElementSearchActivity(this, toolList);
}
@@ -6,8 +6,6 @@
#include "simulation/SimulationData.h"
#include "ElementClasses.h"

using namespace std;

Tool::Tool(int id, String name, String description, int r, int g, int b, ByteString identifier, VideoBuffer * (*textureGen)(int, int, int)):
textureGen(textureGen),
toolID(id),
@@ -14,7 +14,6 @@
#include "PowderToy.h"

using namespace ui;
using namespace std;

Engine::Engine():
FpsLimit(60.0f),
@@ -24,9 +23,6 @@ Engine::Engine():
altFullscreen(false),
resizable(false),
lastBuffer(NULL),
prevBuffers(stack<pixel*>()),
windows(stack<Window*>()),
mousePositions(stack<Point>()),
state_(NULL),
windowTargetPosition(0, 0),
break_(false),
@@ -3,8 +3,6 @@

#include <vector>

using namespace std;

class RenderView;
class Renderer;
class RenderModel
@@ -9,8 +9,6 @@

#include "game/GameController.h"

using namespace std;

GameController * gameController;
ui::Engine * engine;

0 comments on commit e1b3ddc

Please sign in to comment.
You can’t perform that action at this time.