summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHiroshi Sumita <hsumita@chromium.org>2011-11-15 11:34:31 +0900
committerHiroshi Sumita <hsumita@chromium.org>2011-11-15 11:34:31 +0900
commit6e6dd86facb6e56a01e78238243f59163f1f4584 (patch)
treede7a6a10b58255433f81342174c04d455f8f9630
parente97b37e6e8213500e4e33252e2c6b2f02c9c8a61 (diff)
downloadpyzy-6e6dd86facb6e56a01e78238243f59163f1f4584.tar.gz
Remove PyZy::Config::init().
BUG=None TEST=Run a test Review URL: http://codereview.appspot.com/5370063
-rw-r--r--src/PyZyConfig.cc14
-rw-r--r--src/PyZyConfig.h2
-rw-r--r--src/PyZyTest.cc2
3 files changed, 2 insertions, 16 deletions
diff --git a/src/PyZyConfig.cc b/src/PyZyConfig.cc
index fa95224..5961dda 100644
--- a/src/PyZyConfig.cc
+++ b/src/PyZyConfig.cc
@@ -163,16 +163,11 @@ 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
@@ -198,16 +193,11 @@ 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
diff --git a/src/PyZyConfig.h b/src/PyZyConfig.h
index c6ba4f2..754cb5b 100644
--- a/src/PyZyConfig.h
+++ b/src/PyZyConfig.h
@@ -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);
diff --git a/src/PyZyTest.cc b/src/PyZyTest.cc
index d226185..057207f 100644
--- a/src/PyZyTest.cc
+++ b/src/PyZyTest.cc
@@ -46,8 +46,6 @@ class PyZyTest : public testing::Test {
protected:
virtual void SetUp () {
InputContext::init ("libpyzy-test");
- PinyinConfig::init ();
- BopomofoConfig::init ();
}
virtual void TearDown () {