vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Minor namespace fixes

stl_dim
Marius Kintel 2011-10-26 16:59:26 +02:00
parent ff6d6cda13
commit 0f7ea1ddc0
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Tree.h
View File

@ -3,8 +3,6 @@
#include "nodecache.h"
using std::string;
/*!
For now, just an abstraction of the node tree which keeps a dump
cache based on node indices around.
@ -20,8 +18,8 @@ public:
void setRoot(const AbstractNode *root);
const AbstractNode *root() const { return this->root_node; }
const string &getString(const AbstractNode &node) const;
const string &getIdString(const AbstractNode &node) const;
const std::string &getString(const AbstractNode &node) const;
const std::string &getIdString(const AbstractNode &node) const;
private:
const AbstractNode *root_node;

6
src/color.cc
View File

@ -42,8 +42,6 @@ public:
virtual AbstractNode *evaluate(const Context *ctx, const ModuleInstantiation *inst) const;
};
using std::string;
AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiation *inst) const
{
ColorNode *node = new ColorNode(inst);
@ -87,7 +85,7 @@ AbstractNode *ColorModule::evaluate(const Context *ctx, const ModuleInstantiatio
return node;
}
string ColorNode::toString() const
std::string ColorNode::toString() const
{
std::stringstream stream;
@ -96,7 +94,7 @@ string ColorNode::toString() const
return stream.str();
}
string ColorNode::name() const
std::string ColorNode::name() const
{
return "color";
}

12
src/nodedumper.h
View File

@ -7,10 +7,6 @@
#include "visitor.h"
#include "nodecache.h"
using std::string;
using std::map;
using std::list;
class NodeDumper : public Visitor
{
public:
@ -26,15 +22,15 @@ private:
void handleVisitedChildren(const State &state, const AbstractNode &node);
bool isCached(const AbstractNode &node) const;
void handleIndent(const State &state);
string dumpChildren(const AbstractNode &node);
std::string dumpChildren(const AbstractNode &node);
NodeCache &cache;
bool idprefix;
string currindent;
std::string currindent;
const AbstractNode *root;
typedef list<const AbstractNode *> ChildList;
map<int, ChildList> visitedchildren;
typedef std::list<const AbstractNode *> ChildList;
std::map<int, ChildList> visitedchildren;
};
#endif