Commit dd18c2b9 authored by Sylvain Thery's avatar Sylvain Thery

remove some warnings

parent 88aab812
...@@ -157,17 +157,17 @@ void TexView::cb_keyPress(int code) ...@@ -157,17 +157,17 @@ void TexView::cb_keyPress(int code)
updateGL(); updateGL();
} }
void TexView::init(char *fnm, char* fnt) void TexView::init(const std::string& fnm, const std::string& fnt)
{ {
if (fnm == NULL) if (fnm.empty() )
{ {
computeTore(); computeTore();
m_fileNameTex = std::string(fnt); m_fileNameTex = fnt;
} }
else else
{ {
m_fileNameMesh = std::string(fnm); m_fileNameMesh = fnm;
m_fileNameTex = std::string(fnt); m_fileNameTex = fnt;
std::vector<std::string> attrNames; std::vector<std::string> attrNames;
m_obj.import(m_fileNameMesh,attrNames); m_obj.import(m_fileNameMesh,attrNames);
...@@ -260,11 +260,11 @@ int main(int argc, char**argv) ...@@ -260,11 +260,11 @@ int main(int argc, char**argv)
} }
else if (argc == 2) else if (argc == 2)
{ {
tv.init(NULL, argv[1]); tv.init("", argv[1]);
} }
else else
{ {
tv.init(NULL,"x"); tv.init("","x");
} }
......
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
~TexView(); ~TexView();
void init(char* fnm, char* fnt); void init(const std::string& fnm, const std::string& fnt);
// callbacks of simpleQT to overdefine: // callbacks of simpleQT to overdefine:
void cb_redraw(); void cb_redraw();
......
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