diff --git a/src/dict/aard.cc b/src/dict/aard.cc index b4751e72..f988e659 100644 --- a/src/dict/aard.cc +++ b/src/dict/aard.cc @@ -216,11 +216,6 @@ public: ~AardDictionary(); - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/bgl.cc b/src/dict/bgl.cc index 2ebd8747..f11772aa 100644 --- a/src/dict/bgl.cc +++ b/src/dict/bgl.cc @@ -173,11 +173,6 @@ public: BglDictionary( string const & id, string const & indexFile, string const & dictionaryFile ); - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/dictdfiles.cc b/src/dict/dictdfiles.cc index 6a3cd4eb..4e4690dd 100644 --- a/src/dict/dictdfiles.cc +++ b/src/dict/dictdfiles.cc @@ -91,11 +91,6 @@ public: ~DictdDictionary(); - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/dictionary.hh b/src/dict/dictionary.hh index 0d194838..4e099d6e 100644 --- a/src/dict/dictionary.hh +++ b/src/dict/dictionary.hh @@ -30,13 +30,6 @@ using std::string; using gd::wstring; using std::map; -enum Property { - Author, - Copyright, - Description, - Email -}; - DEF_EX( Ex, "Dictionary error", std::exception ) DEF_EX( exIndexOutOfRange, "The supplied index is out of range", Ex ) DEF_EX( exSliceOutOfRange, "The requested data slice is out of range", Ex ) @@ -380,10 +373,6 @@ public: metadata_enable_fts = _enable_FTS; } - /// Returns all the available properties, like the author's name, copyright, - /// description etc. All strings are in utf8. - virtual map< Property, string > getProperties() noexcept = 0; - /// Returns the features the dictionary possess. See the Feature enum for /// their list. virtual Features getFeatures() const noexcept diff --git a/src/dict/dictserver.cc b/src/dict/dictserver.cc index 3fc5b71f..db798195 100644 --- a/src/dict/dictserver.cc +++ b/src/dict/dictserver.cc @@ -303,10 +303,6 @@ public: disconnectFromServer( socket ); } - map< Property, string > getProperties() noexcept override - { - return {}; - } unsigned long getArticleCount() noexcept override { diff --git a/src/dict/dsl.cc b/src/dict/dsl.cc index 0325582f..71a597f9 100644 --- a/src/dict/dsl.cc +++ b/src/dict/dsl.cc @@ -156,11 +156,6 @@ public: ~DslDictionary(); - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/epwing.cc b/src/dict/epwing.cc index 5fac6b6b..69b41df0 100644 --- a/src/dict/epwing.cc +++ b/src/dict/epwing.cc @@ -87,12 +87,6 @@ public: ~EpwingDictionary(); - - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/forvo.cc b/src/dict/forvo.cc index 04d14da0..af5ee64d 100644 --- a/src/dict/forvo.cc +++ b/src/dict/forvo.cc @@ -38,11 +38,6 @@ public: } - map< Property, string > getProperties() noexcept override - { - return map< Property, string >(); - } - unsigned long getArticleCount() noexcept override { return 0; diff --git a/src/dict/gls.cc b/src/dict/gls.cc index baab0d17..88516566 100644 --- a/src/dict/gls.cc +++ b/src/dict/gls.cc @@ -349,11 +349,6 @@ public: ~GlsDictionary(); - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/hunspell.cc b/src/dict/hunspell.cc index afe86df6..1e67f6dc 100644 --- a/src/dict/hunspell.cc +++ b/src/dict/hunspell.cc @@ -55,12 +55,6 @@ public: dictionaryName = name_; } - - map< Property, string > getProperties() noexcept override - { - return map< Property, string >(); - } - unsigned long getArticleCount() noexcept override { return 0; diff --git a/src/dict/lingualibre.cc b/src/dict/lingualibre.cc index 88102469..e63d27af 100644 --- a/src/dict/lingualibre.cc +++ b/src/dict/lingualibre.cc @@ -165,12 +165,6 @@ WHERE { } } - - map< Property, string > getProperties() noexcept override - { - return {}; - } - unsigned long getArticleCount() noexcept override { return 0; diff --git a/src/dict/lsa.cc b/src/dict/lsa.cc index 20a874c8..d6614e33 100644 --- a/src/dict/lsa.cc +++ b/src/dict/lsa.cc @@ -159,11 +159,6 @@ public: string getName() noexcept override; - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.soundsCount; diff --git a/src/dict/mdx.cc b/src/dict/mdx.cc index 856b2eaf..99aba846 100644 --- a/src/dict/mdx.cc +++ b/src/dict/mdx.cc @@ -212,12 +212,6 @@ public: void deferredInit() override; - - map< Dictionary::Property, string > getProperties() noexcept override - { - return {}; - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/mediawiki.cc b/src/dict/mediawiki.cc index 8d7badef..b7a4a65e 100644 --- a/src/dict/mediawiki.cc +++ b/src/dict/mediawiki.cc @@ -56,11 +56,6 @@ public: return name; } - map< Property, string > getProperties() noexcept override - { - return map< Property, string >(); - } - unsigned long getArticleCount() noexcept override { return 0; diff --git a/src/dict/programs.cc b/src/dict/programs.cc index 1b1cd079..13cd69cf 100644 --- a/src/dict/programs.cc +++ b/src/dict/programs.cc @@ -36,11 +36,6 @@ public: return prg.name.toUtf8().data(); } - map< Property, string > getProperties() noexcept override - { - return map< Property, string >(); - } - unsigned long getArticleCount() noexcept override { return 0; diff --git a/src/dict/sdict.cc b/src/dict/sdict.cc index dff686f1..fd4877a0 100644 --- a/src/dict/sdict.cc +++ b/src/dict/sdict.cc @@ -113,11 +113,6 @@ public: ~SdictDictionary(); - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/slob.cc b/src/dict/slob.cc index 373465b4..e6b82ade 100644 --- a/src/dict/slob.cc +++ b/src/dict/slob.cc @@ -610,12 +610,6 @@ public: ~SlobDictionary(); - - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/sounddir.cc b/src/dict/sounddir.cc index c0e2b299..7806bd2b 100644 --- a/src/dict/sounddir.cc +++ b/src/dict/sounddir.cc @@ -75,12 +75,6 @@ public: vector< string > const & dictionaryFiles, QString const & iconFilename_ ); - - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.soundsCount; diff --git a/src/dict/stardict.cc b/src/dict/stardict.cc index b03626e8..cb42f2a7 100644 --- a/src/dict/stardict.cc +++ b/src/dict/stardict.cc @@ -134,11 +134,6 @@ public: ~StardictDictionary(); - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.wordCount; diff --git a/src/dict/transliteration/transliteration.cc b/src/dict/transliteration/transliteration.cc index 400b1c03..b39d27bb 100644 --- a/src/dict/transliteration/transliteration.cc +++ b/src/dict/transliteration/transliteration.cc @@ -26,11 +26,6 @@ string BaseTransliterationDictionary::getName() noexcept return name; } -map< Dictionary::Property, string > BaseTransliterationDictionary::getProperties() noexcept -{ - return map< Dictionary::Property, string >(); -} - unsigned long BaseTransliterationDictionary::getArticleCount() noexcept { return 0; diff --git a/src/dict/transliteration/transliteration.hh b/src/dict/transliteration/transliteration.hh index a5623038..7003cd73 100644 --- a/src/dict/transliteration/transliteration.hh +++ b/src/dict/transliteration/transliteration.hh @@ -28,8 +28,6 @@ public: virtual string getName() noexcept; - virtual map< Dictionary::Property, string > getProperties() noexcept; - virtual unsigned long getArticleCount() noexcept; virtual unsigned long getWordCount() noexcept; diff --git a/src/dict/voiceengines.cc b/src/dict/voiceengines.cc index 8e988f09..26c307d3 100644 --- a/src/dict/voiceengines.cc +++ b/src/dict/voiceengines.cc @@ -47,10 +47,6 @@ public: return voiceEngine.name.toUtf8().data(); } - map< Property, string > getProperties() noexcept override - { - return map< Property, string >(); - } unsigned long getArticleCount() noexcept override { diff --git a/src/dict/website.cc b/src/dict/website.cc index 4db4c58f..4f229a4d 100644 --- a/src/dict/website.cc +++ b/src/dict/website.cc @@ -52,12 +52,6 @@ public: dictionaryDescription = urlTemplate_; } - - map< Property, string > getProperties() noexcept override - { - return map< Property, string >(); - } - unsigned long getArticleCount() noexcept override { return 0; diff --git a/src/dict/xdxf.cc b/src/dict/xdxf.cc index 298016be..2fae7ff2 100644 --- a/src/dict/xdxf.cc +++ b/src/dict/xdxf.cc @@ -140,12 +140,6 @@ public: ~XdxfDictionary(); - - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/zim.cc b/src/dict/zim.cc index 1250a252..4efe6316 100644 --- a/src/dict/zim.cc +++ b/src/dict/zim.cc @@ -161,11 +161,6 @@ public: ~ZimDictionary() = default; - map< Dictionary::Property, string > getProperties() noexcept override - { - return {}; - } - unsigned long getArticleCount() noexcept override { return idxHeader.articleCount; diff --git a/src/dict/zipsounds.cc b/src/dict/zipsounds.cc index eb1ebcce..b6e73b28 100644 --- a/src/dict/zipsounds.cc +++ b/src/dict/zipsounds.cc @@ -107,10 +107,6 @@ public: string getName() noexcept override; - map< Dictionary::Property, string > getProperties() noexcept override - { - return map< Dictionary::Property, string >(); - } unsigned long getArticleCount() noexcept override {