Switch to unified view

a/src/common/rclconfig.h b/src/common/rclconfig.h
...
...
14
 *   Free Software Foundation, Inc.,
14
 *   Free Software Foundation, Inc.,
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
#ifndef _RCLCONFIG_H_INCLUDED_
17
#ifndef _RCLCONFIG_H_INCLUDED_
18
#define _RCLCONFIG_H_INCLUDED_
18
#define _RCLCONFIG_H_INCLUDED_
19
/* @(#$Id: rclconfig.h,v 1.24 2006-10-24 09:09:36 dockes Exp $  (C) 2004 J.F.Dockes */
19
/* @(#$Id: rclconfig.h,v 1.25 2006-11-20 15:28:04 dockes Exp $  (C) 2004 J.F.Dockes */
20
20
21
#include <list>
21
#include <list>
22
#include <string>
22
#include <string>
23
#ifndef NO_NAMESPACES
23
#ifndef NO_NAMESPACES
24
using std::list;
24
using std::list;
...
...
39
39
40
    /** Set current directory reference, and fetch automatic parameters. */
40
    /** Set current directory reference, and fetch automatic parameters. */
41
    void setKeyDir(const string &dir) 
41
    void setKeyDir(const string &dir) 
42
    {
42
    {
43
    m_keydir = dir;
43
    m_keydir = dir;
44
    m_conf->get("defaultcharset", defcharset, m_keydir);
44
    if (!m_conf->get("defaultcharset", defcharset, m_keydir))
45
      defcharset.erase();
45
    string str;
46
    string str;
46
    m_conf->get("guesscharset", str, m_keydir);
47
    m_conf->get("guesscharset", str, m_keydir);
47
    guesscharset = stringToBool(str);
48
    guesscharset = stringToBool(str);
48
    }
49
    }
49
    string getKeyDir() const {return m_keydir;}
50
    string getKeyDir() const {return m_keydir;}