Commit 6e6dd86f authored by Hiroshi Sumita's avatar Hiroshi Sumita
Browse files

Remove PyZy::Config::init(). 

BUG=None
TEST=Run a test

Review URL: http://codereview.appspot.com/5370063
parent e97b37e6

src/PyZyConfig.cc

+2 −12
Original line number Diff line number Diff line
@@ -162,17 +162,12 @@ PinyinConfig::PinyinConfig () 


PinyinConfig &

PinyinConfig::instance ()

{

    return *PinyinConfigImpl::m_instance;

}



void

PinyinConfig::init ()

{

    if (PinyinConfigImpl::m_instance == NULL) {

        PinyinConfigImpl::m_instance.reset (new PinyinConfig ());

        PinyinConfigImpl::m_instance->readDefaultValues ();

    }

    return *PinyinConfigImpl::m_instance;

}



void
@@ -197,17 +192,12 @@ BopomofoConfig::BopomofoConfig () 


BopomofoConfig &

BopomofoConfig::instance ()

{

    return *BopomofoConfigImpl::m_instance;

}



void

BopomofoConfig::init ()

{

    if (BopomofoConfigImpl::m_instance == NULL) {

        BopomofoConfigImpl::m_instance.reset (new BopomofoConfig ());

        BopomofoConfigImpl::m_instance->readDefaultValues ();

    }

    return *BopomofoConfigImpl::m_instance;

}



void

src/PyZyConfig.h

+0 −2
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ protected: 
/* PinyinConfig */

class PinyinConfig : public Config {

public:

    static void init ();

    static PinyinConfig & instance (void);

    virtual void readDefaultValues (void);
@@ -78,7 +77,6 @@ private: 
/* Bopomof Config */

class BopomofoConfig : public Config {

public:

    static void init ();

    static BopomofoConfig & instance (void);

    virtual void readDefaultValues (void);

src/PyZyTest.cc

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ class PyZyTest : public testing::Test { 
protected:

    virtual void SetUp () {

        InputContext::init ("libpyzy-test");

        PinyinConfig::init ();

        BopomofoConfig::init ();

    }



    virtual void TearDown () {