tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

get rid of unused guesscharset

Browse Source
This commit is contained in:
"Jean-Francois Dockes ext:(%22) 2011-08-21 13:27:37 +02:00
parent 44e6c8ea09
commit bc6587f07a
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/rclconfig.cpp
View File

@ -248,8 +248,6 @@ void RclConfig::setKeyDir(const string &dir)
if (!m_conf->get("defaultcharset", defcharset, m_keydir)) if (!m_conf->get("defaultcharset", defcharset, m_keydir))
defcharset.erase(); defcharset.erase();
getConfParam("guesscharset", &guesscharset);
} }
bool RclConfig::getConfParam(const string &name, int *ivp) bool RclConfig::getConfParam(const string &name, int *ivp)
@ -1065,7 +1063,6 @@ void RclConfig::initFrom(const RclConfig& r)
m_stopsuffixes = new SuffixStore(*((SuffixStore*)r.m_stopsuffixes)); m_stopsuffixes = new SuffixStore(*((SuffixStore*)r.m_stopsuffixes));
m_maxsufflen = r.m_maxsufflen; m_maxsufflen = r.m_maxsufflen;
defcharset = r.defcharset; defcharset = r.defcharset;
guesscharset = r.guesscharset;
m_stpsuffstate.init(this, mimemap, r.m_stpsuffstate.paramname); m_stpsuffstate.init(this, mimemap, r.m_stpsuffstate.paramname);
m_skpnstate.init(this, m_conf, r.m_skpnstate.paramname); m_skpnstate.init(this, m_conf, r.m_skpnstate.paramname);

5
src/common/rclconfig.h
View File

@ -126,8 +126,6 @@ class RclConfig {
/** Get default charset for current keydir (was set during setKeydir) /** Get default charset for current keydir (was set during setKeydir)
* filenames are handled differently */ * filenames are handled differently */
const string &getDefCharset(bool filename = false); const string &getDefCharset(bool filename = false);
/** Get guessCharset for current keydir (was set during setKeydir) */
bool getGuessCharset() {return guesscharset;}
/** Get list of top directories. This is needed from a number of places /** Get list of top directories. This is needed from a number of places
* and needs some cleaning-up code. An empty list is always an error, no * and needs some cleaning-up code. An empty list is always an error, no
@ -273,8 +271,7 @@ class RclConfig {
list<string> m_skpnlist; list<string> m_skpnlist;
// Parameters auto-fetched on setkeydir // Parameters auto-fetched on setkeydir
string defcharset; // These are stored locally to avoid string defcharset;
bool guesscharset; // They are fetched initially or on setKeydir()
// Limiting set of mime types to be processed. Normally empty. // Limiting set of mime types to be processed. Normally empty.
ParamStale m_rmtstate; ParamStale m_rmtstate;
set<string> m_restrictMTypes; set<string> m_restrictMTypes;