vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

Rename ini file code to "Config::loadIniFile"

1.3
execjosh 2011-08-28 21:12:40 +09:00
parent ad53b9bb3e
commit 9c94a8ef24
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.cpp
View File

@ -47,13 +47,13 @@ void Config::load()
//loadConfigFile(getSystemConfigFilePath()); //loadConfigFile(getSystemConfigFilePath());
// Load global config // Load global config
loadConfigFile(getGlobalConfigFilePath()); loadIniFile(getGlobalConfigFilePath());
// Load local config (allows for overrides) // Load local config (allows for overrides)
loadConfigFile(getLocalConfigFilePath()); loadIniFile(getLocalConfigFilePath());
} }
void Config::loadConfigFile(const QString &filePath) void Config::loadIniFile(const QString &filePath)
{ {
QSettings settings(filePath, QSettings::IniFormat); QSettings settings(filePath, QSettings::IniFormat);
QStringList keys = settings.allKeys(); QStringList keys = settings.allKeys();

2
src/config.h
View File

@ -40,7 +40,7 @@ public:
Config(); Config();
void load(); void load();
void loadConfigFile(const QString &filePath); void loadIniFile(const QString &filePath);
bool autoLoadImages() const; bool autoLoadImages() const;
void setAutoLoadImages(const bool value); void setAutoLoadImages(const bool value);