diff --git a/rtgui/cachemanager.cc b/rtgui/cachemanager.cc index 5601a7c0f..61b9f772b 100644 --- a/rtgui/cachemanager.cc +++ b/rtgui/cachemanager.cc @@ -37,7 +37,7 @@ namespace { constexpr int cacheDirMode = 0777; -constexpr const char* cacheDirs[] = { "profiles", "images", "aehistograms", "embprofiles", "data", "mip" }; +constexpr const char* cacheDirs[] = { "profiles", "images", "aehistograms", "embprofiles", "data"}; } @@ -195,7 +195,6 @@ void CacheManager::renameEntry (const std::string& oldfilename, const std::strin error |= g_rename (getCacheFileName ("aehistograms", oldfilename, "", oldmd5).c_str (), getCacheFileName ("aehistograms", newfilename, "", newmd5).c_str ()); 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 ()); - error |= g_rename (getCacheFileName ("mip", oldfilename, ".mip", oldmd5).c_str (), getCacheFileName ("mip", newfilename, ".mip", newmd5).c_str ()); if (error != 0 && options.rtSettings.verbose) { std::cerr << "Failed to rename all files for cache entry '" << oldfilename << "': " << g_strerror (errno) << std::endl; @@ -259,13 +258,6 @@ void CacheManager::clearProfiles () const } -void CacheManager::clearmip () const -{ - MyMutex::MyLock lock (mutex); - - deleteDir ("mip"); - -} void CacheManager::deleteDir (const Glib::ustring& dirName) const { @@ -305,7 +297,6 @@ void CacheManager::deleteFiles (const Glib::ustring& fname, const std::string& m if (purgeProfile) { error |= g_remove (getCacheFileName ("profiles", fname, paramFileExtension, md5).c_str ()); - error |= g_remove (getCacheFileName ("mip", fname, ".mip", md5).c_str ()); } } diff --git a/rtgui/cachemanager.h b/rtgui/cachemanager.h index 5ee1ff63d..574617808 100644 --- a/rtgui/cachemanager.h +++ b/rtgui/cachemanager.h @@ -59,7 +59,6 @@ public: void clearAll () const; void clearImages () const; void clearProfiles () const; - void clearmip () const; void clearFromCache (const Glib::ustring& fname, bool purge) const; static std::string getMD5 (const Glib::ustring& fname); diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc index 6f651a4a8..1a597fd8a 100644 --- a/rtgui/preferences.cc +++ b/rtgui/preferences.cc @@ -1363,11 +1363,9 @@ Gtk::Widget* Preferences::getFileBrowserPanel() Gtk::HBox* hb5 = Gtk::manage(new Gtk::HBox()); clearThumbnails = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARTHUMBS"))); clearProfiles = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARPROFILES"))); - clearmip = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARMIP"))); clearAll = Gtk::manage(new Gtk::Button(M("PREFERENCES_CACHECLEARALL"))); hb5->pack_start(*clearThumbnails, Gtk::PACK_SHRINK, 4); hb5->pack_start(*clearProfiles, Gtk::PACK_SHRINK, 4); - hb5->pack_start(*clearmip, Gtk::PACK_SHRINK, 4); hb5->pack_start(*clearAll, Gtk::PACK_SHRINK, 4); vbc->pack_start(*hb5, Gtk::PACK_SHRINK, 4); @@ -1390,7 +1388,6 @@ Gtk::Widget* Preferences::getFileBrowserPanel() extension->signal_activate().connect(sigc::mem_fun(*this, &Preferences::addExtPressed)); clearThumbnails->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearThumbImagesPressed)); clearProfiles->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearProfilesPressed)); - clearmip->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearmipPressed)); clearAll->signal_clicked().connect(sigc::mem_fun(*this, &Preferences::clearAllPressed)); swFileBrowser->add(*vbFileBrowser); @@ -2417,11 +2414,6 @@ void Preferences::clearProfilesPressed() cacheMgr->clearProfiles(); } -void Preferences::clearmipPressed() -{ - - cacheMgr->clearmip(); -} void Preferences::clearThumbImagesPressed() { diff --git a/rtgui/preferences.h b/rtgui/preferences.h index c38afecb0..949f50376 100644 --- a/rtgui/preferences.h +++ b/rtgui/preferences.h @@ -151,7 +151,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener Gtk::SpinButton* maxRecentFolders; Gtk::Button* clearThumbnails; Gtk::Button* clearProfiles; - Gtk::Button* clearmip; Gtk::Button* clearAll; Gtk::Entry* extension; Gtk::TreeView* extensions; @@ -282,7 +281,6 @@ public: void darkFrameChanged (); void flatFieldChanged (); void clearProfilesPressed (); - void clearmipPressed (); void clearThumbImagesPressed (); void clearAllPressed ();