Commit e8b4dd21 authored by François Grisez's avatar François Grisez

Remove all calls to 'using namespace' from headers

parent dfca1faf
...@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ...@@ -28,6 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define VCARD_MD5_HASH_SIZE 16 #define VCARD_MD5_HASH_SIZE 16
using namespace std;
struct _LinphoneVcardContext { struct _LinphoneVcardContext {
shared_ptr<belcard::BelCardParser> parser; shared_ptr<belcard::BelCardParser> parser;
......
...@@ -33,8 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ...@@ -33,8 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <cstring> #include <cstring>
using namespace::std;
class Type{ class Type{
public: public:
...@@ -50,7 +48,7 @@ public: ...@@ -50,7 +48,7 @@ public:
Array Array
}; };
static const char *sBasicTypeNames[]; static const char *sBasicTypeNames[];
static Type* addType(BasicType bt, const string &name){ static Type* addType(BasicType bt, const std::string &name){
Type* ret; Type* ret;
if ((ret=mTypes[name])==0){ if ((ret=mTypes[name])==0){
//cout<<"Adding new "<<sBasicTypeNames[(int)bt]<<" type '"<<name<<"'"<<endl; //cout<<"Adding new "<<sBasicTypeNames[(int)bt]<<" type '"<<name<<"'"<<endl;
...@@ -60,48 +58,48 @@ public: ...@@ -60,48 +58,48 @@ public:
} }
return ret; return ret;
} }
static Type *getType(const std::string &tname){ static Type *getType(const std::std::string &tname){
if (tname.find("(")!=string::npos) return NULL; //arrives when parsing function pointer declared inside function prototype if (tname.find("(")!=std::string::npos) return NULL; //arrives when parsing function pointer declared inside function prototype
if (strstr(tname.c_str(),"char")!=0 && strchr(tname.c_str(),'*')!=0){ if (strstr(tname.c_str(),"char")!=0 && strchr(tname.c_str(),'*')!=0){
return &sStringType; return &sStringType;
}else if (tname.find("int")!=string::npos){ }else if (tname.find("int")!=std::string::npos){
return &sIntegerType; return &sIntegerType;
}else if (tname.find("size_t")!=string::npos){ }else if (tname.find("size_t")!=std::string::npos){
return &sIntegerType; return &sIntegerType;
}else if (tname.find("float")!=string::npos){ }else if (tname.find("float")!=std::string::npos){
return &sFloatType; return &sFloatType;
}else if (tname.find("bool_t")!=string::npos){ }else if (tname.find("bool_t")!=std::string::npos){
return &sBooleanType; return &sBooleanType;
}else if (tname.find("void")!=string::npos){ }else if (tname.find("void")!=std::string::npos){
return &sVoidType; return &sVoidType;
}else if (tname.find("enum")!=string::npos){ }else if (tname.find("enum")!=std::string::npos){
return addType(Enum,tname.c_str()+strlen("enum ")); return addType(Enum,tname.c_str()+strlen("enum "));
}else if (tname.find("MSList")!=string::npos){ }else if (tname.find("MSList")!=std::string::npos){
return &sArrayType; return &sArrayType;
}else{/*an object?*/ }else{/*an object?*/
string tmp=tname; std::string tmp=tname;
size_t pos; size_t pos;
/*really ugly and slow*/ /*really ugly and slow*/
pos=tmp.find('*'); pos=tmp.find('*');
if (pos!=string::npos) if (pos!=std::string::npos)
tmp.erase(pos,1); tmp.erase(pos,1);
pos=tmp.find("const"); pos=tmp.find("const");
if (pos!=string::npos) if (pos!=std::string::npos)
tmp.erase(pos,strlen("const")); tmp.erase(pos,strlen("const"));
while ((pos=tmp.find(' '))!=string::npos){ while ((pos=tmp.find(' '))!=std::string::npos){
tmp.erase(pos,1); tmp.erase(pos,1);
} }
return addType(Class,tmp); return addType(Class,tmp);
} }
cerr<<"Unhandled type name"<<tname<<endl; std::cerr<<"Unhandled type name"<<tname<<std::endl;
return NULL; return NULL;
} }
const string &getName()const{ const std::string &getName()const{
return mName; return mName;
} }
BasicType getBasicType()const{ BasicType getBasicType()const{
...@@ -109,7 +107,7 @@ public: ...@@ -109,7 +107,7 @@ public:
} }
private: private:
BasicType mBasic; BasicType mBasic;
string mName; std::string mName;
Type(BasicType basic, const std::string &tname="") : mBasic(basic), mName(tname){ Type(BasicType basic, const std::string &tname="") : mBasic(basic), mName(tname){
} }
static Type sStringType; static Type sStringType;
...@@ -118,14 +116,14 @@ private: ...@@ -118,14 +116,14 @@ private:
static Type sBooleanType; static Type sBooleanType;
static Type sFloatType; static Type sFloatType;
static Type sArrayType; static Type sArrayType;
static std::map<string,Type*> mTypes; static std::map<std::string,Type*> mTypes;
}; };
class Argument{ class Argument{
public: public:
Argument(Type *type, const string &argname, bool isConst, bool isPointer) : mType(type), mName(argname), mConst(isConst), mPointer(isPointer){ Argument(Type *type, const std::string &argname, bool isConst, bool isPointer) : mType(type), mName(argname), mConst(isConst), mPointer(isPointer){
if (!isPointer) mConst=false; if (!isPointer) mConst=false;
} }
Type *getType()const{ Type *getType()const{
...@@ -134,23 +132,23 @@ public: ...@@ -134,23 +132,23 @@ public:
bool isConst()const{ bool isConst()const{
return mConst; return mConst;
} }
const string &getName()const{ const std::string &getName()const{
return mName; return mName;
} }
bool isPointer()const{ bool isPointer()const{
return mPointer; return mPointer;
} }
const string &getHelp()const{ const std::string &getHelp()const{
return mHelp; return mHelp;
} }
void setHelp(const string &help){ void setHelp(const std::string &help){
mHelp=help; mHelp=help;
} }
private: private:
Type *mType; Type *mType;
string mName; std::string mName;
string mHelp; std::string mHelp;
bool mConst; bool mConst;
bool mPointer; bool mPointer;
}; };
......
...@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ...@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "linphone++/linphone.hh" #include "linphone++/linphone.hh"
#include "tools.hh" #include "tools.hh"
using namespace std;
using namespace {{{namespace}}}; using namespace {{{namespace}}};
{{#classes}} {{#classes}}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment