pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+

Browse source
This commit is contained in:
Martin Rotter 2013-11-24 17:41:10 +01:00
parent 7d15354de2
commit 4669994da7
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/databasefactory.cpp
View file

@ -29,11 +29,11 @@ DatabaseFactory *DatabaseFactory::getInstance() {
void DatabaseFactory::assemblyDatabaseFilePath() { void DatabaseFactory::assemblyDatabaseFilePath() {
if (Settings::getInstance()->type() == Settings::Portable) { if (Settings::getInstance()->type() == Settings::Portable) {
m_databasePath = qApp->applicationDirPath() + QDir::separator() + APP_DB_PATH; m_databasePath = qApp->applicationDirPath() + QDir::separator() + QString(APP_DB_PATH);
} }
else { else {
m_databasePath = QDir::homePath() + QDir::separator() + APP_LOW_H_NAME + m_databasePath = QDir::homePath() + QDir::separator() + QString(APP_LOW_H_NAME) +
QDir::separator() + APP_DB_PATH; QDir::separator() + QString(APP_DB_PATH);
} }
} }

10
src/core/settings.cpp
View file

@ -55,8 +55,8 @@ QSettings::Status Settings::setupSettings() {
// If settings file exists in executable file working directory // If settings file exists in executable file working directory
// (in subdirectory APP_CFG_PATH), then use it (portable settings). // (in subdirectory APP_CFG_PATH), then use it (portable settings).
// Otherwise use settings file stored in homePath(); // Otherwise use settings file stored in homePath();
QString relative_path = QDir::separator() + APP_CFG_PATH + QString relative_path = QDir::separator() + QString(APP_CFG_PATH) +
QDir::separator() + APP_CFG_FILE; QDir::separator() + QString(APP_CFG_FILE);
QString app_path = qApp->applicationDirPath(); QString app_path = qApp->applicationDirPath();
QString app_path_file = app_path + relative_path; QString app_path_file = app_path + relative_path;
@ -69,7 +69,7 @@ QSettings::Status Settings::setupSettings() {
// TODO: Separate web settings into another unit. // TODO: Separate web settings into another unit.
// Construct icon cache in the same path. // Construct icon cache in the same path.
QString web_path = app_path + QDir::separator() + APP_DB_WEB_PATH; QString web_path = app_path + QDir::separator() + QString(APP_DB_WEB_PATH);
QDir(web_path).mkpath(web_path); QDir(web_path).mkpath(web_path);
QWebSettings::setIconDatabasePath(web_path); QWebSettings::setIconDatabasePath(web_path);
@ -80,14 +80,14 @@ QSettings::Status Settings::setupSettings() {
// Portable settings are NOT available, store them in // Portable settings are NOT available, store them in
// user's home directory. // user's home directory.
QString home_path = QDir::homePath() + QDir::separator() + QString home_path = QDir::homePath() + QDir::separator() +
APP_LOW_H_NAME; QString(APP_LOW_H_NAME);
QString home_path_file = home_path + relative_path; QString home_path_file = home_path + relative_path;
s_instance = new Settings(home_path_file, QSettings::IniFormat, s_instance = new Settings(home_path_file, QSettings::IniFormat,
Settings::NonPortable, qApp); Settings::NonPortable, qApp);
// Construct icon cache in the same path. // Construct icon cache in the same path.
QString web_path = home_path + QDir::separator() + APP_DB_WEB_PATH; QString web_path = home_path + QDir::separator() + QString(APP_DB_WEB_PATH);
QDir(web_path).mkpath(web_path); QDir(web_path).mkpath(web_path);
QWebSettings::setIconDatabasePath(web_path); QWebSettings::setIconDatabasePath(web_path);