From 02949cbf845dd187dc2aeeb2b9d231cbf69a5690 Mon Sep 17 00:00:00 2001 From: rti Date: Thu, 10 Mar 2011 00:54:37 +0100 Subject: [PATCH] Fixed: GEQT build on gcc --- .../tools/leveldesign/georges_editor_qt/src/new_dialog.cpp | 4 ++-- .../tools/leveldesign/georges_editor_qt/src/new_dialog.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp b/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp index a89e292ef..156e17ec0 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.cpp @@ -89,7 +89,7 @@ namespace NLQT //nlinfo ("Searching files in directory '%s'...", dir.c_str()); 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()); for ( std::map::iterator it = FileTypeToId.begin(); it != FileTypeToId.end(); ++it ) { @@ -232,7 +232,7 @@ namespace NLQT _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()); for(uint i = 0; i < _files.size(); i++) diff --git a/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.h b/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.h index c06824ada..04cf2a6b0 100644 --- a/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.h +++ b/code/ryzom/tools/leveldesign/georges_editor_qt/src/new_dialog.h @@ -59,7 +59,7 @@ namespace NLQT std::vector _files; - void getTypes( std::string& dir ); + void getTypes( /* std::string& dir // not needed anymore? */ ); void addType( std::string fileName ); bool getFileType( std::string& fileName, std::string& fileType ); sint16 getFirstFreeFileTypeId();