uncrustify + normalize (include Global/Macros.h always at the same pl…

…ace)

Engine/AbortableRenderInfo.cpp

@@ -91,7 +91,6 @@ AbortableRenderInfo::AbortableRenderInfo(bool canAbort,
 
 AbortableRenderInfo::~AbortableRenderInfo()
 {
-
 }
 
 U64

Gui/ColoredFrame.cpp

@@ -27,30 +27,27 @@
 NATRON_NAMESPACE_ENTER;
 
 ColoredFrame::ColoredFrame(QWidget* parent)
-: QFrame(parent)
-, _frameColor(Qt::black)
+    : QFrame(parent)
+    , _frameColor(Qt::black)
 {
 }
 
 ColoredFrame::~ColoredFrame()
 {
-
 }
 
-
 const QColor&
 ColoredFrame::getFrameColor()
 {
     return _frameColor;
 }
 
-
 void
 ColoredFrame::setFrameColor(const QColor& color)
 {
     _frameColor = color;
 
-    setStyleSheet(QString::fromUtf8("ColoredFrame { border:1px solid rgb(%1, %2, %3); border-radius: 2px; }").arg(color.red()).arg(color.green()).arg(color.blue()));
+    setStyleSheet( QString::fromUtf8("ColoredFrame { border:1px solid rgb(%1, %2, %3); border-radius: 2px; }").arg( color.red() ).arg( color.green() ).arg( color.blue() ) );
 }
 
 NATRON_NAMESPACE_EXIT;

Gui/ColoredFrame.h

@@ -25,19 +25,21 @@
 #include <Python.h>
 // ***** END PYTHON BLOCK *****
 
+#include "Global/Macros.h"
+
 #include <QFrame>
 #include <QColor>
 
 #include "Gui/GuiFwd.h"
-#include "Global/Macros.h"
 
 NATRON_NAMESPACE_ENTER;
 
-class ColoredFrame : public QFrame
+class ColoredFrame
+    : public QFrame
 {
-    GCC_DIAG_SUGGEST_OVERRIDE_OFF
+GCC_DIAG_SUGGEST_OVERRIDE_OFF
     Q_OBJECT
-    GCC_DIAG_SUGGEST_OVERRIDE_ON
+GCC_DIAG_SUGGEST_OVERRIDE_ON
 
 public:
 
@@ -50,9 +52,8 @@ class ColoredFrame : public QFrame
 public Q_SLOTS:
 
     void setFrameColor(const QColor& color);
-
-private:
 
+private:
 
     QColor _frameColor;
 };

Gui/NodeGui.cpp

@@ -657,6 +657,7 @@ NodeGui::onSettingsPanelColorChanged(const QColor & color)
         _currentColor = color;
     }
     Q_EMIT colorChanged(color);
+
     refreshCurrentBrush();
 }
 

Gui/NodeViewerContext.cpp

@@ -167,17 +167,17 @@ NodeViewerContext::createGui()
         _imp->mainContainerLayout = new QHBoxLayout(_imp->mainContainer);
         _imp->mainContainerLayout->setContentsMargins(0, 0, 0, 0);
         _imp->mainContainerLayout->setSpacing(0);
-        _imp->nodeLabel = new Label(QString::fromUtf8(node->getNode()->getLabel().c_str()), _imp->mainContainer);
-        QObject::connect(node->getNode().get(), SIGNAL(labelChanged(QString)), _imp->nodeLabel, SLOT(setText(QString)));
+        _imp->nodeLabel = new Label(QString::fromUtf8( node->getNode()->getLabel().c_str() ), _imp->mainContainer);
+        QObject::connect( node->getNode().get(), SIGNAL(labelChanged(QString)), _imp->nodeLabel, SLOT(setText(QString)) );
         _imp->widgetsContainer = new QWidget(_imp->mainContainer);
         _imp->widgetsContainerLayout = new QVBoxLayout(_imp->widgetsContainer);
         _imp->widgetsContainerLayout->setContentsMargins(0, 0, 0, 0);
         _imp->widgetsContainerLayout->setSpacing(0);
         _imp->mainContainerLayout->addWidget(_imp->widgetsContainer);
         _imp->mainContainerLayout->addWidget(_imp->nodeLabel);
         _imp->mainContainerLayout->addStretch();
-        onNodeColorChanged(node->getCurrentColor());
-        QObject::connect(node.get(), SIGNAL(colorChanged(QColor)), this, SLOT(onNodeColorChanged(QColor)));
+        onNodeColorChanged( node->getCurrentColor() );
+        QObject::connect( node.get(), SIGNAL(colorChanged(QColor)), this, SLOT(onNodeColorChanged(QColor)) );
         setContainerWidget(_imp->mainContainer);
         _imp->createKnobs(knobsOrdered);
     }
@@ -247,7 +247,8 @@ addSpacer(QBoxLayout* layout)
 void
 NodeViewerContext::onNodeColorChanged(const QColor& color)
 {
-    QString labelStyle = QString::fromUtf8("Label { color: rgb(%1, %2, %3); }").arg(color.red()).arg(color.green()).arg(color.blue());
+    QString labelStyle = QString::fromUtf8("Label { color: rgb(%1, %2, %3); }").arg( color.red() ).arg( color.green() ).arg( color.blue() );
+
     _imp->nodeLabel->setStyleSheet(labelStyle);
     _imp->mainContainer->setFrameColor(color);
 }