From acab58a3b93d91e903b254278d619fe0283cb226 Mon Sep 17 00:00:00 2001
From: kaetemi <devnull@localhost>
Date: Thu, 5 Apr 2012 17:45:53 +0200
Subject: [PATCH] Fixed: Compile errors under Linux.

---
 .../mission_compiler_main_window.cpp          | 22 +++++++++----------
 .../common/src/game_share/mirror_prop_value.h |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp
index 416a418f1..df909f31a 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp
@@ -23,7 +23,7 @@
 
 #include <nel/misc/path.h>
 #include <nel/ligo/primitive_utils.h>
-#include <nel/ligo/primitive.h>
+#include <nel/ligo/primitive.h>
 #include <nel/ligo/ligo_config.h>
 
 #include <string.h>
@@ -81,7 +81,7 @@ MissionCompilerMainWindow::MissionCompilerMainWindow(QWidget *parent) :
 	connect(Core::ICore::instance(), SIGNAL(changeSettings()), this, SLOT(handleChangedSettings()));
 
 	// 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);
 	m_lastDir = settings->value(Core::Constants::PRIMITIVES_PATH).toString();
 	ui->dataDirEdit->setText(m_lastDir);
@@ -381,7 +381,7 @@ bool MissionCompilerMainWindow::parsePrimForMissions(NLLIGO::IPrimitive const *p
 {
 	std::string value;
 	// 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;
 		prim->getPropertyByName("name",name);
@@ -460,20 +460,20 @@ void MissionCompilerMainWindow::loadConfig() {
 }
 
 void MissionCompilerMainWindow::saveConfig() {
-	QSettings *settings = Core::ICore::instance()->settings();
-	settings->beginGroup(MISSION_COMPILER_SECTION);
-
+	QSettings *settings = Core::ICore::instance()->settings();
+	settings->beginGroup(MISSION_COMPILER_SECTION);
+
 	QStringList servers;
 	for(int row = 0; row < ui->publishServersList->count(); row++)
 	{
 		QListWidgetItem *item = ui->publishServersList->item(row);
 		if(item->checkState() == Qt::Checked)
 			servers << item->text();
-	}
-
-	settings->setValue(SETTING_PUBLISH_SERVER_CHECKS, servers);
-
-	settings->endGroup();
+	}
+
+	settings->setValue(SETTING_PUBLISH_SERVER_CHECKS, servers);
+
+	settings->endGroup();
 	settings->sync();
 }
 
diff --git a/code/ryzom/common/src/game_share/mirror_prop_value.h b/code/ryzom/common/src/game_share/mirror_prop_value.h
index 08e96761d..1bb4c7571 100644
--- a/code/ryzom/common/src/game_share/mirror_prop_value.h
+++ b/code/ryzom/common/src/game_share/mirror_prop_value.h
@@ -22,7 +22,7 @@
 #include "nel/misc/types_nl.h"
 #include "nel/misc/stream.h"
 #include "mirrored_data_set.h"
-
+#include <stddef.h>
 
 /**
  * Read-only handler of a value of a property.
@@ -1318,4 +1318,4 @@ protected:
 
 #endif // NL_MIRROR_PROP_VALUE_H
 
-/* End of mirror_prop_value.h */
\ No newline at end of file
+/* End of mirror_prop_value.h */