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