Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Fixed: Compile errors under Linux.

Browse Source
hg/feature/gsoc2012-fabien
kaetemi 13 years ago
parent 1390dbf7fe
commit fab5ddfd74
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

22
code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp
Unescape Escape View File

@ -23,7 +23,7 @@
#include <nel/misc/path.h> #include <nel/misc/path.h>
#include <nel/ligo/primitive_utils.h> #include <nel/ligo/primitive_utils.h>
#include <nel/ligo/primitive.h> #include <nel/ligo/primitive.h>
#include <nel/ligo/ligo_config.h> #include <nel/ligo/ligo_config.h>
#include <string.h> #include <string.h>
@ -81,7 +81,7 @@ MissionCompilerMainWindow::MissionCompilerMainWindow(QWidget *parent) :
connect(Core::ICore::instance(), SIGNAL(changeSettings()), this, SLOT(handleChangedSettings())); connect(Core::ICore::instance(), SIGNAL(changeSettings()), this, SLOT(handleChangedSettings()));
// Set the default data dir to the primitives path. // Set the default data dir to the primitives path.
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup(Core::Constants::DATA_PATH_SECTION); settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
m_lastDir = settings->value(Core::Constants::PRIMITIVES_PATH).toString(); m_lastDir = settings->value(Core::Constants::PRIMITIVES_PATH).toString();
ui->dataDirEdit->setText(m_lastDir); ui->dataDirEdit->setText(m_lastDir);
@ -381,7 +381,7 @@ bool MissionCompilerMainWindow::parsePrimForMissions(NLLIGO::IPrimitive const *p
{ {
std::string value; std::string value;
// if the node is a mission parse it // if the node is a mission parse it
if (prim->getPropertyByName("class",value) && !stricmp(value.c_str(),"mission") ) if (prim->getPropertyByName("class",value) && !NLMISC::stricmp(value.c_str(),"mission") )
{ {
std::string name; std::string name;
prim->getPropertyByName("name",name); prim->getPropertyByName("name",name);
@ -460,20 +460,20 @@ void MissionCompilerMainWindow::loadConfig() {
} }
void MissionCompilerMainWindow::saveConfig() { void MissionCompilerMainWindow::saveConfig() {
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup(MISSION_COMPILER_SECTION); settings->beginGroup(MISSION_COMPILER_SECTION);
QStringList servers; QStringList servers;
for(int row = 0; row < ui->publishServersList->count(); row++) for(int row = 0; row < ui->publishServersList->count(); row++)
{ {
QListWidgetItem *item = ui->publishServersList->item(row); QListWidgetItem *item = ui->publishServersList->item(row);
if(item->checkState() == Qt::Checked) if(item->checkState() == Qt::Checked)
servers << item->text(); servers << item->text();
} }
settings->setValue(SETTING_PUBLISH_SERVER_CHECKS, servers); settings->setValue(SETTING_PUBLISH_SERVER_CHECKS, servers);
settings->endGroup(); settings->endGroup();
settings->sync(); settings->sync();
} }

4
code/ryzom/common/src/game_share/mirror_prop_value.h
Unescape Escape View File

@ -22,7 +22,7 @@
#include "nel/misc/types_nl.h" #include "nel/misc/types_nl.h"
#include "nel/misc/stream.h" #include "nel/misc/stream.h"
#include "mirrored_data_set.h" #include "mirrored_data_set.h"
#include <stddef.h>
/** /**
* Read-only handler of a value of a property. * Read-only handler of a value of a property.
@ -1318,4 +1318,4 @@ protected:
#endif // NL_MIRROR_PROP_VALUE_H #endif // NL_MIRROR_PROP_VALUE_H
/* End of mirror_prop_value.h */ /* End of mirror_prop_value.h */

Write Preview
Loading…
Cancel
Save