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

Fixed: Compilation with GCC

Browse source
This commit is contained in:
kervala 2012-12-08 13:12:29 +01:00
parent f89fdf3c24
commit b83b8563a6
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/tools/leveldesign/georges_editor_qt/src/settings_dialog.cpp
View file

@ -152,7 +152,7 @@ namespace NLQT
QString oldLdPath = Modules::config().getValue("LeveldesignPath", std::string("")).c_str(); QString oldLdPath = Modules::config().getValue("LeveldesignPath", std::string("")).c_str();
if (oldLdPath != ui.leveldesignPath->text()) if (oldLdPath != ui.leveldesignPath->text())
{ {
std::string ldPath = ui.leveldesignPath->text().toUtf8(); std::string ldPath = ui.leveldesignPath->text().toUtf8().constData();
Modules::config().getConfigFile().getVar("LeveldesignPath").forceAsString(ldPath); Modules::config().getConfigFile().getVar("LeveldesignPath").forceAsString(ldPath);
Q_EMIT ldPathChanged(ldPath.c_str()); Q_EMIT ldPathChanged(ldPath.c_str());
// TODO: remove old Path from CPath // TODO: remove old Path from CPath
@ -171,8 +171,8 @@ namespace NLQT
std::vector<std::string> addList; std::vector<std::string> addList;
for (sint i = 0; i < ui.pathsListWidget->count(); ++i) for (sint i = 0; i < ui.pathsListWidget->count(); ++i)
{ {
std::string str = ui.pathsListWidget->item(i)->text().toUtf8(); std::string str = ui.pathsListWidget->item(i)->text().toUtf8().constData();
if (str != "") if (!str.empty())
{ {
list.push_back(str); list.push_back(str);
if (!sl.contains(str.c_str())) if (!sl.contains(str.c_str()))