Formatted all .cc and .h code in rtengine, rtexif and rtgui using astyle

This commit is contained in:
DrSlony
2015-08-11 11:55:03 +02:00
parent effb46c3e1
commit 0e0cfb9b25
452 changed files with 133354 additions and 99460 deletions

View File

@@ -7,7 +7,7 @@
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
*
* RawTherapee is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -31,111 +31,184 @@
class ToolPanel;
class FoldableToolPanel;
class ToolPanelListener {
class ToolPanelListener
{
public:
virtual ~ToolPanelListener() {}
virtual void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr) {}
public:
virtual ~ToolPanelListener() {}
virtual void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr) {}
};
/// @brief This class control the space around the group of tools inside a tab, as well as the space separating each tool. */
class ToolVBox : public Gtk::VBox {
private:
void updateStyle();
class ToolVBox : public Gtk::VBox
{
private:
void updateStyle();
public:
ToolVBox();
void on_style_changed (const Glib::RefPtr<Gtk::Style>& style);
public:
ToolVBox();
void on_style_changed (const Glib::RefPtr<Gtk::Style>& style);
};
/// @brief This class control the space around a tool's block of parameter. */
class ToolParamBlock : public Gtk::VBox {
private:
void updateStyle();
class ToolParamBlock : public Gtk::VBox
{
private:
void updateStyle();
public:
ToolParamBlock();
void on_style_changed (const Glib::RefPtr<Gtk::Style>& style);
public:
ToolParamBlock();
void on_style_changed (const Glib::RefPtr<Gtk::Style>& style);
};
class ToolPanel {
class ToolPanel
{
protected:
Glib::ustring toolName;
ToolPanelListener* listener;
ToolPanelListener* tmp;
bool batchMode; // True if the ToolPanel is used in Batch mode
bool multiImage; // True if more than one image are being edited at the same time (also imply that batchMode=true), false otherwise
bool need100Percent;
protected:
Glib::ustring toolName;
ToolPanelListener* listener;
ToolPanelListener* tmp;
bool batchMode; // True if the ToolPanel is used in Batch mode
bool multiImage; // True if more than one image are being edited at the same time (also imply that batchMode=true), false otherwise
bool need100Percent;
public:
public:
ToolPanel (Glib::ustring toolName="", bool need11=false) : toolName(toolName), listener(NULL), tmp(NULL), batchMode(false), multiImage(false), need100Percent(need11) {}
virtual ~ToolPanel() {}
ToolPanel (Glib::ustring toolName = "", bool need11 = false) : toolName(toolName), listener(NULL), tmp(NULL), batchMode(false), multiImage(false), need100Percent(need11) {}
virtual ~ToolPanel() {}
virtual void setParent (Gtk::Box* parent) {}
virtual Gtk::Box* getParent () { return NULL; }
virtual MyExpander* getExpander () { return NULL; }
virtual void setExpanded (bool expanded) {}
virtual bool getExpanded () { return false; }
void setMultiImage (bool m) { multiImage = m; }
void setListener (ToolPanelListener* tpl) { listener = tpl; }
virtual void setEditProvider (EditDataProvider *provider) {}
virtual void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited=NULL) {}
virtual void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited=NULL) {}
virtual void trimValues (rtengine::procparams::ProcParams* pp) { return; }
virtual void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited=NULL) {}
virtual void autoOpenCurve () {}
virtual void setParent (Gtk::Box* parent) {}
virtual Gtk::Box* getParent ()
{
return NULL;
}
virtual MyExpander* getExpander ()
{
return NULL;
}
virtual void setExpanded (bool expanded) {}
virtual bool getExpanded ()
{
return false;
}
void setMultiImage (bool m)
{
multiImage = m;
}
void setListener (ToolPanelListener* tpl)
{
listener = tpl;
}
virtual void setEditProvider (EditDataProvider *provider) {}
virtual void read (const rtengine::procparams::ProcParams* pp, const ParamsEdited* pedited = NULL) {}
virtual void write (rtengine::procparams::ProcParams* pp, ParamsEdited* pedited = NULL) {}
virtual void trimValues (rtengine::procparams::ProcParams* pp)
{
return;
}
virtual void setDefaults (const rtengine::procparams::ProcParams* defParams, const ParamsEdited* pedited = NULL) {}
virtual void autoOpenCurve () {}
/** @brief Disable the event broadcasting mechanism
*
* @return Return the previous state of the broadcast (true: enabled ; false: disabled)
*/
bool disableListener () { if (tmp==NULL) tmp = listener; bool prevState = listener!=NULL; listener = NULL; return prevState; }
/** @brief Disable the event broadcasting mechanism
*
* @return Return the previous state of the broadcast (true: enabled ; false: disabled)
*/
bool disableListener ()
{
if (tmp == NULL) {
tmp = listener;
}
/** @brief Enable the event broadcasting mechanism
*/
void enableListener () { if (tmp!=NULL) listener = tmp; tmp = NULL; }
bool prevState = listener != NULL;
listener = NULL;
return prevState;
}
virtual void setBatchMode (bool batchMode) { this->batchMode = batchMode; }
/** @brief Enable the event broadcasting mechanism
*/
void enableListener ()
{
if (tmp != NULL) {
listener = tmp;
}
tmp = NULL;
}
virtual void setBatchMode (bool batchMode)
{
this->batchMode = batchMode;
}
};
class FoldableToolPanel : public ToolPanel {
class FoldableToolPanel : public ToolPanel
{
protected:
Gtk::Box* parentContainer;
MyExpander* exp;
bool lastEnabled;
sigc::connection enaConn;
void foldThemAll (GdkEventButton* event);
void enabled_toggled();
protected:
Gtk::Box* parentContainer;
MyExpander* exp;
bool lastEnabled;
sigc::connection enaConn;
void foldThemAll (GdkEventButton* event);
void enabled_toggled();
public:
public:
FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName, Glib::ustring UILabel, bool need11=false, bool useEnabled=false);
FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName, Glib::ustring UILabel, bool need11 = false, bool useEnabled = false);
MyExpander* getExpander() { return exp; }
void setExpanded (bool expanded) { if (exp) exp->set_expanded( expanded ); }
bool getExpanded () { if (exp) return exp->get_expanded(); return false; }
void setParent (Gtk::Box* parent) { parentContainer = parent; }
Gtk::Box* getParent () { return parentContainer; }
MyExpander* getExpander()
{
return exp;
}
void setExpanded (bool expanded)
{
if (exp) {
exp->set_expanded( expanded );
}
}
bool getExpanded ()
{
if (exp) {
return exp->get_expanded();
}
virtual void enabledChanged () {}
return false;
}
void setParent (Gtk::Box* parent)
{
parentContainer = parent;
}
Gtk::Box* getParent ()
{
return parentContainer;
}
bool getUseEnabled () { if (exp) return exp->getUseEnabled(); else return true; }
bool getEnabled(); // related to the enabled/disabled state
void setEnabled(bool isActive); // related to the enabled/disabled state
void setEnabledTooltipMarkup(Glib::ustring tooltipMarkup);
void setEnabledTooltipText(Glib::ustring tooltipText);
bool get_inconsistent(); // related to the enabled/disabled state
void set_inconsistent(bool isInconsistent); // related to the enabled/disabled state
virtual void enabledChanged () {}
// Functions that want to receive an enabled/disabled event from this class
// will have to receive it from MyExpander directly, we do not create
// a relaying event
MyExpander::type_signal_enabled_toggled signal_enabled_toggled() { return exp->signal_enabled_toggled(); }
bool getUseEnabled ()
{
if (exp) {
return exp->getUseEnabled();
} else {
return true;
}
}
bool getEnabled(); // related to the enabled/disabled state
void setEnabled(bool isActive); // related to the enabled/disabled state
void setEnabledTooltipMarkup(Glib::ustring tooltipMarkup);
void setEnabledTooltipText(Glib::ustring tooltipText);
bool get_inconsistent(); // related to the enabled/disabled state
void set_inconsistent(bool isInconsistent); // related to the enabled/disabled state
// Functions that want to receive an enabled/disabled event from this class
// will have to receive it from MyExpander directly, we do not create
// a relaying event
MyExpander::type_signal_enabled_toggled signal_enabled_toggled()
{
return exp->signal_enabled_toggled();
}
};
#endif