[dasher] Fixup Chinese BuildTree.

[Patrick Welche <pwelche src gnome org>]

commit 05c615e8e6eb19c2bf189b44e3688afef5dc3926
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Mon Aug 24 18:53:56 2009 +0100

    Fixup Chinese BuildTree.

 ChangeLog                                 |    4 ++++
 Src/DasherCore/ConversionHelper.h         |    4 +++-
 Src/DasherCore/NodeManager.h              |    2 +-
 Src/DasherCore/PinYinConversionHelper.cpp |    1 -
 4 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 399e9b3..dca599c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-24  Patrick Welche <prlw1 cam ac uk>
+
+	* Fixup Chinese BuildTree.
+
 2009-08-22  Alan Lawrence <acl33 inf phy cam ac uk>
 
 	* Modularise the NodeManager-subclass-specific void *'s
diff --git a/Src/DasherCore/ConversionHelper.h b/Src/DasherCore/ConversionHelper.h
index ad6b593..a88044b 100644
--- a/Src/DasherCore/ConversionHelper.h
+++ b/Src/DasherCore/ConversionHelper.h
@@ -122,7 +122,7 @@ namespace Dasher{
     	
     virtual void SetFlag(CDasherNode *pNode, int iFlag, bool bValue);
 
-private:
+protected:
 	
     /// 
     /// Build the conversion tree (lattice) for the given string -
@@ -132,6 +132,8 @@ private:
     
     void BuildTree(CDasherNode *pRoot);
 	
+private:
+
     ///
     /// Language model (TODO: We don't need to know about this, surely)
     ///
diff --git a/Src/DasherCore/NodeManager.h b/Src/DasherCore/NodeManager.h
index b3e35d6..c9221c6 100644
--- a/Src/DasherCore/NodeManager.h
+++ b/Src/DasherCore/NodeManager.h
@@ -20,7 +20,7 @@
 
 #ifndef __nodemanager_h__
 #define __nodemanager_h__
-#include "LanguageModel.h"
+#include "LanguageModelling/LanguageModel.h"
 #include "DasherTypes.h"
 
 namespace Dasher {
diff --git a/Src/DasherCore/PinYinConversionHelper.cpp b/Src/DasherCore/PinYinConversionHelper.cpp
index ac412a7..82abdc4 100644
--- a/Src/DasherCore/PinYinConversionHelper.cpp
+++ b/Src/DasherCore/PinYinConversionHelper.cpp
@@ -77,7 +77,6 @@ void CPinYinConversionHelper::BuildTree(CDasherNode *pRoot) {
 bool CPinYinConversionHelper::Convert(const std::string &strSource, SCENode ** pRoot) {
 
   *pRoot = 0;
-std::cout<<"Convert \"" << strSource << "\"\n"; 
   return (pParser && pParser->Convert(strSource, pRoot));
 }