Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: GEQT build on gcc

Browse source
This commit is contained in:
rti 2011-03-10 00:54:37 +01:00
parent 200bf3b024
commit 7e542e0201
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp
View file

@ -89,7 +89,7 @@ namespace NLQT
//nlinfo ("Searching files in directory '%s'...", dir.c_str()); //nlinfo ("Searching files in directory '%s'...", dir.c_str());
NLMISC::CPath::getPathContent(path.toStdString(),true,false,true,_files); NLMISC::CPath::getPathContent(path.toStdString(),true,false,true,_files);
getTypes(path.toStdString()); getTypes( /* path.toStdString() // incompatible parameter type */ );
//nlinfo ("%d supported file types :",FileTypeToId.size()); //nlinfo ("%d supported file types :",FileTypeToId.size());
for ( std::map<std::string,uint8>::iterator it = FileTypeToId.begin(); it != FileTypeToId.end(); ++it ) for ( std::map<std::string,uint8>::iterator it = FileTypeToId.begin(); it != FileTypeToId.end(); ++it )
{ {
@ -232,7 +232,7 @@ namespace NLQT
_ui.wizDescLabel->setText(myDescription); _ui.wizDescLabel->setText(myDescription);
} }
void CGeorgesNewDialog::getTypes( std::string& dir ) void CGeorgesNewDialog::getTypes( /* std::string& dir // not needed anymore? */ )
{ {
//nlinfo ("Found %d files in directory '%s'", files.size(), dir.c_str()); //nlinfo ("Found %d files in directory '%s'", files.size(), dir.c_str());
for(uint i = 0; i < _files.size(); i++) for(uint i = 0; i < _files.size(); i++)

2
code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.h
View file

@ -59,7 +59,7 @@ namespace NLQT
std::vector<std::string> _files; std::vector<std::string> _files;
void getTypes( std::string& dir ); void getTypes( /* std::string& dir // not needed anymore? */ );
void addType( std::string fileName ); void addType( std::string fileName );
bool getFileType( std::string& fileName, std::string& fileType ); bool getFileType( std::string& fileName, std::string& fileType );
sint16 getFirstFreeFileTypeId(); sint16 getFirstFreeFileTypeId();