1 files changed, 7 insertions, 28 deletions
diff --git a/src/backend/managers/clanguagemgr.cpp b/src/backend/managers/clanguagemgr.cpp
index a8d4e1f..49cc1a1 100644
--- a/src/backend/managers/clanguagemgr.cpp
+++ b/src/backend/managers/clanguagemgr.cpp
@@ -2,7 +2,7 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
@@ -13,26 +13,6 @@
 #include "backend/managers/cswordbackend.h"
 
 
-CLanguageMgr::Language::Language() {}
-
-CLanguageMgr::Language::Language(const Language& l) {
-    m_abbrev = l.m_abbrev;
-    m_englishName = l.m_englishName;
-    m_translatedName = l.m_translatedName;
-    m_altAbbrevs = l.m_altAbbrevs;
-}
-
-CLanguageMgr::Language::Language( const QString& abbrev, const QString& name, const QString& translatedName, const QStringList& altAbbrevs ) {
-    m_abbrev = abbrev;
-    m_englishName = name;
-    m_translatedName = translatedName;
-    m_altAbbrevs =  altAbbrevs;
-}
-
-CLanguageMgr::Language::~Language() {
-}
-
-
 /****************************************************/
 /******************** CLanguageMgr ******************/
 /****************************************************/
@@ -52,7 +32,10 @@ CLanguageMgr *CLanguageMgr::instance() {
     return m_instance;
 }
 
-CLanguageMgr::CLanguageMgr() : m_langMap() {
+CLanguageMgr::CLanguageMgr()
+    : m_defaultLanguage("", "", QString::null)
+    , m_langMap()
+{
     m_availableModulesCache.moduleCount = 0;
     init();
 }
@@ -75,8 +58,8 @@ const CLanguageMgr::LangMap& CLanguageMgr::availableLanguages() {
         QStringList abbrevs;
 
         foreach (const CSwordModuleInfo* mod,  mods) {
-            if (!abbrevs.contains(mod->module()->Lang())) {
-                abbrevs.append(mod->module()->Lang());
+            if (!abbrevs.contains(mod->module()->getLanguage())) {
+                abbrevs.append(mod->module()->getLanguage());
             }
         }
 
@@ -122,10 +105,6 @@ const CLanguageMgr::Language* CLanguageMgr::languageForTranslatedName( const QSt
 
 void CLanguageMgr::init() {
 
-    // The main() sets string literal codec to utf8:
-    // QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
-    // The language names include escape sequences \uxxxx
-
     //if we've already inserted all items we do not proceed
     if (m_langMap.count() > 0) return;