liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged master into gtk3, fixed three conflicts.

Browse Source
This commit is contained in:
Beep6581
2016-06-09 22:36:59 +02:00
parent 7040b6e5b1
commit c857bba95e
50 changed files with 6109 additions and 6009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rtengine/procparams.h
View File

@@ -528,7 +528,7 @@ public:
double green;
double equal;
WBEntry(Glib::ustring p, enum WBTypes t, Glib::ustring l, int temp, double green, double equal) : ppLabel(p), type(t), GUILabel(l), temperature(temp), green(green), equal(equal) {};
WBEntry(const Glib::ustring &p, enum WBTypes t, const Glib::ustring &l, int temp, double green, double equal) : ppLabel(p), type(t), GUILabel(l), temperature(temp), green(green), equal(equal) {};
};
class WBParams
@@ -1316,14 +1316,14 @@ public:
* @param pedited pointer to a ParamsEdited object (optional) to store which values has to be saved
* @return Error code (=0 if all supplied filenames where created correctly)
*/
int save (Glib::ustring fname, Glib::ustring fname2 = "", bool fnameAbsolute = true, ParamsEdited* pedited = NULL);
int save (const Glib::ustring &fname, const Glib::ustring &fname2 = "", bool fnameAbsolute = true, ParamsEdited* pedited = NULL);
/**
* Loads the parameters from a file.
* @param fname the name of the file
* @params pedited pointer to a ParamsEdited object (optional) to store which values has been loaded
* @return Error code (=0 if no error)
*/
int load (Glib::ustring fname, ParamsEdited* pedited = NULL);
int load (const Glib::ustring &fname, ParamsEdited* pedited = NULL);
/** Creates a new instance of ProcParams.
* @return a pointer to the new ProcParams instance. */
@@ -1345,7 +1345,7 @@ private:
* @param content the text to write
* @return Error code (=0 if no error)
* */
int write (Glib::ustring &fname, Glib::ustring &content) const;
int write (const Glib::ustring &fname, const Glib::ustring &content) const;
};
@@ -1375,7 +1375,7 @@ public:
PartialProfile (const ProcParams* pp, const ParamsEdited* pe = NULL);
void deleteInstance ();
void clearGeneral ();
int load (Glib::ustring fName);
int load (const Glib::ustring &fName);
void set (bool v);
const void applyTo (ProcParams *destParams) const ;
};