← Back to branch summary

~alanbell/dasher/ircfix-lp579181

« back to all changes in this revision

Viewing changes to Src/DasherCore/ConversionManagerFactory.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Daniel Holbach
  • Date: 2007-02-13 08:08:15 UTC
  • mfrom: (1.2.17 upstream)
  • Revision ID: james.westby@ubuntu.com-20070213080815-bpx0yjnzkwfamvi8
Tags: 4.3.4-0ubuntu1
* New upstream release:
  - Updated rendering routines
  - General tidying of gobject implemenatations
  - Translation updates
* debian/rules: 
  - build with --enable-joystick.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Src/DasherCore/ConversionManagerFactory.cpp
13
13
#else
14
14
 
15
15
#ifdef CHINESE
 
16
 
16
17
#include "PinYinConversionHelper.h"
17
18
#endif
18
19
 
24
25
 
25
26
using namespace Dasher;
26
27
 
27
 
CConversionManagerFactory::CConversionManagerFactory(CNodeCreationManager *pNCManager, int iID) {
 
28
CConversionManagerFactory::CConversionManagerFactory(Dasher::CEventHandler *pEventHandler,  CSettingsStore *pSettingsStore, CNodeCreationManager *pNCManager, int iID, Dasher::CAlphIO *pCAlphIO) {
28
29
  m_pNCManager = pNCManager;
29
 
  m_pHelper = GetHelper(iID);
 
30
  m_pHelper = GetHelper(pEventHandler, pSettingsStore, iID, pCAlphIO);
30
31
 
31
32
  // TODO: These shouldn't be here - need to figure out exactly how it all works
32
33
  pagecount = 0; // TODO: Doesn't actually appear to do anything
47
48
 
48
49
// TODO: Japanese/Chinese are currently disabled in Win32 - see 'exclude from build' on individual files' property pages, plus preprocessor defines
49
50
 
50
 
CConversionHelper *CConversionManagerFactory::GetHelper(int iID) {
 
51
CConversionHelper *CConversionManagerFactory::GetHelper(Dasher::CEventHandler *pEventHandler, CSettingsStore *pSettingsStore, int iID, Dasher::CAlphIO *pCAlphIO) {
51
52
  switch(iID) {
52
53
  case 0: // No conversion required (shouldn't really be called)
53
54
    return NULL;
66
67
    return NULL;
67
68
#else
68
69
#ifdef CHINESE
69
 
    return new CPinYinConversionHelper;
 
70
    return new CPinYinConversionHelper(pEventHandler,pSettingsStore, pCAlphIO);
70
71
#else
71
72
    return NULL;
72
73
#endif