[dasher] (Partial) build fixes for Japanese (CannaConversionHelper)

[Patrick Welche <pwelche src gnome org>]

commit eab665a69f9169e7edc949ba2e6165b2712fb5d2
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Tue Dec 1 17:05:37 2009 +0000

    (Partial) build fixes for Japanese (CannaConversionHelper)

 ChangeLog                                |    1 +
 Src/DasherCore/CannaConversionHelper.cpp |    4 +++-
 Src/DasherCore/CannaConversionHelper.h   |    6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 3a0400c..72b5dd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
 	  remove (Win32-only) IMEConversionHelper
 	* MacOSX: Store entire context/history (i.e. reverse through
 	  all you have written)
+	* (Partial) build fixes for Japanese (CannaConversionHelper)
 
 
 2009-12-01  Patrick Welche <prlw1 cam ac uk>
diff --git a/Src/DasherCore/CannaConversionHelper.cpp b/Src/DasherCore/CannaConversionHelper.cpp
index 77704eb..4ffcde0 100644
--- a/Src/DasherCore/CannaConversionHelper.cpp
+++ b/Src/DasherCore/CannaConversionHelper.cpp
@@ -12,6 +12,8 @@
 
 #include <iostream>             //For testing 23 June 2005
 
+using namespace Dasher;
+
 CCannaConversionHelper::CCannaConversionHelper(CNodeCreationManager *pNCManager, CAlphabet *pAlphabet, int Type, int Order)
 : CConversionHelper(pNCManager, pAlphabet) {
 
@@ -65,7 +67,7 @@ CCannaConversionHelper::~CCannaConversionHelper() {
 
 }
 
-bool CCannaConversionHelper::Convert(const std::string &strSource, SCENode ** pRoot, int * childCount, int CMid) {
+bool CCannaConversionHelper::Convert(const std::string &strSource, SCENode ** pRoot) {
 
   if(strSource.size() == 0)
     return false;
diff --git a/Src/DasherCore/CannaConversionHelper.h b/Src/DasherCore/CannaConversionHelper.h
index 7c03bb6..3e5b132 100644
--- a/Src/DasherCore/CannaConversionHelper.h
+++ b/Src/DasherCore/CannaConversionHelper.h
@@ -9,12 +9,12 @@
 #include <iostream> 
 /// \ingroup Model
 /// @{
-class CCannaConversionHelper : public CConversionHelper {
+class CCannaConversionHelper : public Dasher::CConversionHelper {
  public:
-  CCannaConversionHelper(CNodeCreationManager pNCManager, CAlphabet *pAlphabet, int Type, int Order);
+  CCannaConversionHelper(CNodeCreationManager *pNCManager, Dasher::CAlphabet *pAlphabet, int Type, int Order);
   ~CCannaConversionHelper();
 
-  virtual bool Convert(const std::string &strSource, SCENode ** pRoot, int * childCount, int CMid);
+  virtual bool Convert(const std::string &strSource, SCENode ** pRoot);
 
 
   virtual void AssignSizes(SCENode ** pStart, Dasher::CLanguageModel::Context context, long normalization, int uniform, int iNChildren);