Merge from default. Hope I did it right...

This commit is contained in:
Emil Martinec
2012-03-08 20:27:30 -06:00
parent 380728e1f0
commit f47b4b5bb0
262 changed files with 41736 additions and 37104 deletions

View File

@@ -22,19 +22,21 @@
#include <map>
#include <vector>
#include "../rtengine/rtengine.h"
#include "paramsedited.h"
#include <glibmm.h>
class ProfileStore {
std::map<Glib::ustring,rtengine::procparams::ProcParams*> pparams;
std::map<Glib::ustring, rtengine::procparams::PartialProfile*> partProfiles;
void parseDir (const Glib::ustring& pdir);
public:
~ProfileStore();
void parseProfiles ();
rtengine::procparams::ProcParams* getProfile (const Glib::ustring& profname);
std::vector<Glib::ustring> getProfileNames ();
rtengine::procparams::ProcParams* getDefaultProcParams (bool isRaw);
rtengine::procparams::PartialProfile* getProfile (const Glib::ustring& profname);
std::vector<Glib::ustring> getProfileNames ();
rtengine::procparams::ProcParams* getDefaultProcParams (bool isRaw);
};
extern ProfileStore profileStore;