Further cleanup of include dependencies

This commit is contained in:
Ingo Weyrich
2019-10-30 22:12:06 +01:00
parent 4dcee23cb3
commit 6935faa258
68 changed files with 100 additions and 158 deletions

View File

@@ -32,8 +32,8 @@
#include "guiutils.h"
#include "options.h"
#include "procparamchangers.h"
#include "thumbnail.h"
#include "procparamchangers.h"
namespace
{
@@ -64,7 +64,7 @@ void CacheManager::init ()
}
}
if (error != 0 && options.rtSettings.verbose) {
if (error != 0 && rtengine::settings->verbose) {
std::cerr << "Failed to create all cache directories: " << g_strerror(errno) << std::endl;
}
}
@@ -191,7 +191,7 @@ void CacheManager::renameEntry (const std::string& oldfilename, const std::strin
error |= g_rename (getCacheFileName ("embprofiles", oldfilename, ".icc", oldmd5).c_str (), getCacheFileName ("embprofiles", newfilename, ".icc", newmd5).c_str ());
error |= g_rename (getCacheFileName ("data", oldfilename, ".txt", oldmd5).c_str (), getCacheFileName ("data", newfilename, ".txt", newmd5).c_str ());
if (error != 0 && options.rtSettings.verbose) {
if (error != 0 && rtengine::settings->verbose) {
std::cerr << "Failed to rename all files for cache entry '" << oldfilename << "': " << g_strerror(errno) << std::endl;
}
@@ -263,7 +263,7 @@ void CacheManager::deleteDir (const Glib::ustring& dirName) const
error |= g_remove (Glib::build_filename (baseDir, dirName, *entry).c_str ());
}
if (error != 0 && options.rtSettings.verbose) {
if (error != 0 && rtengine::settings->verbose) {
std::cerr << "Failed to delete all entries in cache directory '" << dirName << "': " << g_strerror(errno) << std::endl;
}
@@ -288,7 +288,7 @@ void CacheManager::deleteFiles (const Glib::ustring& fname, const std::string& m
error |= g_remove (getCacheFileName ("profiles", fname, paramFileExtension, md5).c_str ());
}
if (error != 0 && options.rtSettings.verbose) {
if (error != 0 && rtengine::settings->verbose) {
std::cerr << "Failed to delete all files for cache entry '" << fname << "': " << g_strerror(errno) << std::endl;
}
}