reformatted to Mozilla code style

.clang-format

@@ -1,89 +1,2 @@
 Language: Cpp
-# BasedOnStyle: Google
+BasedOnStyle: Mozilla
-AccessModifierOffset: -1
-AlignAfterOpenBracket: Align
-AlignConsecutiveAssignments: false
-AlignConsecutiveDeclarations: false
-AlignEscapedNewlinesLeft: true
-AlignOperands: true
-AlignTrailingComments: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortBlocksOnASingleLine: false
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: true
-AllowShortLoopsOnASingleLine: true
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: true
-AlwaysBreakTemplateDeclarations: true
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterClass: true
-  AfterControlStatement: true
-  AfterEnum: true
-  AfterFunction: true
-  AfterNamespace: true
-  AfterObjCDeclaration: true
-  AfterStruct: true
-  AfterUnion: true
-  BeforeCatch: true
-  BeforeElse: true
-  IndentBraces: false
-BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Allman
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializers: BeforeColon
-BreakConstructorInitializersBeforeComma: false
-ColumnLimit: 80
-CommentPragmas: '^ IWYU pragma:'
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-ConstructorInitializerIndentWidth: 0
-ContinuationIndentWidth: 2
-Cpp11BracedListStyle: true
-DerivePointerAlignment: true
-DisableFormat: false
-ExperimentalAutoDetectBinPacking: false
-ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
-  - Regex: '^<.*\.h>'
-    Priority: 1
-  - Regex: '^<.*'
-    Priority: 2
-  - Regex: '.*'
-    Priority: 3
-IndentCaseLabels: true
-IndentWidth: 2
-IndentWrappedFunctionNames: false
-KeepEmptyLinesAtTheStartOfBlocks: false
-MacroBlockBegin: ''
-MacroBlockEnd: ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBlockIndentWidth: 2
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: false
-PenaltyBreakBeforeFirstCallParameter: 1
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakString: 1000
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 200
-PointerAlignment: Left
-ReflowComments: true
-SortIncludes: true
-SpaceAfterCStyleCast: false
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 2
-SpacesInAngles: false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-Standard: Auto
-TabWidth: 2
-UseTab: Never
-

external/Qt-Color-Widgets/src/color_utils.cpp

@@ -24,7 +24,8 @@
 namespace color_widgets {
 namespace detail {
 
-QColor color_from_lch(qreal hue, qreal chroma, qreal luma, qreal alpha )
+QColor
+color_from_lch(qreal hue, qreal chroma, qreal luma, qreal alpha)
 {
   qreal h1 = hue * 6;
   qreal x = chroma * (1 - qAbs(std::fmod(h1, 2) - 1));
@@ -44,14 +45,14 @@ QColor color_from_lch(qreal hue, qreal chroma, qreal luma, qreal alpha )
 
   qreal m = luma - color_lumaF(col);
 
-    return QColor::fromRgbF(
+  return QColor::fromRgbF(qBound(0.0, col.redF() + m, 1.0),
-        qBound(0.0,col.redF()+m,1.0),
                           qBound(0.0, col.greenF() + m, 1.0),
                           qBound(0.0, col.blueF() + m, 1.0),
                           alpha);
 }
 
-QColor color_from_hsl(qreal hue, qreal sat, qreal lig, qreal alpha )
+QColor
+color_from_hsl(qreal hue, qreal sat, qreal lig, qreal alpha)
 {
   qreal chroma = (1 - qAbs(2 * lig - 1)) * sat;
   qreal h1 = hue * 6;
@@ -72,8 +73,7 @@ QColor color_from_hsl(qreal hue, qreal sat, qreal lig, qreal alpha )
 
   qreal m = lig - chroma / 2;
 
-    return QColor::fromRgbF(
+  return QColor::fromRgbF(qBound(0.0, col.redF() + m, 1.0),
-        qBound(0.0,col.redF()+m,1.0),
                           qBound(0.0, col.greenF() + m, 1.0),
                           qBound(0.0, col.blueF() + m, 1.0),
                           alpha);

external/Qt-Color-Widgets/src/color_wheel.cpp

@@ -21,14 +21,14 @@
  */
 #include "color_wheel.hpp"
 
-#include <cmath>
-#include <QMouseEvent>
-#include <QPainterPath>
-#include <QPainter>
-#include <QLineF>
-#include <QDragEnterEvent>
-#include <QMimeData>
 #include "color_utils.hpp"
+#include <QDragEnterEvent>
+#include <QLineF>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QPainterPath>
+#include <cmath>
 
 namespace color_widgets {
 
@@ -39,7 +39,9 @@ enum MouseStatus
   DragSquare
 };
 
-static const ColorWheel::DisplayFlags hard_default_flags = ColorWheel::SHAPE_TRIANGLE|ColorWheel::ANGLE_ROTATING|ColorWheel::COLOR_HSV;
+static const ColorWheel::DisplayFlags hard_default_flags =
+  ColorWheel::SHAPE_TRIANGLE | ColorWheel::ANGLE_ROTATING |
+  ColorWheel::COLOR_HSV;
 static ColorWheel::DisplayFlags default_flags = hard_default_flags;
 static const double selector_radius = 6;
 
@@ -61,10 +63,15 @@ public:
   int max_size = 128;
 
   explicit Private(ColorWheel* widget)
-        : w(widget), hue(0), sat(0), val(0),
+    : w(widget)
-        wheel_width(20), mouse_status(Nothing),
+    , hue(0)
-        display_flags(FLAGS_DEFAULT),
+    , sat(0)
-        color_from(&QColor::fromHsvF), rainbow_from_hue(&detail::rainbow_hsv)
+    , val(0)
+    , wheel_width(20)
+    , mouse_status(Nothing)
+    , display_flags(FLAGS_DEFAULT)
+    , color_from(&QColor::fromHsvF)
+    , rainbow_from_hue(&detail::rainbow_hsv)
   {
     QColor bgColor = widget->palette().window().color();
     bgBrightness = color_widgets::detail::color_lumaF(bgColor);
@@ -77,33 +84,22 @@ public:
   }
 
   /// Calculate inner wheel radius from idget center
-    qreal inner_radius() const
+  qreal inner_radius() const { return outer_radius() - wheel_width; }
-    {
-        return outer_radius()-wheel_width;
-    }
 
   /// Calculate the edge length of the inner square
-    qreal square_size() const
+  qreal square_size() const { return inner_radius() * qSqrt(2); }
-    {
-        return inner_radius()*qSqrt(2);
-    }
 
   /// Calculate the height of the inner triangle
-    qreal triangle_height() const
+  qreal triangle_height() const { return inner_radius() * 3 / 2; }
-    {
-        return inner_radius()*3/2;
-    }
 
   /// Calculate the side of the inner triangle
-    qreal triangle_side() const
+  qreal triangle_side() const { return inner_radius() * qSqrt(3); }
-    {
-        return inner_radius()*qSqrt(3);
-    }
 
   /// return line from center to given point
   QLineF line_to_point(const QPoint& p) const
   {
-        return QLineF (w->geometry().width()/2, w->geometry().height()/2, p.x(), p.y());
+    return QLineF(
+      w->geometry().width() / 2, w->geometry().height() / 2, p.x(), p.y());
   }
 
   void render_square()
@@ -112,19 +108,18 @@ public:
     QSize size(width, width);
     inner_selector = QImage(size, QImage::Format_RGB32);
 
-        for ( int y = 0; y < width; ++y )
+    for (int y = 0; y < width; ++y) {
-        {
+      for (int x = 0; x < width; ++x) {
-            for ( int x = 0; x < width; ++x )
+        inner_selector.setPixel(
-            {
+          x, y, color_from(hue, double(x) / width, double(y) / width, 1).rgb());
-                inner_selector.setPixel( x, y,
-                        color_from(hue,double(x)/width,double(y)/width,1).rgb());
       }
     }
   }
 
   /**
    * \brief renders the selector as a triangle
-     * \note It's the same as a square with the edge with value=0 collapsed to a single point
+   * \note It's the same as a square with the edge with value=0 collapsed to a
+   * single point
    */
   void render_triangle()
   {
@@ -135,12 +130,10 @@ public:
     qreal ycenter = size.height() / 2;
     inner_selector = QImage(size.toSize(), QImage::Format_RGB32);
 
-        for (int x = 0; x < inner_selector.width(); x++ )
+    for (int x = 0; x < inner_selector.width(); x++) {
-        {
       qreal pval = x / size.height();
       qreal slice_h = size.height() * pval;
-            for (int y = 0; y < inner_selector.height(); y++ )
+      for (int y = 0; y < inner_selector.height(); y++) {
-            {
         qreal ymin = ycenter - slice_h / 2;
         qreal psat = qBound(0.0, (y - ymin) / slice_h, 1.0);
 
@@ -176,18 +169,14 @@ public:
     return QSizeF(square_size(), square_size());
   }
 
-
   /// Rotation of the selector image
   qreal selector_image_angle()
   {
-        if ( display_flags & SHAPE_TRIANGLE )
+    if (display_flags & SHAPE_TRIANGLE) {
-        {
       if (display_flags & ANGLE_ROTATING)
         return -hue * 360 - 60;
       return -150;
-        }
+    } else {
-        else
-        {
       if (display_flags & ANGLE_ROTATING)
         return -hue * 360 - 45;
       else
@@ -204,13 +193,10 @@ public:
     painter.setRenderHint(QPainter::Antialiasing);
     painter.setCompositionMode(QPainter::CompositionMode_Source);
 
-
     const int hue_stops = 24;
     QConicalGradient gradient_hue(0, 0, 0);
-        if ( gradient_hue.stops().size() < hue_stops )
+    if (gradient_hue.stops().size() < hue_stops) {
-        {
+      for (double a = 0; a < 1.0; a += 1.0 / (hue_stops - 1)) {
-            for ( double a = 0; a < 1.0; a+=1.0/(hue_stops-1) )
-            {
         gradient_hue.setColorAt(a, rainbow_from_hue(a));
       }
       gradient_hue.setColorAt(1, rainbow_from_hue(0));
@@ -228,20 +214,15 @@ public:
 
   void set_color(const QColor& c)
   {
-        if ( display_flags & ColorWheel::COLOR_HSV )
+    if (display_flags & ColorWheel::COLOR_HSV) {
-        {
       hue = qMax(0.0, c.hsvHueF());
       sat = c.hsvSaturationF();
       val = c.valueF();
-        }
+    } else if (display_flags & ColorWheel::COLOR_HSL) {
-        else if ( display_flags & ColorWheel::COLOR_HSL )
-        {
       hue = qMax(0.0, c.hueF());
       sat = detail::color_HSL_saturationF(c);
       val = detail::color_lightnessF(c);
-        }
+    } else if (display_flags & ColorWheel::COLOR_LCH) {
-        else if ( display_flags & ColorWheel::COLOR_LCH )
-        {
       hue = qMax(0.0, c.hsvHueF());
       sat = detail::color_chromaF(c);
       val = detail::color_lumaF(c);
@@ -249,8 +230,9 @@ public:
   }
 };
 
-ColorWheel::ColorWheel(QWidget *parent) :
+ColorWheel::ColorWheel(QWidget* parent)
-    QWidget(parent), p(new Private(this))
+  : QWidget(parent)
+  , p(new Private(this))
 {
   setDisplayFlags(FLAGS_DEFAULT);
   setAcceptDrops(true);
@@ -261,46 +243,54 @@ ColorWheel::~ColorWheel()
   delete p;
 }
 
-QColor ColorWheel::color() const
+QColor
+ColorWheel::color() const
 {
   return p->color_from(p->hue, p->sat, p->val, 1);
 }
 
-QSize ColorWheel::sizeHint() const
+QSize
+ColorWheel::sizeHint() const
 {
   return QSize(p->wheel_width * 5, p->wheel_width * 5);
 }
 
-qreal ColorWheel::hue() const
+qreal
+ColorWheel::hue() const
 {
   if ((p->display_flags & COLOR_LCH) && p->sat > 0.01)
     return color().hueF();
   return p->hue;
 }
 
-qreal ColorWheel::saturation() const
+qreal
+ColorWheel::saturation() const
 {
   return color().hsvSaturationF();
 }
 
-qreal ColorWheel::value() const
+qreal
+ColorWheel::value() const
 {
   return color().valueF();
 }
 
-unsigned int ColorWheel::wheelWidth() const
+unsigned int
+ColorWheel::wheelWidth() const
 {
   return p->wheel_width;
 }
 
-void ColorWheel::setWheelWidth(unsigned int w)
+void
+ColorWheel::setWheelWidth(unsigned int w)
 {
   p->wheel_width = w;
   p->render_inner_selector();
   update();
 }
 
-void ColorWheel::paintEvent(QPaintEvent * )
+void
+ColorWheel::paintEvent(QPaintEvent*)
 {
   QPainter painter(this);
   painter.setRenderHint(QPainter::Antialiasing);
@@ -331,13 +321,10 @@ void ColorWheel::paintEvent(QPaintEvent * )
   painter.translate(p->selector_image_offset());
 
   QPointF selector_position;
-    if ( p->display_flags & SHAPE_SQUARE )
+  if (p->display_flags & SHAPE_SQUARE) {
-    {
     qreal side = p->square_size();
     selector_position = QPointF(p->sat * side, p->val * side);
-    }
+  } else if (p->display_flags & SHAPE_TRIANGLE) {
-    else if ( p->display_flags & SHAPE_TRIANGLE )
-    {
     qreal side = p->triangle_side();
     qreal height = p->triangle_height();
     qreal slice_h = side * p->val;
@@ -353,55 +340,50 @@ void ColorWheel::paintEvent(QPaintEvent * )
     painter.setClipPath(clip);
   }
 
-    painter.drawImage(QRectF(QPointF(0, 0), p->selector_size()), p->inner_selector);
+  painter.drawImage(QRectF(QPointF(0, 0), p->selector_size()),
+                    p->inner_selector);
   painter.setClipping(false);
 
   // lum-sat selector
-    // we define the color of the selecto based on the background color of the widget
+  // we define the color of the selecto based on the background color of the
-    // in order to improve the contrast
+  // widget in order to improve the contrast
   qreal colorBrightness = color_widgets::detail::color_lumaF(color());
   if (p->bgBrightness < 0.6) // dark theme
   {
     bool isWhite = (colorBrightness < 0.7);
     painter.setPen(QPen(isWhite ? Qt::white : Qt::black, 3));
-    }
+  } else // light theme
-    else // light theme
   {
     bool isWhite = (colorBrightness < 0.4 && p->val < 0.3);
     painter.setPen(QPen(isWhite ? Qt::white : Qt::black, 3));
   }
   painter.setBrush(Qt::NoBrush);
   painter.drawEllipse(selector_position, selector_radius, selector_radius);
-
 }
 
-void ColorWheel::mouseMoveEvent(QMouseEvent *ev)
+void
-{
+ColorWheel::mouseMoveEvent(QMouseEvent* ev)
-    if (p->mouse_status == DragCircle )
 {
+  if (p->mouse_status == DragCircle) {
     p->hue = p->line_to_point(ev->pos()).angle() / 360.0;
     p->render_inner_selector();
 
     emit colorSelected(color());
     emit colorChanged(color());
     update();
-    }
+  } else if (p->mouse_status == DragSquare) {
-    else if(p->mouse_status == DragSquare)
-    {
     QLineF glob_mouse_ln = p->line_to_point(ev->pos());
     QLineF center_mouse_ln(QPointF(0, 0),
                            glob_mouse_ln.p2() - glob_mouse_ln.p1());
 
-        center_mouse_ln.setAngle(center_mouse_ln.angle()+p->selector_image_angle());
+    center_mouse_ln.setAngle(center_mouse_ln.angle() +
+                             p->selector_image_angle());
     center_mouse_ln.setP2(center_mouse_ln.p2() - p->selector_image_offset());
 
-        if ( p->display_flags & SHAPE_SQUARE )
+    if (p->display_flags & SHAPE_SQUARE) {
-        {
       p->sat = qBound(0.0, center_mouse_ln.x2() / p->square_size(), 1.0);
       p->val = qBound(0.0, center_mouse_ln.y2() / p->square_size(), 1.0);
-        }
+    } else if (p->display_flags & SHAPE_TRIANGLE) {
-        else if ( p->display_flags & SHAPE_TRIANGLE )
-        {
       QPointF pt = center_mouse_ln.p2();
 
       qreal side = p->triangle_side();
@@ -421,10 +403,10 @@ void ColorWheel::mouseMoveEvent(QMouseEvent *ev)
   }
 }
 
-void ColorWheel::mousePressEvent(QMouseEvent *ev)
+void
-{
+ColorWheel::mousePressEvent(QMouseEvent* ev)
-    if ( ev->buttons() & Qt::LeftButton )
 {
+  if (ev->buttons() & Qt::LeftButton) {
     setFocus();
     QLineF ray = p->line_to_point(ev->pos());
     if (ray.length() <= p->inner_radius())
@@ -437,21 +419,23 @@ void ColorWheel::mousePressEvent(QMouseEvent *ev)
   }
 }
 
-void ColorWheel::mouseReleaseEvent(QMouseEvent *ev)
+void
+ColorWheel::mouseReleaseEvent(QMouseEvent* ev)
 {
   mouseMoveEvent(ev);
   p->mouse_status = Nothing;
   emit mouseReleaseOnColor(color());
-
 }
 
-void ColorWheel::resizeEvent(QResizeEvent *)
+void
+ColorWheel::resizeEvent(QResizeEvent*)
 {
   p->render_ring();
   p->render_inner_selector();
 }
 
-void ColorWheel::setColor(QColor c)
+void
+ColorWheel::setColor(QColor c)
 {
   qreal oldh = p->hue;
   p->set_color(c);
@@ -461,27 +445,30 @@ void ColorWheel::setColor(QColor c)
   emit colorChanged(c);
 }
 
-void ColorWheel::setHue(qreal h)
+void
+ColorWheel::setHue(qreal h)
 {
   p->hue = qBound(0.0, h, 1.0);
   p->render_inner_selector();
   update();
 }
 
-void ColorWheel::setSaturation(qreal s)
+void
+ColorWheel::setSaturation(qreal s)
 {
   p->sat = qBound(0.0, s, 1.0);
   update();
 }
 
-void ColorWheel::setValue(qreal v)
+void
+ColorWheel::setValue(qreal v)
 {
   p->val = qBound(0.0, v, 1.0);
   update();
 }
 
-
+void
-void ColorWheel::setDisplayFlags(DisplayFlags flags)
+ColorWheel::setDisplayFlags(DisplayFlags flags)
 {
   if (!(flags & COLOR_FLAGS))
     flags |= default_flags & COLOR_FLAGS;
@@ -490,27 +477,21 @@ void ColorWheel::setDisplayFlags(DisplayFlags flags)
   if (!(flags & SHAPE_FLAGS))
     flags |= default_flags & SHAPE_FLAGS;
 
-    if ( (flags & COLOR_FLAGS) != (p->display_flags & COLOR_FLAGS) )
+  if ((flags & COLOR_FLAGS) != (p->display_flags & COLOR_FLAGS)) {
-    {
     QColor old_col = color();
-        if ( flags & ColorWheel::COLOR_HSL )
+    if (flags & ColorWheel::COLOR_HSL) {
-        {
       p->hue = old_col.hueF();
       p->sat = detail::color_HSL_saturationF(old_col);
       p->val = detail::color_lightnessF(old_col);
       p->color_from = &detail::color_from_hsl;
       p->rainbow_from_hue = &detail::rainbow_hsv;
-        }
+    } else if (flags & ColorWheel::COLOR_LCH) {
-        else if ( flags & ColorWheel::COLOR_LCH )
-        {
       p->hue = old_col.hueF();
       p->sat = detail::color_chromaF(old_col);
       p->val = detail::color_lumaF(old_col);
       p->color_from = &detail::color_from_lch;
       p->rainbow_from_hue = &detail::rainbow_lch;
-        }
+    } else {
-        else
-        {
       p->hue = old_col.hsvHueF();
       p->sat = old_col.hsvSaturationF();
       p->val = old_col.valueF();
@@ -526,12 +507,14 @@ void ColorWheel::setDisplayFlags(DisplayFlags flags)
   emit displayFlagsChanged(flags);
 }
 
-ColorWheel::DisplayFlags ColorWheel::displayFlags(DisplayFlags mask) const
+ColorWheel::DisplayFlags
+ColorWheel::displayFlags(DisplayFlags mask) const
 {
   return p->display_flags & mask;
 }
 
-void ColorWheel::setDefaultDisplayFlags(DisplayFlags flags)
+void
+ColorWheel::setDefaultDisplayFlags(DisplayFlags flags)
 {
   if (!(flags & COLOR_FLAGS))
     flags |= hard_default_flags & COLOR_FLAGS;
@@ -542,35 +525,36 @@ void ColorWheel::setDefaultDisplayFlags(DisplayFlags flags)
   default_flags = flags;
 }
 
-ColorWheel::DisplayFlags ColorWheel::defaultDisplayFlags(DisplayFlags mask)
+ColorWheel::DisplayFlags
+ColorWheel::defaultDisplayFlags(DisplayFlags mask)
 {
   return default_flags & mask;
 }
 
-void ColorWheel::setDisplayFlag(DisplayFlags flag, DisplayFlags mask)
+void
+ColorWheel::setDisplayFlag(DisplayFlags flag, DisplayFlags mask)
 {
   setDisplayFlags((p->display_flags & ~mask) | flag);
 }
 
-void ColorWheel::dragEnterEvent(QDragEnterEvent* event)
+void
+ColorWheel::dragEnterEvent(QDragEnterEvent* event)
 {
   if (event->mimeData()->hasColor() ||
-         ( event->mimeData()->hasText() && QColor(event->mimeData()->text()).isValid() ) )
+      (event->mimeData()->hasText() &&
+       QColor(event->mimeData()->text()).isValid()))
     event->acceptProposedAction();
 }
 
-void ColorWheel::dropEvent(QDropEvent* event)
+void
-{
+ColorWheel::dropEvent(QDropEvent* event)
-    if ( event->mimeData()->hasColor() )
 {
+  if (event->mimeData()->hasColor()) {
     setColor(event->mimeData()->colorData().value<QColor>());
     event->accept();
-    }
+  } else if (event->mimeData()->hasText()) {
-    else if ( event->mimeData()->hasText() )
-    {
     QColor col(event->mimeData()->text());
-        if ( col.isValid() )
+    if (col.isValid()) {
-        {
       setColor(col);
       event->accept();
     }

external/singleapplication/singleapplication.cpp

@@ -22,14 +22,14 @@
 
 #include <cstdlib>
 
+#include <QtCore/QByteArray>
+#include <QtCore/QCryptographicHash>
+#include <QtCore/QDataStream>
 #include <QtCore/QDir>
 #include <QtCore/QProcess>
-#include <QtCore/QByteArray>
 #include <QtCore/QSemaphore>
 #include <QtCore/QSharedMemory>
 #include <QtCore/QStandardPaths>
-#include <QtCore/QCryptographicHash>
-#include <QtCore/QDataStream>
 #include <QtNetwork/QLocalServer>
 #include <QtNetwork/QLocalSocket>
 
@@ -39,15 +39,16 @@
 #endif
 
 #ifdef Q_OS_WIN
-    #include <windows.h>
 #include <lmcons.h>
+#include <windows.h>
 #endif
 
 #include "singleapplication.h"
 #include "singleapplication_p.h"
 
-
+SingleApplicationPrivate::SingleApplicationPrivate(SingleApplication* q_ptr)
-SingleApplicationPrivate::SingleApplicationPrivate( SingleApplication *q_ptr ) : q_ptr( q_ptr ) {
+  : q_ptr(q_ptr)
+{
   server = nullptr;
   socket = nullptr;
 }
@@ -72,7 +73,8 @@ SingleApplicationPrivate::~SingleApplicationPrivate()
   delete memory;
 }
 
-void SingleApplicationPrivate::genBlockServerName( int timeout )
+void
+SingleApplicationPrivate::genBlockServerName(int timeout)
 {
   QCryptographicHash appData(QCryptographicHash::Sha256);
   appData.addData("SingleApplication", 17);
@@ -86,7 +88,8 @@ void SingleApplicationPrivate::genBlockServerName( int timeout )
 
   if (!(options & SingleApplication::Mode::ExcludeAppPath)) {
 #ifdef Q_OS_WIN
-        appData.addData( SingleApplication::app_t::applicationFilePath().toLower().toUtf8() );
+    appData.addData(
+      SingleApplication::app_t::applicationFilePath().toLower().toUtf8());
 #else
     appData.addData(SingleApplication::app_t::applicationFilePath().toUtf8());
 #endif
@@ -102,7 +105,10 @@ void SingleApplicationPrivate::genBlockServerName( int timeout )
     if (GetUserNameW(username, &usernameLength)) {
       appData.addData(QString::fromWCharArray(username).toUtf8());
     } else {
-            appData.addData( QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).join("").toUtf8() );
+      appData.addData(
+        QStandardPaths::standardLocations(QStandardPaths::HomeLocation)
+          .join("")
+          .toUtf8());
     }
 #endif
 #ifdef Q_OS_UNIX
@@ -114,10 +120,10 @@ void SingleApplicationPrivate::genBlockServerName( int timeout )
       appData.addData(process.readLine());
     } else {
       appData.addData(
-                QDir(
+        QDir(QStandardPaths::standardLocations(QStandardPaths::HomeLocation)
-                    QStandardPaths::standardLocations( QStandardPaths::HomeLocation ).first()
+               .first())
-                ).absolutePath().toUtf8()
+          .absolutePath()
-            );
+          .toUtf8());
     }
 #endif
   }
@@ -127,7 +133,8 @@ void SingleApplicationPrivate::genBlockServerName( int timeout )
   blockServerName = appData.result().toBase64().replace("/", "_");
 }
 
-void SingleApplicationPrivate::startPrimary( bool resetMemory )
+void
+SingleApplicationPrivate::startPrimary(bool resetMemory)
 {
   Q_Q(SingleApplication);
 
@@ -150,12 +157,10 @@ void SingleApplicationPrivate::startPrimary( bool resetMemory )
   }
 
   server->listen(blockServerName);
-    QObject::connect(
+  QObject::connect(server,
-        server,
                    &QLocalServer::newConnection,
                    this,
-        &SingleApplicationPrivate::slotConnectionEstablished
+                   &SingleApplicationPrivate::slotConnectionEstablished);
-    );
 
   // Reset the number of connections
   memory->lock();
@@ -173,7 +178,8 @@ void SingleApplicationPrivate::startPrimary( bool resetMemory )
   instanceNumber = 0;
 }
 
-void SingleApplicationPrivate::startSecondary()
+void
+SingleApplicationPrivate::startSecondary()
 {
 #ifdef Q_OS_UNIX
   // Handle any further termination signals to ensure the
@@ -182,7 +188,9 @@ void SingleApplicationPrivate::startSecondary()
 #endif
 }
 
-void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType connectionType )
+void
+SingleApplicationPrivate::connectToPrimary(int msecs,
+                                           ConnectionType connectionType)
 {
   // Connect to the Local Server of the Primary Instance if not already
   // connected.
@@ -214,7 +222,8 @@ void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType conne
     writeStream << blockServerName.toLatin1();
     writeStream << static_cast<quint8>(connectionType);
     writeStream << instanceNumber;
-        quint16 checksum = qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
+    quint16 checksum =
+      qChecksum(initMsg.constData(), static_cast<quint32>(initMsg.length()));
     writeStream << checksum;
 
     socket->write(initMsg);
@@ -223,7 +232,8 @@ void SingleApplicationPrivate::connectToPrimary( int msecs, ConnectionType conne
   }
 }
 
-qint64 SingleApplicationPrivate::primaryPid()
+qint64
+SingleApplicationPrivate::primaryPid()
 {
   qint64 pid;
 
@@ -236,7 +246,8 @@ qint64 SingleApplicationPrivate::primaryPid()
 }
 
 #ifdef Q_OS_UNIX
-    void SingleApplicationPrivate::crashHandler()
+void
+SingleApplicationPrivate::crashHandler()
 {
   // Handle any further termination signals to ensure the
   // QSharedMemory block is deleted even if the process crashes
@@ -256,7 +267,8 @@ qint64 SingleApplicationPrivate::primaryPid()
   signal(SIGXFSZ, SingleApplicationPrivate::terminate); // 25
 }
 
-    void SingleApplicationPrivate::terminate( int signum )
+void
+SingleApplicationPrivate::terminate(int signum)
 {
   delete ((SingleApplication*)QCoreApplication::instance())->d_ptr;
   ::exit(128 + signum);
@@ -266,7 +278,8 @@ qint64 SingleApplicationPrivate::primaryPid()
 /**
  * @brief Executed when a connection has been made to the LocalServer
  */
-void SingleApplicationPrivate::slotConnectionEstablished()
+void
+SingleApplicationPrivate::slotConnectionEstablished()
 {
   Q_Q(SingleApplication);
 
@@ -276,7 +289,8 @@ void SingleApplicationPrivate::slotConnectionEstablished()
   ConnectionType connectionType = InvalidConnection;
   if (nextConnSocket->waitForReadyRead(100)) {
     // read all data from message in same order/format as written
-        QByteArray msgBytes = nextConnSocket->read(nextConnSocket->bytesAvailable() - static_cast<qint64>(sizeof(quint16)));
+    QByteArray msgBytes = nextConnSocket->read(
+      nextConnSocket->bytesAvailable() - static_cast<qint64>(sizeof(quint16)));
     QByteArray checksumBytes = nextConnSocket->read(sizeof(quint16));
     QDataStream readStream(msgBytes);
     readStream.setVersion(QDataStream::Qt_5_2);
@@ -296,9 +310,12 @@ void SingleApplicationPrivate::slotConnectionEstablished()
     checksumStream.setVersion(QDataStream::Qt_5_2);
     checksumStream >> msgChecksum;
 
-        const quint16 actualChecksum = qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length()));
+    const quint16 actualChecksum =
+      qChecksum(msgBytes.constData(), static_cast<quint32>(msgBytes.length()));
 
-        if (readStream.status() != QDataStream::Ok || QLatin1String(latin1Name) != blockServerName || msgChecksum != actualChecksum) {
+    if (readStream.status() != QDataStream::Ok ||
+        QLatin1String(latin1Name) != blockServerName ||
+        msgChecksum != actualChecksum) {
       connectionType = InvalidConnection;
     }
   }
@@ -309,29 +326,24 @@ void SingleApplicationPrivate::slotConnectionEstablished()
     return;
   }
 
-    QObject::connect(
+  QObject::connect(nextConnSocket,
-        nextConnSocket,
                    &QLocalSocket::aboutToClose,
                    this,
                    [nextConnSocket, instanceId, this]() {
-            emit this->slotClientConnectionClosed( nextConnSocket, instanceId );
+                     emit this->slotClientConnectionClosed(nextConnSocket,
-        }
+                                                           instanceId);
-    );
+                   });
 
-    QObject::connect(
+  QObject::connect(nextConnSocket,
-        nextConnSocket,
                    &QLocalSocket::readyRead,
                    this,
                    [nextConnSocket, instanceId, this]() {
                      emit this->slotDataAvailable(nextConnSocket, instanceId);
-        }
+                   });
-    );
 
-    if( connectionType == NewInstance || (
+  if (connectionType == NewInstance ||
-            connectionType == SecondaryInstance &&
+      (connectionType == SecondaryInstance &&
-            options & SingleApplication::Mode::SecondaryNotification
+       options & SingleApplication::Mode::SecondaryNotification)) {
-        )
-    ) {
     emit q->instanceStarted();
   }
 
@@ -340,13 +352,17 @@ void SingleApplicationPrivate::slotConnectionEstablished()
   }
 }
 
-void SingleApplicationPrivate::slotDataAvailable( QLocalSocket *dataSocket, quint32 instanceId )
+void
+SingleApplicationPrivate::slotDataAvailable(QLocalSocket* dataSocket,
+                                            quint32 instanceId)
 {
   Q_Q(SingleApplication);
   emit q->receivedMessage(instanceId, dataSocket->readAll());
 }
 
-void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedSocket, quint32 instanceId )
+void
+SingleApplicationPrivate::slotClientConnectionClosed(QLocalSocket* closedSocket,
+                                                     quint32 instanceId)
 {
   if (closedSocket->bytesAvailable() > 0)
     emit slotDataAvailable(closedSocket, instanceId);
@@ -360,8 +376,13 @@ void SingleApplicationPrivate::slotClientConnectionClosed( QLocalSocket *closedS
  * @param argv
  * @param {bool} allowSecondaryInstances
  */
-SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout )
+SingleApplication::SingleApplication(int& argc,
-    : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) )
+                                     char* argv[],
+                                     bool allowSecondary,
+                                     Options options,
+                                     int timeout)
+  : app_t(argc, argv)
+  , d_ptr(new SingleApplicationPrivate(this))
 {
   Q_D(SingleApplication);
 
@@ -404,7 +425,8 @@ SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSeconda
         d->instanceNumber = inst->secondary;
         d->startSecondary();
         if (d->options & Mode::SecondaryNotification) {
-                    d->connectToPrimary( timeout, SingleApplicationPrivate::SecondaryInstance );
+          d->connectToPrimary(timeout,
+                              SingleApplicationPrivate::SecondaryInstance);
         }
         d->memory->unlock();
         return;
@@ -428,36 +450,42 @@ SingleApplication::~SingleApplication()
   delete d;
 }
 
-bool SingleApplication::isPrimary()
+bool
+SingleApplication::isPrimary()
 {
   Q_D(SingleApplication);
   return d->server != nullptr;
 }
 
-bool SingleApplication::isSecondary()
+bool
+SingleApplication::isSecondary()
 {
   Q_D(SingleApplication);
   return d->server == nullptr;
 }
 
-quint32 SingleApplication::instanceId()
+quint32
+SingleApplication::instanceId()
 {
   Q_D(SingleApplication);
   return d->instanceNumber;
 }
 
-qint64 SingleApplication::primaryPid()
+qint64
+SingleApplication::primaryPid()
 {
   Q_D(SingleApplication);
   return d->primaryPid();
 }
 
-bool SingleApplication::sendMessage( QByteArray message, int timeout )
+bool
+SingleApplication::sendMessage(QByteArray message, int timeout)
 {
   Q_D(SingleApplication);
 
   // Nobody to connect to
-    if( isPrimary() ) return false;
+  if (isPrimary())
+    return false;
 
   // Make sure the socket is connected
   d->connectToPrimary(timeout, SingleApplicationPrivate::Reconnect);

external/singleapplication/singleapplication.h

@@ -56,7 +56,8 @@ public:
    * block will be user wide.
    * @enum
    */
-    enum Mode {
+  enum Mode
+  {
     User = 1 << 0,
     System = 1 << 1,
     SecondaryNotification = 1 << 2,
@@ -85,7 +86,11 @@ public:
    * Usually 4*timeout would be the worst case (fail) scenario.
    * @see See the corresponding QAPPLICATION_CLASS constructor for reference
    */
-    explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 100 );
+  explicit SingleApplication(int& argc,
+                             char* argv[],
+                             bool allowSecondary = false,
+                             Options options = Mode::User,
+                             int timeout = 100);
   ~SingleApplication();
 
   /**

external/singleapplication/singleapplication_p.h

@@ -32,21 +32,24 @@
 #ifndef SINGLEAPPLICATION_P_H
 #define SINGLEAPPLICATION_P_H
 
+#include "singleapplication.h"
 #include <QtCore/QSharedMemory>
 #include <QtNetwork/QLocalServer>
 #include <QtNetwork/QLocalSocket>
-#include "singleapplication.h"
 
-struct InstancesInfo {
+struct InstancesInfo
+{
   bool primary;
   quint32 secondary;
   qint64 primaryPid;
 };
 
-class SingleApplicationPrivate : public QObject {
+class SingleApplicationPrivate : public QObject
+{
   Q_OBJECT
 public:
-    enum ConnectionType : quint8 {
+  enum ConnectionType : quint8
+  {
     InvalidConnection = 0,
     NewInstance = 1,
     SecondaryInstance = 2,

src/cli/commandargument.cpp

@@ -17,38 +17,46 @@
 
 #include "commandargument.h"
 
-CommandArgument::CommandArgument() {
+CommandArgument::CommandArgument() {}
-
-}
 
 CommandArgument::CommandArgument(const QString& name,
-                                 const QString &description) :
+                                 const QString& description)
-    m_name(name), m_description(description)
+  : m_name(name)
+  , m_description(description)
+{}
+
+void
+CommandArgument::setName(const QString& name)
 {
-
-}
-
-void CommandArgument::setName(const QString &name) {
   m_name = name;
 }
 
-QString CommandArgument::name() const {
+QString
+CommandArgument::name() const
+{
   return m_name;
 }
 
-void CommandArgument::setDescription(const QString &description) {
+void
+CommandArgument::setDescription(const QString& description)
+{
   m_description = description;
 }
 
-QString CommandArgument::description() const {
+QString
+CommandArgument::description() const
+{
   return m_description;
 }
 
-bool CommandArgument::isRoot() const {
+bool
+CommandArgument::isRoot() const
+{
   return m_name.isEmpty() && m_description.isEmpty();
 }
 
-bool CommandArgument::operator ==(const CommandArgument &arg) const {
+bool
-    return m_description == arg.m_description
+CommandArgument::operator==(const CommandArgument& arg) const
-            && m_name == arg.m_name;
+{
+  return m_description == arg.m_description && m_name == arg.m_name;
 }

src/cli/commandargument.h

@@ -19,7 +19,8 @@
 
 #include <QString>
 
-class CommandArgument {
+class CommandArgument
+{
 public:
   CommandArgument();
   explicit CommandArgument(const QString& name, const QString& description);

src/cli/commandlineparser.cpp

@@ -19,24 +19,25 @@
 #include <QApplication>
 #include <QTextStream>
 
-CommandLineParser::CommandLineParser() :
+CommandLineParser::CommandLineParser()
-    m_description(qApp->applicationName())
+  : m_description(qApp->applicationName())
-{
+{}
-
-}
 
 namespace {
 
 QTextStream out(stdout);
 QTextStream err(stderr);
 
-auto versionOption = CommandOption({"v", "version"},
+auto versionOption =
+  CommandOption({ "v", "version" },
                 QStringLiteral("Displays version information"));
-auto helpOption = CommandOption({"h", "help"},
+auto helpOption =
-                                QStringLiteral("Displays this help"));
+  CommandOption({ "h", "help" }, QStringLiteral("Displays this help"));
 
-QString optionsToString(const QList<CommandOption> &options,
+QString
-                        const QList<CommandArgument> &arguments) {
+optionsToString(const QList<CommandOption>& options,
+                const QList<CommandArgument>& arguments)
+{
   int size = 0; // track the largest size
   QStringList dashedOptionList;
   // save the dashed options and its size in order to print the description
@@ -45,8 +46,7 @@ QString optionsToString(const QList<CommandOption> &options,
     QStringList dashedOptions = option.dashedNames();
     QString joinedDashedOptions = dashedOptions.join(QStringLiteral(", "));
     if (!option.valueName().isEmpty()) {
-            joinedDashedOptions += QStringLiteral(" <%1>")
+      joinedDashedOptions += QStringLiteral(" <%1>").arg(option.valueName());
-                    .arg(option.valueName());
     }
     if (joinedDashedOptions.length() > size) {
       size = joinedDashedOptions.length();
@@ -66,8 +66,8 @@ QString optionsToString(const QList<CommandOption> &options,
     for (int i = 0; i < options.length(); ++i) {
       result += QStringLiteral("  %1  %2\n")
                   .arg(dashedOptionList.at(i).leftJustified(size, ' '))
-                    .arg(options.at(i).description()
+                  .arg(options.at(i).description().replace(QLatin1String("\n"),
-                         .replace(QLatin1String("\n"), linePadding));
+                                                           linePadding));
     }
     if (!arguments.isEmpty()) {
       result += QLatin1String("\n");
@@ -86,7 +86,8 @@ QString optionsToString(const QList<CommandOption> &options,
 
 } // unnamed namespace
 
-bool CommandLineParser::processArgs(const QStringList &args,
+bool
+CommandLineParser::processArgs(const QStringList& args,
                                QStringList::const_iterator& actualIt,
                                Node*& actualNode)
 {
@@ -114,7 +115,8 @@ bool CommandLineParser::processArgs(const QStringList &args,
   return ok;
 }
 
-bool CommandLineParser::processOptions(const QStringList &args,
+bool
+CommandLineParser::processOptions(const QStringList& args,
                                   QStringList::const_iterator& actualIt,
                                   Node* const actualNode)
 {
@@ -129,15 +131,12 @@ bool CommandLineParser::processOptions(const QStringList &args,
   }
   // check format -x --xx...
   bool isDoubleDashed = arg.startsWith(QLatin1String("--"));
-    ok =  isDoubleDashed ? arg.length() > 3 :
+  ok = isDoubleDashed ? arg.length() > 3 : arg.length() == 2;
-                arg.length() == 2;
   if (!ok) {
     out << QStringLiteral("the option %1 has a wrong format.").arg(arg);
     return ok;
   }
-    arg = isDoubleDashed ?
+  arg = isDoubleDashed ? arg.remove(0, 2) : arg.remove(0, 1);
-                arg.remove(0, 2) :
-                arg.remove(0, 1);
   // get option
   auto endIt = actualNode->options.cend();
   auto optionIt = endIt;
@@ -153,7 +152,8 @@ bool CommandLineParser::processOptions(const QStringList &args,
       argName = qApp->applicationName();
     }
     out << QStringLiteral("the option '%1' is not a valid option "
-                         "for the argument '%2'.").arg(arg)
+                          "for the argument '%2'.")
+             .arg(arg)
              .arg(argName);
     ok = false;
     return ok;
@@ -163,7 +163,8 @@ bool CommandLineParser::processOptions(const QStringList &args,
   bool requiresValue = !(option.valueName().isEmpty());
   if (!requiresValue && equalsPos != -1) {
     out << QStringLiteral("the option '%1' contains a '=' and it doesn't "
-                         "require a value.").arg(arg);
+                          "require a value.")
+             .arg(arg);
     ok = false;
     return ok;
   } else if (requiresValue && valueStr.isEmpty()) {
@@ -193,7 +194,9 @@ bool CommandLineParser::processOptions(const QStringList &args,
   return ok;
 }
 
-bool CommandLineParser::parse(const QStringList &args) {
+bool
+CommandLineParser::parse(const QStringList& args)
+{
   m_foundArgs.clear();
   m_foundOptions.clear();
   bool ok = true;
@@ -202,8 +205,7 @@ bool CommandLineParser::parse(const QStringList &args) {
   // check  version option
   QStringList dashedVersion = versionOption.dashedNames();
   if (m_withVersion && args.length() > 1 &&
-            dashedVersion.contains(args.at(1)))
+      dashedVersion.contains(args.at(1))) {
-    {
     if (args.length() == 2) {
       printVersion();
       m_foundOptions << versionOption;
@@ -212,7 +214,6 @@ bool CommandLineParser::parse(const QStringList &args) {
       ok = false;
     }
     return ok;
-
   }
   // check  help option
   ok = processIfOptionIsHelp(args, it, actualNode);
@@ -232,17 +233,22 @@ bool CommandLineParser::parse(const QStringList &args) {
   return ok;
 }
 
-CommandOption CommandLineParser::addVersionOption() {
+CommandOption
+CommandLineParser::addVersionOption()
+{
   m_withVersion = true;
   return versionOption;
 }
 
-CommandOption CommandLineParser::addHelpOption() {
+CommandOption
+CommandLineParser::addHelpOption()
+{
   m_withHelp = true;
   return helpOption;
 }
 
-bool CommandLineParser::AddArgument(const CommandArgument &arg,
+bool
+CommandLineParser::AddArgument(const CommandArgument& arg,
                                const CommandArgument& parent)
 {
   bool res = true;
@@ -257,7 +263,8 @@ bool CommandLineParser::AddArgument(const CommandArgument &arg,
   return res;
 }
 
-bool CommandLineParser::AddOption(const CommandOption &option,
+bool
+CommandLineParser::AddOption(const CommandOption& option,
                              const CommandArgument& parent)
 {
   bool res = true;
@@ -270,7 +277,8 @@ bool CommandLineParser::AddOption(const CommandOption &option,
   return res;
 }
 
-bool CommandLineParser::AddOptions(const QList<CommandOption> &options,
+bool
+CommandLineParser::AddOptions(const QList<CommandOption>& options,
                               const CommandArgument& parent)
 {
   bool res = true;
@@ -283,24 +291,33 @@ bool CommandLineParser::AddOptions(const QList<CommandOption> &options,
   return res;
 }
 
-void CommandLineParser::setGeneralErrorMessage(const QString &msg) {
+void
+CommandLineParser::setGeneralErrorMessage(const QString& msg)
+{
   m_generalErrorMessage = msg;
 }
 
-void CommandLineParser::setDescription(const QString &description) {
+void
+CommandLineParser::setDescription(const QString& description)
+{
   m_description = description;
 }
 
-bool CommandLineParser::isSet(const CommandArgument &arg) const {
+bool
+CommandLineParser::isSet(const CommandArgument& arg) const
+{
   return m_foundArgs.contains(arg);
 }
 
-
+bool
-bool CommandLineParser::isSet(const CommandOption &option) const {
+CommandLineParser::isSet(const CommandOption& option) const
+{
   return m_foundOptions.contains(option);
 }
 
-QString CommandLineParser::value(const CommandOption &option) const {
+QString
+CommandLineParser::value(const CommandOption& option) const
+{
   QString value = option.value();
   for (const CommandOption& fOption : m_foundOptions) {
     if (option == fOption) {
@@ -311,12 +328,16 @@ QString CommandLineParser::value(const CommandOption &option) const {
   return value;
 }
 
-void CommandLineParser::printVersion() {
+void
+CommandLineParser::printVersion()
+{
   out << "Flameshot " << qApp->applicationVersion() << "\nCompiled with Qt "
       << static_cast<QString>(QT_VERSION_STR) << "\n";
 }
 
-void CommandLineParser::printHelp(QStringList args, const Node *node) {
+void
+CommandLineParser::printHelp(QStringList args, const Node* node)
+{
   args.removeLast(); // remove the help, it's always the last
   QString helpText;
   // add usage info
@@ -327,7 +348,8 @@ void CommandLineParser::printHelp(QStringList args, const Node *node) {
   QString argText = node->subNodes.isEmpty() ? "" : "[arguments]";
   helpText += QStringLiteral("Usage: %1 [%2-options] %3\n\n")
                 .arg(args.join(QStringLiteral(" ")))
-            .arg(argName).arg(argText);
+                .arg(argName)
+                .arg(argText);
   // add command options and subarguments
   QList<CommandArgument> subArgs;
   for (const Node& n : node->subNodes)
@@ -343,17 +365,16 @@ void CommandLineParser::printHelp(QStringList args, const Node *node) {
   out << helpText;
 }
 
-CommandLineParser::Node* CommandLineParser::findParent(
+CommandLineParser::Node*
-        const CommandArgument &parent)
+CommandLineParser::findParent(const CommandArgument& parent)
 {
   if (parent == CommandArgument()) {
     return &m_parseTree;
   }
   // find the parent in the subNodes recursively
   Node* res = nullptr;
-    for (auto i = m_parseTree.subNodes.begin();
+  for (auto i = m_parseTree.subNodes.begin(); i != m_parseTree.subNodes.end();
-        i != m_parseTree.subNodes.end(); ++i)
+       ++i) {
-    {
     res = recursiveParentSearch(parent, *i);
     if (res != nullptr) {
       break;
@@ -362,8 +383,9 @@ CommandLineParser::Node* CommandLineParser::findParent(
   return res;
 }
 
-CommandLineParser::Node* CommandLineParser::recursiveParentSearch(
+CommandLineParser::Node*
-        const CommandArgument &parent, Node &node) const
+CommandLineParser::recursiveParentSearch(const CommandArgument& parent,
+                                         Node& node) const
 {
   Node* res = nullptr;
   if (node.argument == parent) {
@@ -379,16 +401,15 @@ CommandLineParser::Node* CommandLineParser::recursiveParentSearch(
   return res;
 }
 
-bool CommandLineParser::processIfOptionIsHelp(
+bool
-        const QStringList &args,
+CommandLineParser::processIfOptionIsHelp(const QStringList& args,
                                          QStringList::const_iterator& actualIt,
                                          Node*& actualNode)
 {
   bool ok = true;
   auto dashedHelpNames = helpOption.dashedNames();
   if (m_withHelp && actualIt != args.cend() &&
-            dashedHelpNames.contains(*actualIt))
+      dashedHelpNames.contains(*actualIt)) {
-    {
     if (actualIt + 1 == args.cend()) {
       m_foundOptions << helpOption;
       printHelp(args, actualNode);

src/cli/commandlineparser.h

@@ -21,7 +21,8 @@
 #include "src/cli/commandoption.h"
 #include <QMap>
 
-class CommandLineParser {
+class CommandLineParser
+{
 public:
   CommandLineParser();
 
@@ -54,12 +55,15 @@ private:
   QString m_description;
   QString m_generalErrorMessage;
 
-    struct Node {
+  struct Node
-        explicit Node(const CommandArgument &arg) : argument(arg) {}
+  {
+    explicit Node(const CommandArgument& arg)
+      : argument(arg)
+    {}
     Node() {}
-        bool operator==(const Node &n) const {
+    bool operator==(const Node& n) const
-            return argument == n.argument &&
+    {
-                    options == n.options &&
+      return argument == n.argument && options == n.options &&
              subNodes == n.subNodes;
     }
     CommandArgument argument;
@@ -75,8 +79,7 @@ private:
   void printVersion();
   void printHelp(QStringList args, const Node* node);
   Node* findParent(const CommandArgument& parent);
-    Node* recursiveParentSearch(const CommandArgument &parent,
+  Node* recursiveParentSearch(const CommandArgument& parent, Node& node) const;
-                                Node &node) const;
   bool processIfOptionIsHelp(const QStringList& args,
                              QStringList::const_iterator& actualIt,
                              Node*& actualNode);

src/cli/commandoption.cpp

@@ -17,11 +17,14 @@
 
 #include "commandoption.h"
 
-CommandOption::CommandOption(const QString &name, const QString &description,
+CommandOption::CommandOption(const QString& name,
+                             const QString& description,
                              const QString& valueName,
-                             const QString &defaultValue) :
+                             const QString& defaultValue)
-    m_names(name), m_description(description), m_valueName(valueName),
+  : m_names(name)
-    m_value(defaultValue)
+  , m_description(description)
+  , m_valueName(valueName)
+  , m_value(defaultValue)
 {
   m_checker = [](QString const&) { return true; };
 }
@@ -29,84 +32,109 @@ CommandOption::CommandOption(const QString &name, const QString &description,
 CommandOption::CommandOption(const QStringList& names,
                              const QString& description,
                              const QString& valueName,
-                             const QString &defaultValue) :
+                             const QString& defaultValue)
-    m_names(names), m_description(description), m_valueName(valueName),
+  : m_names(names)
-    m_value(defaultValue)
+  , m_description(description)
+  , m_valueName(valueName)
+  , m_value(defaultValue)
 {
   m_checker = [](QString const&) -> bool { return true; };
 }
 
-void CommandOption::setName(const QString &name) {
+void
+CommandOption::setName(const QString& name)
+{
   m_names = QStringList() << name;
 }
 
-void CommandOption::setNames(const QStringList &names) {
+void
+CommandOption::setNames(const QStringList& names)
+{
   m_names = names;
 }
 
-QStringList CommandOption::names() const {
+QStringList
+CommandOption::names() const
+{
   return m_names;
 }
 
-QStringList CommandOption::dashedNames() const {
+QStringList
+CommandOption::dashedNames() const
+{
   QStringList dashedNames;
   for (const QString& name : m_names) {
     // prepend "-" to single character options, and "--" to the others
-        QString dashedName = (name.length() == 1) ?
+    QString dashedName = (name.length() == 1)
-                    QStringLiteral("-%1").arg(name) :
+                           ? QStringLiteral("-%1").arg(name)
-                    QStringLiteral("--%1").arg(name);
+                           : QStringLiteral("--%1").arg(name);
     dashedNames << dashedName;
   }
   return dashedNames;
 }
 
-void CommandOption::setValueName(const QString &name) {
+void
+CommandOption::setValueName(const QString& name)
+{
   m_valueName = name;
 }
 
-QString CommandOption::valueName() const {
+QString
+CommandOption::valueName() const
+{
   return m_valueName;
 }
 
-void CommandOption::setValue(const QString &value) {
+void
+CommandOption::setValue(const QString& value)
+{
   if (m_valueName.isEmpty()) {
     m_valueName = QLatin1String("value");
   }
   m_value = value;
 }
 
-QString CommandOption::value() const {
+QString
+CommandOption::value() const
+{
   return m_value;
 }
 
-void CommandOption::addChecker(const function<bool (const QString &)> checker,
+void
+CommandOption::addChecker(const function<bool(const QString&)> checker,
                           const QString& errMsg)
 {
   m_checker = checker;
   m_errorMsg = errMsg;
 }
 
-bool CommandOption::checkValue(const QString &value) const {
+bool
+CommandOption::checkValue(const QString& value) const
+{
   return m_checker(value);
 }
 
-QString CommandOption::description() const
+QString
+CommandOption::description() const
 {
   return m_description;
 }
 
-void CommandOption::setDescription(const QString &description)
+void
+CommandOption::setDescription(const QString& description)
 {
   m_description = description;
 }
 
-QString CommandOption::errorMsg() const {
+QString
+CommandOption::errorMsg() const
+{
   return m_errorMsg;
 }
 
-bool CommandOption::operator ==(const CommandOption &option) const
+bool
+CommandOption::operator==(const CommandOption& option) const
 {
-    return m_description == option.m_description
+  return m_description == option.m_description && m_names == option.m_names &&
-            && m_names == option.m_names
+         m_valueName == option.m_valueName;
-            && m_valueName == option.m_valueName;
 }

src/cli/commandoption.h

@@ -22,13 +22,16 @@
 
 using std::function;
 
-class CommandOption {
+class CommandOption
+{
 public:
-    CommandOption(const QString &name, const QString &description,
+  CommandOption(const QString& name,
+                const QString& description,
                 const QString& valueName = QString(),
                 const QString& defaultValue = QString());
 
-    CommandOption(const QStringList &names, const QString &description,
+  CommandOption(const QStringList& names,
+                const QString& description,
                 const QString& valueName = QString(),
                 const QString& defaultValue = QString());
 
@@ -43,7 +46,8 @@ public:
   void setValue(const QString& value);
   QString value() const;
 
-    void addChecker(const function<bool(QString const&)> checker, const QString &errMsg);
+  void addChecker(const function<bool(QString const&)> checker,
+                  const QString& errMsg);
   bool checkValue(const QString& value) const;
 
   QString description() const;

src/config/buttonlistview.cpp

@@ -21,16 +21,20 @@
 #include <QListWidgetItem>
 #include <algorithm>
 
-ButtonListView::ButtonListView(QWidget *parent) : QListWidget(parent) {
+ButtonListView::ButtonListView(QWidget* parent)
+  : QListWidget(parent)
+{
   setMouseTracking(true);
   setFlow(QListWidget::TopToBottom);
   initButtonList();
   updateComponents();
-    connect(this, &QListWidget::itemClicked, this,
+  connect(
-            &ButtonListView::reverseItemCheck);
+    this, &QListWidget::itemClicked, this, &ButtonListView::reverseItemCheck);
 }
 
-void ButtonListView::initButtonList() {
+void
+ButtonListView::initButtonList()
+{
   ToolFactory factory;
   auto listTypes = CaptureButton::getIterableButtonTypes();
 
@@ -57,7 +61,9 @@ void ButtonListView::initButtonList() {
   }
 }
 
-void ButtonListView::updateActiveButtons(QListWidgetItem *item) {
+void
+ButtonListView::updateActiveButtons(QListWidgetItem* item)
+{
   CaptureButton::ButtonType bType = m_buttonTypeByName[item->text()];
   if (item->checkState() == Qt::Checked) {
     m_listButtons.append(bType);
@@ -73,7 +79,9 @@ void ButtonListView::updateActiveButtons(QListWidgetItem *item) {
   ConfigHandler().setButtons(m_listButtons);
 }
 
-void ButtonListView::reverseItemCheck(QListWidgetItem *item){
+void
+ButtonListView::reverseItemCheck(QListWidgetItem* item)
+{
   if (item->checkState() == Qt::Checked) {
     item->setCheckState(Qt::Unchecked);
   } else {
@@ -82,7 +90,9 @@ void ButtonListView::reverseItemCheck(QListWidgetItem *item){
   updateActiveButtons(item);
 }
 
-void ButtonListView::selectAll() {
+void
+ButtonListView::selectAll()
+{
   ConfigHandler().setAllTheButtons();
   for (int i = 0; i < this->count(); ++i) {
     QListWidgetItem* item = this->item(i);
@@ -90,7 +100,9 @@ void ButtonListView::selectAll() {
   }
 }
 
-void ButtonListView::updateComponents() {
+void
+ButtonListView::updateComponents()
+{
   m_listButtons = ConfigHandler().getButtons();
   auto listTypes = CaptureButton::getIterableButtonTypes();
   for (int i = 0; i < this->count(); ++i) {

src/config/buttonlistview.h

@@ -20,7 +20,8 @@
 #include "src/widgets/capture/capturebutton.h"
 #include <QListWidget>
 
-class ButtonListView : public QListWidget {
+class ButtonListView : public QListWidget
+{
 public:
   explicit ButtonListView(QWidget* parent = nullptr);
 

src/config/clickablelabel.cpp

@@ -17,14 +17,18 @@
 
 #include "clickablelabel.h"
 
-ClickableLabel::ClickableLabel(QWidget *parent) : QLabel(parent) {
+ClickableLabel::ClickableLabel(QWidget* parent)
+  : QLabel(parent)
+{}
 
-}
+ClickableLabel::ClickableLabel(QString s, QWidget* parent)
-
+  : QLabel(parent)
-ClickableLabel::ClickableLabel(QString s, QWidget *parent) : QLabel(parent) {
+{
   setText(s);
 }
 
-void ClickableLabel::mousePressEvent(QMouseEvent *) {
+void
+ClickableLabel::mousePressEvent(QMouseEvent*)
+{
   emit clicked();
 }

src/config/clickablelabel.h

@@ -19,7 +19,8 @@
 
 #include <QLabel>
 
-class ClickableLabel : public QLabel {
+class ClickableLabel : public QLabel
+{
   Q_OBJECT
 public:
   explicit ClickableLabel(QWidget* parent = nullptr);

src/config/configwindow.cpp

@@ -16,24 +16,26 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "configwindow.h"
-#include "src/utils/colorutils.h"
-#include "src/utils/confighandler.h"
-#include "src/utils/pathinfo.h"
-#include "src/widgets/capture/capturebutton.h"
-#include "src/config/geneneralconf.h"
 #include "src/config/filenameeditor.h"
+#include "src/config/geneneralconf.h"
 #include "src/config/strftimechooserwidget.h"
 #include "src/config/visualseditor.h"
+#include "src/utils/colorutils.h"
+#include "src/utils/confighandler.h"
 #include "src/utils/globalvalues.h"
-#include <QIcon>
+#include "src/utils/pathinfo.h"
-#include <QVBoxLayout>
+#include "src/widgets/capture/capturebutton.h"
-#include <QLabel>
-#include <QKeyEvent>
 #include <QFileSystemWatcher>
+#include <QIcon>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QVBoxLayout>
 
 // ConfigWindow contains the menus where you can configure the application
 
-ConfigWindow::ConfigWindow(QWidget *parent) : QTabWidget(parent) {
+ConfigWindow::ConfigWindow(QWidget* parent)
+  : QTabWidget(parent)
+{
   setAttribute(Qt::WA_DeleteOnClose);
   const int size = GlobalValues::buttonBaseSize() * 12;
   setMinimumSize(size, size);
@@ -49,39 +51,45 @@ ConfigWindow::ConfigWindow(QWidget *parent) : QTabWidget(parent) {
   };
   m_configWatcher = new QFileSystemWatcher(this);
   m_configWatcher->addPath(ConfigHandler().configFilePath());
-    connect(m_configWatcher, &QFileSystemWatcher::fileChanged,
+  connect(m_configWatcher, &QFileSystemWatcher::fileChanged, this, changedSlot);
-            this, changedSlot);
 
   QColor background = this->palette().window().color();
   bool isDark = ColorUtils::colorIsDark(background);
-    QString modifier = isDark ? PathInfo::whiteIconPath() :
+  QString modifier =
-                                PathInfo::blackIconPath();
+    isDark ? PathInfo::whiteIconPath() : PathInfo::blackIconPath();
 
   // visuals
   m_visuals = new VisualsEditor();
-    addTab(m_visuals, QIcon(modifier + "graphics.svg"),
+  addTab(m_visuals, QIcon(modifier + "graphics.svg"), tr("Interface"));
-           tr("Interface"));
 
   // filename
   m_filenameEditor = new FileNameEditor();
-    addTab(m_filenameEditor, QIcon(modifier + "name_edition.svg"),
+  addTab(m_filenameEditor,
+         QIcon(modifier + "name_edition.svg"),
          tr("Filename Editor"));
 
   // general
   m_generalConfig = new GeneneralConf();
-    addTab(m_generalConfig, QIcon(modifier + "config.svg"),
+  addTab(m_generalConfig, QIcon(modifier + "config.svg"), tr("General"));
-           tr("General"));
 
   // connect update sigslots
-    connect(this, &ConfigWindow::updateChildren,
+  connect(this,
-            m_filenameEditor, &FileNameEditor::updateComponents);
+          &ConfigWindow::updateChildren,
-    connect(this, &ConfigWindow::updateChildren,
+          m_filenameEditor,
-            m_visuals, &VisualsEditor::updateComponents);
+          &FileNameEditor::updateComponents);
-    connect(this, &ConfigWindow::updateChildren,
+  connect(this,
-            m_generalConfig, &GeneneralConf::updateComponents);
+          &ConfigWindow::updateChildren,
+          m_visuals,
+          &VisualsEditor::updateComponents);
+  connect(this,
+          &ConfigWindow::updateChildren,
+          m_generalConfig,
+          &GeneneralConf::updateComponents);
 }
 
-void ConfigWindow::keyPressEvent(QKeyEvent *e) {
+void
+ConfigWindow::keyPressEvent(QKeyEvent* e)
+{
   if (e->key() == Qt::Key_Escape) {
     close();
   }

src/config/configwindow.h

@@ -24,7 +24,8 @@ class GeneneralConf;
 class QFileSystemWatcher;
 class VisualsEditor;
 
-class ConfigWindow : public QTabWidget {
+class ConfigWindow : public QTabWidget
+{
   Q_OBJECT
 public:
   explicit ConfigWindow(QWidget* parent = nullptr);

src/config/extendedslider.cpp

@@ -20,31 +20,38 @@
 ExtendedSlider::ExtendedSlider(QWidget* parent)
   : QSlider(parent)
 {
-    connect(this, &ExtendedSlider::valueChanged,
+  connect(
-            this, &ExtendedSlider::updateTooltip);
+    this, &ExtendedSlider::valueChanged, this, &ExtendedSlider::updateTooltip);
-    connect(this, &ExtendedSlider::sliderMoved,
+  connect(this, &ExtendedSlider::sliderMoved, this, &ExtendedSlider::fireTimer);
-            this, &ExtendedSlider::fireTimer);
   m_timer.setSingleShot(true);
-    connect(&m_timer, &QTimer::timeout,
+  connect(
-            this, &ExtendedSlider::modificationsEnded);
+    &m_timer, &QTimer::timeout, this, &ExtendedSlider::modificationsEnded);
 }
 
-int ExtendedSlider::mappedValue(int min, int max) {
+int
+ExtendedSlider::mappedValue(int min, int max)
+{
   qreal progress =
     ((value() - minimum())) / static_cast<qreal>(maximum() - minimum());
   return min + (max - min) * progress;
 }
 
-void ExtendedSlider::setMapedValue(int min, int val, int max) {
+void
+ExtendedSlider::setMapedValue(int min, int val, int max)
+{
   qreal progress = ((val - min) + 1) / static_cast<qreal>(max - min);
   int value = minimum() + (maximum() - minimum()) * progress;
   setValue(value);
 }
 
-void ExtendedSlider::updateTooltip() {
+void
+ExtendedSlider::updateTooltip()
+{
   setToolTip(QString::number(value()) + "%");
 }
 
-void ExtendedSlider::fireTimer() {
+void
+ExtendedSlider::fireTimer()
+{
   m_timer.start(500);
 }

src/config/extendedslider.h

@@ -20,7 +20,8 @@
 #include <QSlider>
 #include <QTimer>
 
-class ExtendedSlider : public QSlider {
+class ExtendedSlider : public QSlider
+{
   Q_OBJECT
 public:
   explicit ExtendedSlider(QWidget* parent = nullptr);

src/config/filenameeditor.cpp

@@ -16,21 +16,25 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "filenameeditor.h"
-#include "src/utils/filenamehandler.h"
-#include "src/utils/confighandler.h"
 #include "src/config/strftimechooserwidget.h"
-#include <QVBoxLayout>
+#include "src/utils/confighandler.h"
+#include "src/utils/filenamehandler.h"
 #include <QHBoxLayout>
-#include <QLineEdit>
 #include <QLabel>
+#include <QLineEdit>
 #include <QPushButton>
+#include <QVBoxLayout>
 
-FileNameEditor::FileNameEditor(QWidget *parent) : QWidget(parent) {
+FileNameEditor::FileNameEditor(QWidget* parent)
+  : QWidget(parent)
+{
   initWidgets();
   initLayout();
 }
 
-void FileNameEditor::initLayout() {
+void
+FileNameEditor::initLayout()
+{
   m_layout = new QVBoxLayout(this);
   auto infoLabel = new QLabel(tr("Edit the name of your captures:"), this);
   infoLabel->setFixedHeight(20);
@@ -48,7 +52,9 @@ void FileNameEditor::initLayout() {
   m_layout->addLayout(horizLayout);
 }
 
-void FileNameEditor::initWidgets() {
+void
+FileNameEditor::initWidgets()
+{
   m_nameHandler = new FileNameHandler(this);
 
   // editor
@@ -65,51 +71,67 @@ void FileNameEditor::initWidgets() {
   pal.setColor(QPalette::Active, m_outputLabel->backgroundRole(), color);
   m_outputLabel->setPalette(pal);
 
-    connect(m_nameEditor, &QLineEdit::textChanged, this,
+  connect(m_nameEditor,
+          &QLineEdit::textChanged,
+          this,
           &FileNameEditor::showParsedPattern);
   updateComponents();
 
   // helper buttons
   m_helperButtons = new StrftimeChooserWidget(this);
-    connect(m_helperButtons, &StrftimeChooserWidget::variableEmitted,
+  connect(m_helperButtons,
-            this, &FileNameEditor::addToNameEditor);
+          &StrftimeChooserWidget::variableEmitted,
+          this,
+          &FileNameEditor::addToNameEditor);
 
   // save
   m_saveButton = new QPushButton(tr("Save"), this);
-    connect(m_saveButton, &QPushButton::clicked, this, &FileNameEditor::savePattern);
+  connect(
+    m_saveButton, &QPushButton::clicked, this, &FileNameEditor::savePattern);
   m_saveButton->setToolTip(tr("Saves the pattern"));
   // reset
   m_resetButton = new QPushButton(tr("Reset"), this);
-    connect(m_resetButton, &QPushButton::clicked,
+  connect(
-            this, &FileNameEditor::resetName);
+    m_resetButton, &QPushButton::clicked, this, &FileNameEditor::resetName);
   m_resetButton->setToolTip(tr("Restores the saved pattern"));
   // clear
   m_clearButton = new QPushButton(tr("Clear"), this);
-    connect(m_clearButton, &QPushButton::clicked, this,
+  connect(m_clearButton, &QPushButton::clicked, this, [this]() {
-            [this](){ m_nameEditor->setText(QString());
+    m_nameEditor->setText(QString());
   });
-    m_clearButton->setToolTip(tr("Deletes the name"));}
+  m_clearButton->setToolTip(tr("Deletes the name"));
+}
 
-void FileNameEditor::savePattern() {
+void
+FileNameEditor::savePattern()
+{
   QString pattern = m_nameEditor->text();
   m_nameHandler->setPattern(pattern);
 }
 
-void FileNameEditor::showParsedPattern(const QString &p) {
+void
+FileNameEditor::showParsedPattern(const QString& p)
+{
   QString output = m_nameHandler->parseFilename(p);
   m_outputLabel->setText(output);
 }
 
-void FileNameEditor::resetName() {
+void
+FileNameEditor::resetName()
+{
   m_nameEditor->setText(ConfigHandler().filenamePatternValue());
 }
 
-void FileNameEditor::addToNameEditor(QString s) {
+void
+FileNameEditor::addToNameEditor(QString s)
+{
   m_nameEditor->setText(m_nameEditor->text() + s);
   m_nameEditor->setFocus();
 }
 
-void FileNameEditor::updateComponents() {
+void
+FileNameEditor::updateComponents()
+{
   m_nameEditor->setText(ConfigHandler().filenamePatternValue());
   m_outputLabel->setText(m_nameHandler->parsedPattern());
 }

src/config/filenameeditor.h

@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include <QWidget>
 #include <QPointer>
+#include <QWidget>
 
 class QVBoxLayout;
 class QLineEdit;
@@ -26,7 +26,8 @@ class FileNameHandler;
 class QPushButton;
 class StrftimeChooserWidget;
 
-class FileNameEditor : public QWidget {
+class FileNameEditor : public QWidget
+{
   Q_OBJECT
 public:
   explicit FileNameEditor(QWidget* parent = nullptr);

src/config/geneneralconf.cpp

@@ -16,20 +16,21 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "geneneralconf.h"
-#include "src/utils/confighandler.h"
-#include "src/utils/confighandler.h"
 #include "src/core/controller.h"
-#include <QVBoxLayout>
+#include "src/utils/confighandler.h"
-#include <QHBoxLayout>
 #include <QCheckBox>
-#include <QPushButton>
-#include <QMessageBox>
-#include <QFileDialog>
 #include <QFile>
-#include <QTextCodec>
+#include <QFileDialog>
 #include <QGroupBox>
+#include <QHBoxLayout>
+#include <QMessageBox>
+#include <QPushButton>
+#include <QTextCodec>
+#include <QVBoxLayout>
 
-GeneneralConf::GeneneralConf(QWidget *parent) : QWidget(parent) {
+GeneneralConf::GeneneralConf(QWidget* parent)
+  : QWidget(parent)
+{
   m_layout = new QVBoxLayout(this);
   m_layout->setAlignment(Qt::AlignTop);
   initShowHelp();
@@ -44,28 +45,37 @@ GeneneralConf::GeneneralConf(QWidget *parent) : QWidget(parent) {
   updateComponents();
 }
 
-void GeneneralConf::updateComponents() {
+void
+GeneneralConf::updateComponents()
+{
   ConfigHandler config;
   m_helpMessage->setChecked(config.showHelpValue());
   m_sysNotifications->setChecked(config.desktopNotificationValue());
   m_autostart->setChecked(config.startupLaunchValue());
   m_closeAfterCapture->setChecked(config.closeAfterScreenshotValue());
-    m_copyAndCloseAfterUpload->setChecked(config.copyAndCloseAfterUploadEnabled());
+  m_copyAndCloseAfterUpload->setChecked(
+    config.copyAndCloseAfterUploadEnabled());
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
   m_showTray->setChecked(!config.disabledTrayIconValue());
 #endif
 }
 
-void GeneneralConf::showHelpChanged(bool checked) {
+void
+GeneneralConf::showHelpChanged(bool checked)
+{
   ConfigHandler().setShowHelp(checked);
 }
 
-void GeneneralConf::showDesktopNotificationChanged(bool checked) {
+void
+GeneneralConf::showDesktopNotificationChanged(bool checked)
+{
   ConfigHandler().setDesktopNotification(checked);
 }
 
-void GeneneralConf::showTrayIconChanged(bool checked) {
+void
+GeneneralConf::showTrayIconChanged(bool checked)
+{
   auto controller = Controller::getInstance();
   if (checked) {
     controller->enableTrayIcon();
@@ -74,15 +84,21 @@ void GeneneralConf::showTrayIconChanged(bool checked) {
   }
 }
 
-void GeneneralConf::autostartChanged(bool checked) {
+void
+GeneneralConf::autostartChanged(bool checked)
+{
   ConfigHandler().setStartupLaunch(checked);
 }
 
-void GeneneralConf::closeAfterCaptureChanged(bool checked) {
+void
+GeneneralConf::closeAfterCaptureChanged(bool checked)
+{
   ConfigHandler().setCloseAfterScreenshot(checked);
 }
 
-void GeneneralConf::importConfiguration() {
+void
+GeneneralConf::importConfiguration()
+{
   QString fileName = QFileDialog::getOpenFileName(this, tr("Import"));
   if (fileName.isEmpty()) {
     return;
@@ -105,9 +121,11 @@ void GeneneralConf::importConfiguration() {
   config.close();
 }
 
-void GeneneralConf::exportFileConfiguration() {
+void
-    QString fileName = QFileDialog::getSaveFileName(this, tr("Save File"),
+GeneneralConf::exportFileConfiguration()
-                               QStringLiteral("flameshot.conf"));
+{
+  QString fileName = QFileDialog::getSaveFileName(
+    this, tr("Save File"), QStringLiteral("flameshot.conf"));
 
   // Cancel button
   if (fileName.isNull()) {
@@ -124,10 +142,13 @@ void GeneneralConf::exportFileConfiguration() {
   }
 }
 
-void GeneneralConf::resetConfiguration() {
+void
+GeneneralConf::resetConfiguration()
+{
   QMessageBox::StandardButton reply;
   reply = QMessageBox::question(
-              this, tr("Confirm Reset"),
+    this,
+    tr("Confirm Reset"),
     tr("Are you sure you want to reset the configuration?"),
     QMessageBox::Yes | QMessageBox::No);
   if (reply == QMessageBox::Yes) {
@@ -135,8 +156,9 @@ void GeneneralConf::resetConfiguration() {
   }
 }
 
-
+void
-void GeneneralConf::initShowHelp() {
+GeneneralConf::initShowHelp()
+{
   m_helpMessage = new QCheckBox(tr("Show help message"), this);
   ConfigHandler config;
   bool checked = config.showHelpValue();
@@ -145,24 +167,29 @@ void GeneneralConf::initShowHelp() {
                                "in the capture mode."));
   m_layout->addWidget(m_helpMessage);
 
-    connect(m_helpMessage, &QCheckBox::clicked, this,
+  connect(
-            &GeneneralConf::showHelpChanged);
+    m_helpMessage, &QCheckBox::clicked, this, &GeneneralConf::showHelpChanged);
 }
 
-void GeneneralConf::initShowDesktopNotification() {
+void
-    m_sysNotifications =
+GeneneralConf::initShowDesktopNotification()
-            new QCheckBox(tr("Show desktop notifications"), this);
+{
+  m_sysNotifications = new QCheckBox(tr("Show desktop notifications"), this);
   ConfigHandler config;
   bool checked = config.desktopNotificationValue();
   m_sysNotifications->setChecked(checked);
   m_sysNotifications->setToolTip(tr("Show desktop notifications"));
   m_layout->addWidget(m_sysNotifications);
 
-    connect(m_sysNotifications, &QCheckBox::clicked, this,
+  connect(m_sysNotifications,
+          &QCheckBox::clicked,
+          this,
           &GeneneralConf::showDesktopNotificationChanged);
 }
 
-void GeneneralConf::initShowTrayIcon() {
+void
+GeneneralConf::initShowTrayIcon()
+{
 #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
   m_showTray = new QCheckBox(tr("Show tray icon"), this);
   ConfigHandler config;
@@ -171,12 +198,16 @@ void GeneneralConf::initShowTrayIcon() {
   m_showTray->setToolTip(tr("Show the systemtray icon"));
   m_layout->addWidget(m_showTray);
 
-    connect(m_showTray, &QCheckBox::stateChanged, this,
+  connect(m_showTray,
+          &QCheckBox::stateChanged,
+          this,
           &GeneneralConf::showTrayIconChanged);
 #endif
 }
 
-void GeneneralConf::initConfingButtons() {
+void
+GeneneralConf::initConfingButtons()
+{
   QHBoxLayout* buttonLayout = new QHBoxLayout();
   m_layout->addStretch();
   QGroupBox* box = new QGroupBox(tr("Configuration File"));
@@ -186,34 +217,43 @@ void GeneneralConf::initConfingButtons() {
 
   m_exportButton = new QPushButton(tr("Export"));
   buttonLayout->addWidget(m_exportButton);
-    connect(m_exportButton, &QPushButton::clicked, this,
+  connect(m_exportButton,
+          &QPushButton::clicked,
+          this,
           &GeneneralConf::exportFileConfiguration);
 
   m_importButton = new QPushButton(tr("Import"));
   buttonLayout->addWidget(m_importButton);
-    connect(m_importButton, &QPushButton::clicked, this,
+  connect(m_importButton,
+          &QPushButton::clicked,
+          this,
           &GeneneralConf::importConfiguration);
 
   m_resetButton = new QPushButton(tr("Reset"));
   buttonLayout->addWidget(m_resetButton);
-    connect(m_resetButton, &QPushButton::clicked, this,
+  connect(m_resetButton,
+          &QPushButton::clicked,
+          this,
           &GeneneralConf::resetConfiguration);
 }
 
-void GeneneralConf::initAutostart() {
+void
-    m_autostart =
+GeneneralConf::initAutostart()
-            new QCheckBox(tr("Launch at startup"), this);
+{
+  m_autostart = new QCheckBox(tr("Launch at startup"), this);
   ConfigHandler config;
   bool checked = config.startupLaunchValue();
   m_autostart->setChecked(checked);
   m_autostart->setToolTip(tr("Launch Flameshot"));
   m_layout->addWidget(m_autostart);
 
-    connect(m_autostart, &QCheckBox::clicked, this,
+  connect(
-            &GeneneralConf::autostartChanged);
+    m_autostart, &QCheckBox::clicked, this, &GeneneralConf::autostartChanged);
 }
 
-void GeneneralConf::initCloseAfterCapture() {
+void
+GeneneralConf::initCloseAfterCapture()
+{
   m_closeAfterCapture = new QCheckBox(tr("Close after capture"), this);
   ConfigHandler config;
   bool checked = config.closeAfterScreenshotValue();
@@ -221,16 +261,21 @@ void GeneneralConf::initCloseAfterCapture() {
   m_closeAfterCapture->setToolTip(tr("Close after taking a screenshot"));
   m_layout->addWidget(m_closeAfterCapture);
 
-    connect(m_closeAfterCapture, &QCheckBox::clicked, this,
+  connect(m_closeAfterCapture,
+          &QCheckBox::clicked,
+          this,
           &GeneneralConf::closeAfterCaptureChanged);
 }
 
-void GeneneralConf::initCopyAndCloseAfterUpload()
+void
+GeneneralConf::initCopyAndCloseAfterUpload()
 {
   m_copyAndCloseAfterUpload = new QCheckBox(tr("Copy URL after upload"), this);
   ConfigHandler config;
-    m_copyAndCloseAfterUpload->setChecked(config.copyAndCloseAfterUploadEnabled());
+  m_copyAndCloseAfterUpload->setChecked(
-    m_copyAndCloseAfterUpload->setToolTip(tr("Copy URL and close window after upload"));
+    config.copyAndCloseAfterUploadEnabled());
+  m_copyAndCloseAfterUpload->setToolTip(
+    tr("Copy URL and close window after upload"));
   m_layout->addWidget(m_copyAndCloseAfterUpload);
 
   connect(m_copyAndCloseAfterUpload, &QCheckBox::clicked, [](bool checked) {

src/config/geneneralconf.h

@@ -23,7 +23,8 @@ class QVBoxLayout;
 class QCheckBox;
 class QPushButton;
 
-class GeneneralConf : public QWidget {
+class GeneneralConf : public QWidget
+{
   Q_OBJECT
 public:
   explicit GeneneralConf(QWidget* parent = nullptr);

src/config/strftimechooserwidget.cpp

@@ -16,11 +16,13 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "strftimechooserwidget.h"
-#include <QMap>
 #include <QGridLayout>
+#include <QMap>
 #include <QPushButton>
 
-StrftimeChooserWidget::StrftimeChooserWidget(QWidget *parent) : QWidget(parent) {
+StrftimeChooserWidget::StrftimeChooserWidget(QWidget* parent)
+  : QWidget(parent)
+{
   QGridLayout* layout = new QGridLayout(this);
   auto k = m_buttonData.keys();
   int middle = k.length() / 2;
@@ -36,8 +38,9 @@ StrftimeChooserWidget::StrftimeChooserWidget(QWidget *parent) : QWidget(parent)
       button->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
       button->setMinimumHeight(25);
       layout->addWidget(button, j, i);
-            connect(button, &QPushButton::clicked,
+      connect(button, &QPushButton::clicked, this, [variable, this]() {
-                    this, [variable, this](){emit variableEmitted(variable);});
+        emit variableEmitted(variable);
+      });
     }
   }
   setLayout(layout);

src/config/strftimechooserwidget.h

@@ -19,7 +19,8 @@
 
 #include <QWidget>
 
-class StrftimeChooserWidget : public QWidget {
+class StrftimeChooserWidget : public QWidget
+{
   Q_OBJECT
 public:
   explicit StrftimeChooserWidget(QWidget* parent = nullptr);

src/config/uicoloreditor.cpp

@@ -15,18 +15,20 @@
 //     You should have received a copy of the GNU General Public License
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "src/utils/confighandler.h"
 #include "uicoloreditor.h"
 #include "clickablelabel.h"
+#include "src/utils/confighandler.h"
 #include "src/utils/globalvalues.h"
-#include <QHBoxLayout>
 #include <QApplication>
-#include <QVBoxLayout>
 #include <QComboBox>
+#include <QHBoxLayout>
 #include <QMap>
 #include <QSpacerItem>
+#include <QVBoxLayout>
 
-UIcolorEditor::UIcolorEditor(QWidget *parent) : QGroupBox(parent) {
+UIcolorEditor::UIcolorEditor(QWidget* parent)
+  : QGroupBox(parent)
+{
   setTitle(tr("UI Color Editor"));
   setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
   m_hLayout = new QHBoxLayout;
@@ -46,7 +48,9 @@ UIcolorEditor::UIcolorEditor(QWidget *parent) : QGroupBox(parent) {
   updateComponents();
 }
 
-void UIcolorEditor::updateComponents() {
+void
+UIcolorEditor::updateComponents()
+{
   ConfigHandler config;
   m_uiColor = config.uiMainColorValue();
   m_contrastColor = config.uiContrastColorValue();
@@ -60,7 +64,9 @@ void UIcolorEditor::updateComponents() {
 }
 
 // updateUIcolor updates the appearance of the buttons
-void UIcolorEditor::updateUIcolor() {
+void
+UIcolorEditor::updateUIcolor()
+{
   ConfigHandler config;
   if (m_lastButtonPressed == m_buttonMainColor) {
     config.setUIMainColor(m_uiColor);
@@ -70,7 +76,9 @@ void UIcolorEditor::updateUIcolor() {
 }
 
 // updateLocalColor updates the local button
-void UIcolorEditor::updateLocalColor(const QColor c) {
+void
+UIcolorEditor::updateLocalColor(const QColor c)
+{
   if (m_lastButtonPressed == m_buttonMainColor) {
     m_uiColor = c;
   } else {
@@ -79,11 +87,17 @@ void UIcolorEditor::updateLocalColor(const QColor c) {
   m_lastButtonPressed->setColor(c);
 }
 
-void UIcolorEditor::initColorWheel() {
+void
+UIcolorEditor::initColorWheel()
+{
   m_colorWheel = new color_widgets::ColorWheel(this);
-    connect(m_colorWheel, &color_widgets::ColorWheel::mouseReleaseOnColor, this,
+  connect(m_colorWheel,
+          &color_widgets::ColorWheel::mouseReleaseOnColor,
+          this,
           &UIcolorEditor::updateUIcolor);
-    connect(m_colorWheel, &color_widgets::ColorWheel::colorChanged, this,
+  connect(m_colorWheel,
+          &color_widgets::ColorWheel::colorChanged,
+          this,
           &UIcolorEditor::updateLocalColor);
 
   const int size = GlobalValues::buttonBaseSize() * 3;
@@ -96,7 +110,9 @@ void UIcolorEditor::initColorWheel() {
   m_hLayout->addWidget(m_colorWheel);
 }
 
-void UIcolorEditor::initButtons() {
+void
+UIcolorEditor::initButtons()
+{
   const int extraSize = GlobalValues::buttonBaseSize() / 3;
   int frameSize = GlobalValues::buttonBaseSize() + extraSize;
 
@@ -106,7 +122,8 @@ void UIcolorEditor::initButtons() {
   frame->setFixedSize(frameSize, frameSize);
 
   m_buttonMainColor = new CaptureButton(m_buttonIconType, frame);
-    m_buttonMainColor->move(m_buttonMainColor->x() + extraSize/2, m_buttonMainColor->y() + extraSize/2);
+  m_buttonMainColor->move(m_buttonMainColor->x() + extraSize / 2,
+                          m_buttonMainColor->y() + extraSize / 2);
   QHBoxLayout* h1 = new QHBoxLayout();
   h1->addWidget(frame);
   m_labelMain = new ClickableLabel(tr("Main Color"), this);
@@ -132,20 +149,28 @@ void UIcolorEditor::initButtons() {
   m_buttonContrast->setToolTip(tr("Click on this button to set the edition"
                                   " mode of the contrast color."));
 
-    connect(m_buttonMainColor, &CaptureButton::pressedButton,
+  connect(m_buttonMainColor,
-            this, &UIcolorEditor::changeLastButton);
+          &CaptureButton::pressedButton,
-    connect(m_buttonContrast, &CaptureButton::pressedButton,
+          this,
-            this, &UIcolorEditor::changeLastButton);
+          &UIcolorEditor::changeLastButton);
+  connect(m_buttonContrast,
+          &CaptureButton::pressedButton,
+          this,
+          &UIcolorEditor::changeLastButton);
   // clicking the labels changes the button too
-    connect(m_labelMain, &ClickableLabel::clicked,
+  connect(m_labelMain, &ClickableLabel::clicked, this, [this] {
-            this, [this]{ changeLastButton(m_buttonMainColor); });
+    changeLastButton(m_buttonMainColor);
-    connect(m_labelContrast, &ClickableLabel::clicked,
+  });
-            this, [this]{ changeLastButton(m_buttonContrast); });
+  connect(m_labelContrast, &ClickableLabel::clicked, this, [this] {
+    changeLastButton(m_buttonContrast);
+  });
   m_lastButtonPressed = m_buttonMainColor;
 }
 
 // visual update for the selected button
-void UIcolorEditor::changeLastButton(CaptureButton *b) {
+void
+UIcolorEditor::changeLastButton(CaptureButton* b)
+{
   if (m_lastButtonPressed != b) {
     m_lastButtonPressed = b;
 

src/config/uicoloreditor.h

@@ -26,7 +26,8 @@ class QHBoxLayout;
 class CaptureButton;
 class ClickableLabel;
 
-class UIcolorEditor : public QGroupBox {
+class UIcolorEditor : public QGroupBox
+{
   Q_OBJECT
 public:
   explicit UIcolorEditor(QWidget* parent = nullptr);
@@ -48,7 +49,8 @@ private:
   CaptureButton* m_lastButtonPressed;
   color_widgets::ColorWheel* m_colorWheel;
 
-    static const CaptureButton::ButtonType m_buttonIconType = CaptureButton::TYPE_CIRCLE;
+  static const CaptureButton::ButtonType m_buttonIconType =
+    CaptureButton::TYPE_CIRCLE;
 
   QHBoxLayout* m_hLayout;
   QVBoxLayout* m_vLayout;

src/config/visualseditor.cpp

@@ -17,33 +17,41 @@
 
 #include "visualseditor.h"
 #include "src/config/buttonlistview.h"
+#include "src/config/extendedslider.h"
 #include "src/config/uicoloreditor.h"
 #include "src/utils/confighandler.h"
-#include "src/config/extendedslider.h"
+#include <QHBoxLayout>
 #include <QLabel>
 #include <QVBoxLayout>
-#include <QHBoxLayout>
 
-VisualsEditor::VisualsEditor(QWidget *parent) : QWidget(parent) {
+VisualsEditor::VisualsEditor(QWidget* parent)
+  : QWidget(parent)
+{
   m_layout = new QVBoxLayout();
   setLayout(m_layout);
   initWidgets();
 }
 
-void VisualsEditor::updateComponents() {
+void
+VisualsEditor::updateComponents()
+{
   m_buttonList->updateComponents();
   m_colorEditor->updateComponents();
   int opacity = ConfigHandler().contrastOpacityValue();
   m_opacitySlider->setMapedValue(0, opacity, 255);
 }
 
-void VisualsEditor::initOpacitySlider() {
+void
+VisualsEditor::initOpacitySlider()
+{
   m_opacitySlider = new ExtendedSlider();
   m_opacitySlider->setFocusPolicy(Qt::NoFocus);
   m_opacitySlider->setOrientation(Qt::Horizontal);
   m_opacitySlider->setRange(0, 100);
-    connect(m_opacitySlider, &ExtendedSlider::modificationsEnded,
+  connect(m_opacitySlider,
-            this, &VisualsEditor::saveOpacity);
+          &ExtendedSlider::modificationsEnded,
+          this,
+          &VisualsEditor::saveOpacity);
   QHBoxLayout* localLayout = new QHBoxLayout();
   localLayout->addWidget(new QLabel(QStringLiteral("0%")));
   localLayout->addWidget(m_opacitySlider);
@@ -51,10 +59,10 @@ void VisualsEditor::initOpacitySlider() {
 
   QLabel* label = new QLabel();
   QString labelMsg = tr("Opacity of area outside selection:") + " %1%";
-    connect(m_opacitySlider, &ExtendedSlider::valueChanged,
+  connect(m_opacitySlider,
-            this, [labelMsg, label](int val){
+          &ExtendedSlider::valueChanged,
-        label->setText(labelMsg.arg(val));
+          this,
-    });
+          [labelMsg, label](int val) { label->setText(labelMsg.arg(val)); });
   m_layout->addWidget(label);
   m_layout->addLayout(localLayout);
 
@@ -62,12 +70,16 @@ void VisualsEditor::initOpacitySlider() {
   m_opacitySlider->setMapedValue(0, opacity, 255);
 }
 
-void VisualsEditor::saveOpacity() {
+void
+VisualsEditor::saveOpacity()
+{
   int value = m_opacitySlider->mappedValue(0, 255);
   ConfigHandler().setContrastOpacity(value);
 }
 
-void VisualsEditor::initWidgets() {
+void
+VisualsEditor::initWidgets()
+{
   m_colorEditor = new UIcolorEditor();
   m_layout->addWidget(m_colorEditor);
 
@@ -81,7 +93,9 @@ void VisualsEditor::initWidgets() {
   listLayout->addWidget(m_buttonList);
 
   QPushButton* setAllButtons = new QPushButton(tr("Select All"));
-    connect(setAllButtons, &QPushButton::clicked,
+  connect(setAllButtons,
-            m_buttonList, &ButtonListView::selectAll);
+          &QPushButton::clicked,
+          m_buttonList,
+          &ButtonListView::selectAll);
   listLayout->addWidget(setAllButtons);
 }

src/config/visualseditor.h

@@ -24,7 +24,8 @@ class QVBoxLayout;
 class ButtonListView;
 class UIcolorEditor;
 
-class VisualsEditor : public QWidget {
+class VisualsEditor : public QWidget
+{
   Q_OBJECT
 public:
   explicit VisualsEditor(QWidget* parent = nullptr);

src/core/capturerequest.cpp

@@ -17,25 +17,33 @@
 
 #include "capturerequest.h"
 #include "src/utils/screenshotsaver.h"
-#include <QVector>
 #include <QDateTime>
+#include <QVector>
 
 CaptureRequest::CaptureRequest(CaptureRequest::CaptureMode mode,
-                               const uint delay, const QString &path,
+                               const uint delay,
+                               const QString& path,
                                const QVariant& data,
-                               CaptureRequest::ExportTask tasks) :
+                               CaptureRequest::ExportTask tasks)
-    m_mode(mode), m_delay(delay), m_path(path), m_tasks(tasks),
+  : m_mode(mode)
-    m_data(data), m_forcedID(false), m_id(0)
+  , m_delay(delay)
+  , m_path(path)
+  , m_tasks(tasks)
+  , m_data(data)
+  , m_forcedID(false)
+  , m_id(0)
+{}
+
+void
+CaptureRequest::setStaticID(uint id)
 {
-
-}
-
-void CaptureRequest::setStaticID(uint id) {
   m_forcedID = true;
   m_id = id;
 }
 
-uint CaptureRequest::id() const {
+uint
+CaptureRequest::id() const
+{
   if (m_forcedID) {
     return m_id;
   }
@@ -50,27 +58,39 @@ uint CaptureRequest::id() const {
   return id;
 }
 
-CaptureRequest::CaptureMode CaptureRequest::captureMode() const {
+CaptureRequest::CaptureMode
+CaptureRequest::captureMode() const
+{
   return m_mode;
 }
 
-uint CaptureRequest::delay() const {
+uint
+CaptureRequest::delay() const
+{
   return m_delay;
 }
 
-QString CaptureRequest::path() const {
+QString
+CaptureRequest::path() const
+{
   return m_path;
 }
 
-QVariant CaptureRequest::data() const {
+QVariant
+CaptureRequest::data() const
+{
   return m_data;
 }
 
-void CaptureRequest::addTask(CaptureRequest::ExportTask task) {
+void
+CaptureRequest::addTask(CaptureRequest::ExportTask task)
+{
   m_tasks |= task;
 }
 
-void CaptureRequest::exportCapture(const QPixmap &p) {
+void
+CaptureRequest::exportCapture(const QPixmap& p)
+{
   if ((m_tasks & ExportTask::FILESYSTEM_SAVE_TASK) != ExportTask::NO_TASK) {
     if (m_path.isEmpty()) {
       ScreenshotSaver().saveToFilesystemGUI(p);
@@ -82,5 +102,4 @@ void CaptureRequest::exportCapture(const QPixmap &p) {
   if ((m_tasks & ExportTask::CLIPBOARD_SAVE_TASK) != ExportTask::NO_TASK) {
     ScreenshotSaver().saveToClipboard(p);
   }
-
 }

src/core/capturerequest.h

@@ -17,19 +17,22 @@
 
 #pragma once
 
-#include <QString>
 #include <QPixmap>
+#include <QString>
 #include <QVariant>
 
-class CaptureRequest {
+class CaptureRequest
+{
 public:
-    enum CaptureMode {
+  enum CaptureMode
+  {
     FULLSCREEN_MODE,
     GRAPHICAL_MODE,
     SCREEN_MODE,
   };
 
-    enum ExportTask {
+  enum ExportTask
+  {
     NO_TASK = 0,
     CLIPBOARD_SAVE_TASK = 1,
     FILESYSTEM_SAVE_TASK = 2,
@@ -65,16 +68,21 @@ private:
 
 using eTask = CaptureRequest::ExportTask;
 
-inline eTask operator|(const eTask &a, const eTask &b) {
+inline eTask
+operator|(const eTask& a, const eTask& b)
+{
   return static_cast<eTask>(static_cast<int>(a) | static_cast<int>(b));
 }
 
-inline eTask operator&(const eTask &a, const eTask &b) {
+inline eTask
+operator&(const eTask& a, const eTask& b)
+{
   return static_cast<eTask>(static_cast<int>(a) & static_cast<int>(b));
 }
 
-inline eTask& operator|=(eTask &a, const eTask &b) {
+inline eTask&
+operator|=(eTask& a, const eTask& b)
+{
   a = static_cast<eTask>(static_cast<int>(a) | static_cast<int>(b));
   return a;
 }
-

src/core/controller.cpp

@@ -16,20 +16,20 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "controller.h"
-#include "src/widgets/capture/capturewidget.h"
-#include "src/utils/confighandler.h"
-#include "src/widgets/infowindow.h"
 #include "src/config/configwindow.h"
-#include "src/widgets/capture/capturebutton.h"
+#include "src/utils/confighandler.h"
-#include "src/widgets/capturelauncher.h"
-#include "src/utils/systemnotification.h"
 #include "src/utils/screengrabber.h"
-#include <QFile>
+#include "src/utils/systemnotification.h"
-#include <QApplication>
+#include "src/widgets/capture/capturebutton.h"
-#include <QSystemTrayIcon>
+#include "src/widgets/capture/capturewidget.h"
+#include "src/widgets/capturelauncher.h"
+#include "src/widgets/infowindow.h"
 #include <QAction>
-#include <QMenu>
+#include <QApplication>
 #include <QDesktopWidget>
+#include <QFile>
+#include <QMenu>
+#include <QSystemTrayIcon>
 
 #ifdef Q_OS_WIN
 #include "src/core/globalshortcutfilter.h"
@@ -38,7 +38,9 @@
 // Controller is the core component of Flameshot, creates the trayIcon and
 // launches the capture widget
 
-Controller::Controller() : m_captureWindow(nullptr) {
+Controller::Controller()
+  : m_captureWindow(nullptr)
+{
   qApp->setQuitOnLastWindowClosed(false);
 
   // init tray icon
@@ -51,8 +53,7 @@ Controller::Controller() : m_captureWindow(nullptr) {
 
   GlobalShortcutFilter* nativeFilter = new GlobalShortcutFilter(this);
   qApp->installNativeEventFilter(nativeFilter);
-    connect(nativeFilter, &GlobalShortcutFilter::printPressed,
+  connect(nativeFilter, &GlobalShortcutFilter::printPressed, this, [this]() {
-            this, [this](){
     this->requestCapture(CaptureRequest(CaptureRequest::GRAPHICAL_MODE));
   });
 #endif
@@ -61,19 +62,25 @@ Controller::Controller() : m_captureWindow(nullptr) {
   qApp->setStyleSheet(StyleSheet);
 }
 
-Controller *Controller::getInstance() {
+Controller*
+Controller::getInstance()
+{
   static Controller c;
   return &c;
 }
 
-void Controller::enableExports() {
+void
-    connect(this, &Controller::captureTaken,
+Controller::enableExports()
-            this, &Controller::handleCaptureTaken);
+{
-    connect(this, &Controller::captureFailed,
+  connect(
-            this, &Controller::handleCaptureFailed);
+    this, &Controller::captureTaken, this, &Controller::handleCaptureTaken);
+  connect(
+    this, &Controller::captureFailed, this, &Controller::handleCaptureFailed);
 }
 
-void Controller::requestCapture(const CaptureRequest &request) {
+void
+Controller::requestCapture(const CaptureRequest& request)
+{
   uint id = request.id();
   m_requestMap.insert(id, request);
 
@@ -83,27 +90,32 @@ void Controller::requestCapture(const CaptureRequest &request) {
         this->startFullscreenCapture(id);
       });
       break;
-    // TODO: Figure out the code path that gets here so the deprated warning can be fixed
+    // TODO: Figure out the code path that gets here so the deprated warning can
+    // be fixed
     case CaptureRequest::SCREEN_MODE: {
       int&& number = request.data().toInt();
       doLater(request.delay(), this, [this, id, number]() {
         this->startScreenGrab(id, number);
       });
       break;
-    } case CaptureRequest::GRAPHICAL_MODE: {
+    }
+    case CaptureRequest::GRAPHICAL_MODE: {
       QString&& path = request.path();
       doLater(request.delay(), this, [this, id, path]() {
         this->startVisualCapture(id, path);
       });
       break;
-    } default:
+    }
+    default:
       emit captureFailed(id);
       break;
   }
 }
 
 // creation of a new capture in GUI mode
-void Controller::startVisualCapture(const uint id, const QString &forcedSavePath) {
+void
+Controller::startVisualCapture(const uint id, const QString& forcedSavePath)
+{
   if (!m_captureWindow) {
     QWidget* modalWidget = nullptr;
     do {
@@ -116,10 +128,14 @@ void Controller::startVisualCapture(const uint id, const QString &forcedSavePath
 
     m_captureWindow = new CaptureWidget(id, forcedSavePath);
     // m_captureWindow = new CaptureWidget(id, forcedSavePath, false); // debug
-        connect(m_captureWindow, &CaptureWidget::captureFailed,
+    connect(m_captureWindow,
-                this, &Controller::captureFailed);
+            &CaptureWidget::captureFailed,
-        connect(m_captureWindow, &CaptureWidget::captureTaken,
+            this,
-                this, &Controller::captureTaken);
+            &Controller::captureFailed);
+    connect(m_captureWindow,
+            &CaptureWidget::captureTaken,
+            this,
+            &Controller::captureTaken);
 
 #ifdef Q_OS_WIN
     m_captureWindow->show();
@@ -132,7 +148,9 @@ void Controller::startVisualCapture(const uint id, const QString &forcedSavePath
   }
 }
 
-void Controller::startScreenGrab(const uint id, const int screenNumber) {
+void
+Controller::startScreenGrab(const uint id, const int screenNumber)
+{
   bool ok = true;
   int n = screenNumber;
 
@@ -149,7 +167,9 @@ void Controller::startScreenGrab(const uint id, const int screenNumber) {
 }
 
 // creation of the configuration window
-void Controller::openConfigWindow() {
+void
+Controller::openConfigWindow()
+{
   if (!m_configWindow) {
     m_configWindow = new ConfigWindow();
     m_configWindow->show();
@@ -157,18 +177,24 @@ void Controller::openConfigWindow() {
 }
 
 // creation of the window of information
-void Controller::openInfoWindow() {
+void
+Controller::openInfoWindow()
+{
   if (!m_infoWindow) {
     m_infoWindow = new InfoWindow();
   }
 }
 
-void Controller::openLauncherWindow() {
+void
+Controller::openLauncherWindow()
+{
   CaptureLauncher* w = new CaptureLauncher();
   w->show();
 }
 
-void Controller::enableTrayIcon() {
+void
+Controller::enableTrayIcon()
+{
   if (m_trayIcon) {
     return;
   }
@@ -179,17 +205,15 @@ void Controller::enableTrayIcon() {
     doLater(400, this, [this]() { this->startVisualCapture(); });
   });
   QAction* launcherAction = new QAction(tr("&Open Launcher"), this);
-    connect(launcherAction, &QAction::triggered, this,
+  connect(
-            &Controller::openLauncherWindow);
+    launcherAction, &QAction::triggered, this, &Controller::openLauncherWindow);
   QAction* configAction = new QAction(tr("&Configuration"), this);
-    connect(configAction, &QAction::triggered, this,
+  connect(
-            &Controller::openConfigWindow);
+    configAction, &QAction::triggered, this, &Controller::openConfigWindow);
   QAction* infoAction = new QAction(tr("&Information"), this);
-    connect(infoAction, &QAction::triggered, this,
+  connect(infoAction, &QAction::triggered, this, &Controller::openInfoWindow);
-            &Controller::openInfoWindow);
   QAction* quitAction = new QAction(tr("&Quit"), this);
-    connect(quitAction, &QAction::triggered, qApp,
+  connect(quitAction, &QAction::triggered, qApp, &QCoreApplication::quit);
-            &QCoreApplication::quit);
 
   QMenu* trayIconMenu = new QMenu();
   trayIconMenu->addAction(captureAction);
@@ -203,7 +227,8 @@ void Controller::enableTrayIcon() {
   m_trayIcon = new QSystemTrayIcon();
   m_trayIcon->setToolTip(QStringLiteral("Flameshot"));
   m_trayIcon->setContextMenu(trayIconMenu);
-    QIcon trayicon = QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png"));
+  QIcon trayicon =
+    QIcon::fromTheme("flameshot-tray", QIcon(":img/app/flameshot.png"));
   m_trayIcon->setIcon(trayicon);
 
   auto trayIconActivated = [this](QSystemTrayIcon::ActivationReason r) {
@@ -215,7 +240,9 @@ void Controller::enableTrayIcon() {
   m_trayIcon->show();
 }
 
-void Controller::disableTrayIcon() {
+void
+Controller::disableTrayIcon()
+{
 #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
   if (m_trayIcon) {
     m_trayIcon->deleteLater();
@@ -224,8 +251,8 @@ void Controller::disableTrayIcon() {
 #endif
 }
 
-void Controller::sendTrayNotification(
+void
-        const QString &text,
+Controller::sendTrayNotification(const QString& text,
                                  const QString& title,
                                  const int timeout)
 {
@@ -234,13 +261,17 @@ void Controller::sendTrayNotification(
   }
 }
 
-void Controller::updateConfigComponents() {
+void
+Controller::updateConfigComponents()
+{
   if (m_configWindow) {
     m_configWindow->updateChildren();
   }
 }
 
-void Controller::startFullscreenCapture(const uint id) {
+void
+Controller::startFullscreenCapture(const uint id)
+{
   bool ok = true;
   QPixmap p(ScreenGrabber().grabEntireDesktop(ok));
   if (ok) {
@@ -250,7 +281,9 @@ void Controller::startFullscreenCapture(const uint id) {
   }
 }
 
-void Controller::handleCaptureTaken(uint id, QPixmap p) {
+void
+Controller::handleCaptureTaken(uint id, QPixmap p)
+{
   auto it = m_requestMap.find(id);
   if (it != m_requestMap.end()) {
     it.value().exportCapture(p);
@@ -261,7 +294,9 @@ void Controller::handleCaptureTaken(uint id, QPixmap p) {
   }
 }
 
-void Controller::handleCaptureFailed(uint id) {
+void
+Controller::handleCaptureFailed(uint id)
+{
   m_requestMap.remove(id);
 
   if (ConfigHandler().closeAfterScreenshotValue()) {
@@ -269,10 +304,14 @@ void Controller::handleCaptureFailed(uint id) {
   }
 }
 
-void Controller::doLater(int msec, QObject *receiver, lambda func)  {
+void
+Controller::doLater(int msec, QObject* receiver, lambda func)
+{
   QTimer* timer = new QTimer(receiver);
-    QObject::connect(timer, &QTimer::timeout, receiver,
+  QObject::connect(timer, &QTimer::timeout, receiver, [timer, func]() {
-                     [timer, func](){ func(); timer->deleteLater(); });
+    func();
+    timer->deleteLater();
+  });
   timer->setInterval(msec);
   timer->start();
 }

src/core/controller.h

@@ -18,10 +18,10 @@
 #pragma once
 
 #include "src/core/capturerequest.h"
-#include <QObject>
-#include <QPointer>
-#include <QPixmap>
 #include <QMap>
+#include <QObject>
+#include <QPixmap>
+#include <QPointer>
 #include <QTimer>
 #include <functional>
 
@@ -32,7 +32,8 @@ class QSystemTrayIcon;
 
 using lambda = std::function<void(void)>;
 
-class Controller : public QObject {
+class Controller : public QObject
+{
   Q_OBJECT
 
 public:
@@ -55,7 +56,8 @@ public slots:
   void openLauncherWindow();
   void enableTrayIcon();
   void disableTrayIcon();
-    void sendTrayNotification(const QString &text,
+  void sendTrayNotification(
+    const QString& text,
     const QString& title = QStringLiteral("Flameshot Info"),
     const int timeout = 5000);
 

src/core/flameshotdbusadapter.cpp

@@ -16,9 +16,9 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "flameshotdbusadapter.h"
+#include "src/core/controller.h"
 #include "src/utils/confighandler.h"
 #include "src/utils/screengrabber.h"
-#include "src/core/controller.h"
 #include "src/utils/screenshotsaver.h"
 #include "src/utils/systemnotification.h"
 #include <QBuffer>
@@ -26,17 +26,21 @@ FlameshotDBusAdapter::FlameshotDBusAdapter(QObject *parent)
   : QDBusAbstractAdaptor(parent)
 {
   auto controller = Controller::getInstance();
-    connect(controller, &Controller::captureFailed,
+  connect(controller,
-            this, &FlameshotDBusAdapter::captureFailed);
+          &Controller::captureFailed,
-    connect(controller, &Controller::captureTaken,
+          this,
-            this, &FlameshotDBusAdapter::handleCaptureTaken);
+          &FlameshotDBusAdapter::captureFailed);
+  connect(controller,
+          &Controller::captureTaken,
+          this,
+          &FlameshotDBusAdapter::handleCaptureTaken);
 }
 
-FlameshotDBusAdapter::~FlameshotDBusAdapter() {
+FlameshotDBusAdapter::~FlameshotDBusAdapter() {}
 
-}
+void
-
+FlameshotDBusAdapter::graphicCapture(QString path, int delay, uint id)
-void FlameshotDBusAdapter::graphicCapture(QString path, int delay, uint id) {
+{
   CaptureRequest req(CaptureRequest::GRAPHICAL_MODE, delay, path);
   //    if (toClipboard) {
   //        req.addTask(CaptureRequest::CLIPBOARD_SAVE_TASK);
@@ -45,8 +49,11 @@ void FlameshotDBusAdapter::graphicCapture(QString path, int delay, uint id) {
   Controller::getInstance()->requestCapture(req);
 }
 
-void FlameshotDBusAdapter::fullScreen(
+void
-        QString path, bool toClipboard, int delay, uint id)
+FlameshotDBusAdapter::fullScreen(QString path,
+                                 bool toClipboard,
+                                 int delay,
+                                 uint id)
 {
   CaptureRequest req(CaptureRequest::FULLSCREEN_MODE, delay, path);
   if (toClipboard) {
@@ -59,12 +66,18 @@ void FlameshotDBusAdapter::fullScreen(
   Controller::getInstance()->requestCapture(req);
 }
 
-void FlameshotDBusAdapter::openLauncher() {
+void
+FlameshotDBusAdapter::openLauncher()
+{
   Controller::getInstance()->openLauncherWindow();
 }
 
-void FlameshotDBusAdapter::captureScreen(int number, QString path,
+void
-                                         bool toClipboard, int delay, uint id)
+FlameshotDBusAdapter::captureScreen(int number,
+                                    QString path,
+                                    bool toClipboard,
+                                    int delay,
+                                    uint id)
 {
   CaptureRequest req(CaptureRequest::SCREEN_MODE, delay, path, number);
   if (toClipboard) {
@@ -77,11 +90,15 @@ void FlameshotDBusAdapter::captureScreen(int number, QString path,
   Controller::getInstance()->requestCapture(req);
 }
 
-void FlameshotDBusAdapter::openConfig() {
+void
+FlameshotDBusAdapter::openConfig()
+{
   Controller::getInstance()->openConfigWindow();
 }
 
-void FlameshotDBusAdapter::trayIconEnabled(bool enabled) {
+void
+FlameshotDBusAdapter::trayIconEnabled(bool enabled)
+{
   auto controller = Controller::getInstance();
   if (enabled) {
     controller->enableTrayIcon();
@@ -90,14 +107,18 @@ void FlameshotDBusAdapter::trayIconEnabled(bool enabled) {
   }
 }
 
-void FlameshotDBusAdapter::autostartEnabled(bool enabled) {
+void
+FlameshotDBusAdapter::autostartEnabled(bool enabled)
+{
   ConfigHandler().setStartupLaunch(enabled);
   auto controller = Controller::getInstance();
   // Autostart is not saved in a .ini file, requires manual update
   controller->updateConfigComponents();
 }
 
-void FlameshotDBusAdapter::handleCaptureTaken(uint id, const QPixmap &p) {
+void
+FlameshotDBusAdapter::handleCaptureTaken(uint id, const QPixmap& p)
+{
   QByteArray byteArray;
   QBuffer buffer(&byteArray);
   p.save(&buffer, "PNG");

src/core/flameshotdbusadapter.h

@@ -17,10 +17,11 @@
 
 #pragma once
 
-#include <QtDBus/QDBusAbstractAdaptor>
 #include "src/core/controller.h"
+#include <QtDBus/QDBusAbstractAdaptor>
 
-class FlameshotDBusAdapter : public QDBusAbstractAdaptor {
+class FlameshotDBusAdapter : public QDBusAbstractAdaptor
+{
   Q_OBJECT
   Q_CLASSINFO("D-Bus Interface", "org.dharkael.Flameshot")
 
@@ -35,7 +36,11 @@ signals:
 public slots:
   Q_NOREPLY void graphicCapture(QString path, int delay, uint id);
   Q_NOREPLY void fullScreen(QString path, bool toClipboard, int delay, uint id);
-    Q_NOREPLY void captureScreen(int number, QString path, bool toClipboard, int delay, uint id);
+  Q_NOREPLY void captureScreen(int number,
+                               QString path,
+                               bool toClipboard,
+                               int delay,
+                               uint id);
   Q_NOREPLY void openLauncher();
   Q_NOREPLY void openConfig();
   Q_NOREPLY void trayIconEnabled(bool enabled);

src/core/globalshortcutfilter.cpp

@@ -19,8 +19,8 @@
 #include "src/core/controller.h"
 #include <qt_windows.h>
 
-GlobalShortcutFilter::GlobalShortcutFilter(QObject *parent) :
+GlobalShortcutFilter::GlobalShortcutFilter(QObject* parent)
-    QObject(parent)
+  : QObject(parent)
 {
   // Forced Print Screen
   if (RegisterHotKey(NULL, 1, 0, VK_SNAPSHOT)) {
@@ -28,8 +28,8 @@ GlobalShortcutFilter::GlobalShortcutFilter(QObject *parent) :
   }
 }
 
-bool GlobalShortcutFilter::nativeEventFilter(
+bool
-        const QByteArray &eventType,
+GlobalShortcutFilter::nativeEventFilter(const QByteArray& eventType,
                                         void* message,
                                         long* result)
 {

src/core/globalshortcutfilter.h

@@ -17,15 +17,20 @@
 
 #pragma once
 
-#include <QObject>
 #include <QAbstractNativeEventFilter>
+#include <QObject>
 
-class GlobalShortcutFilter : public QObject, public QAbstractNativeEventFilter {
+class GlobalShortcutFilter
+  : public QObject
+  , public QAbstractNativeEventFilter
+{
   Q_OBJECT
 public:
   explicit GlobalShortcutFilter(QObject* parent = nullptr);
 
-    bool nativeEventFilter(const QByteArray &eventType, void *message, long *result);
+  bool nativeEventFilter(const QByteArray& eventType,
+                         void* message,
+                         long* result);
 
 signals:
   void printPressed();

src/main.cpp

@@ -15,29 +15,31 @@
 //     You should have received a copy of the GNU General Public License
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "src/core/controller.h"
 #include "singleapplication.h"
-#include "src/utils/filenamehandler.h"
-#include "src/utils/confighandler.h"
 #include "src/cli/commandlineparser.h"
-#include "src/utils/systemnotification.h"
-#include "src/utils/pathinfo.h"
 #include "src/core/capturerequest.h"
+#include "src/core/controller.h"
+#include "src/utils/confighandler.h"
+#include "src/utils/filenamehandler.h"
+#include "src/utils/pathinfo.h"
+#include "src/utils/systemnotification.h"
 #include <QApplication>
+#include <QDir>
 #include <QLibraryInfo>
-#include <QTranslator>
 #include <QTextStream>
 #include <QTimer>
-#include <QDir>
+#include <QTranslator>
 
 #if defined(Q_OS_LINUX) || defined(Q_OS_UNIX)
 #include "src/core/flameshotdbusadapter.h"
 #include "src/utils/dbusutils.h"
-#include <QDBusMessage>
 #include <QDBusConnection>
+#include <QDBusMessage>
 #endif
 
-int main(int argc, char *argv[]) {
+int
+main(int argc, char* argv[])
+{
   // required for the button serialization
   // TODO: change to QVector in v1.0
   qRegisterMetaTypeStreamOperators<QList<int>>("QList<int>");
@@ -52,14 +54,17 @@ int main(int argc, char *argv[]) {
 
     for (const QString& path : trPaths) {
       bool match = translator.load(QLocale(),
-                                    QStringLiteral("Internationalization"), QStringLiteral("_"),
+                                   QStringLiteral("Internationalization"),
+                                   QStringLiteral("_"),
                                    path);
       if (match) {
         break;
       }
     }
 
-        qtTranslator.load(QLocale::system(), "qt", "_",
+    qtTranslator.load(QLocale::system(),
+                      "qt",
+                      "_",
                       QLibraryInfo::location(QLibraryInfo::TranslationsPath));
 
     app.installTranslator(&translator);
@@ -99,11 +104,17 @@ int main(int argc, char *argv[]) {
     QStringLiteral("Powerful yet simple to use screenshot software."));
   parser.setGeneralErrorMessage(QStringLiteral("See 'flameshot --help'."));
   // Arguments
-    CommandArgument fullArgument(QStringLiteral("full"), QStringLiteral("Capture the entire desktop."));
+  CommandArgument fullArgument(QStringLiteral("full"),
-    CommandArgument launcherArgument(QStringLiteral("launcher"), QStringLiteral("Open the capture launcher."));
+                               QStringLiteral("Capture the entire desktop."));
-    CommandArgument guiArgument(QStringLiteral("gui"), QStringLiteral("Start a manual capture in GUI mode."));
+  CommandArgument launcherArgument(
-    CommandArgument configArgument(QStringLiteral("config"), QStringLiteral("Configure flameshot."));
+    QStringLiteral("launcher"), QStringLiteral("Open the capture launcher."));
-    CommandArgument screenArgument(QStringLiteral("screen"), QStringLiteral("Capture a single screen."));
+  CommandArgument guiArgument(
+    QStringLiteral("gui"),
+    QStringLiteral("Start a manual capture in GUI mode."));
+  CommandArgument configArgument(QStringLiteral("config"),
+                                 QStringLiteral("Configure flameshot."));
+  CommandArgument screenArgument(QStringLiteral("screen"),
+                                 QStringLiteral("Capture a single screen."));
 
   // Options
   CommandOption pathOption(
@@ -111,18 +122,14 @@ int main(int argc, char *argv[]) {
     QStringLiteral("Path where the capture will be saved"),
     QStringLiteral("path"));
   CommandOption clipboardOption(
-                {"c", "clipboard"},
+    { "c", "clipboard" }, QStringLiteral("Save the capture to the clipboard"));
-                QStringLiteral("Save the capture to the clipboard"));
+  CommandOption delayOption({ "d", "delay" },
-    CommandOption delayOption(
-                {"d", "delay"},
                             QStringLiteral("Delay time in milliseconds"),
                             QStringLiteral("milliseconds"));
-    CommandOption filenameOption(
+  CommandOption filenameOption({ "f", "filename" },
-                {"f", "filename"},
                                QStringLiteral("Set the filename pattern"),
                                QStringLiteral("pattern"));
-    CommandOption trayOption(
+  CommandOption trayOption({ "t", "trayicon" },
-                {"t", "trayicon"},
                            QStringLiteral("Enable or disable the trayicon"),
                            QStringLiteral("bool"));
   CommandOption autostartOption(
@@ -133,21 +140,21 @@ int main(int argc, char *argv[]) {
     { "s", "showhelp" },
     QStringLiteral("Show the help message in the capture mode"),
     QStringLiteral("bool"));
-    CommandOption mainColorOption(
+  CommandOption mainColorOption({ "m", "maincolor" },
-                {"m", "maincolor"},
                                 QStringLiteral("Define the main UI color"),
                                 QStringLiteral("color-code"));
   CommandOption contrastColorOption(
     { "k", "contrastcolor" },
     QStringLiteral("Define the contrast UI color"),
     QStringLiteral("color-code"));
-    CommandOption rawImageOption(
+  CommandOption rawImageOption({ "r", "raw" },
-                {"r", "raw"},
                                QStringLiteral("Print raw PNG capture"));
   CommandOption screenNumberOption(
     { "n", "number" },
-                QStringLiteral("Define the screen to capture,\ndefault: screen containing the cursor"),
+    QStringLiteral(
-                QStringLiteral("Screen number"), QStringLiteral("-1"));
+      "Define the screen to capture,\ndefault: screen containing the cursor"),
+    QStringLiteral("Screen number"),
+    QStringLiteral("-1"));
 
   // Add checkers
   auto colorChecker = [](const QString& colorCode) -> bool {
@@ -162,14 +169,17 @@ int main(int argc, char *argv[]) {
                      "- Named colors like 'blue' or 'red'\n"
                      "You may need to escape the '#' sign as in '\\#FFF'";
 
-    const QString delayErr = QStringLiteral("Invalid delay, it must be higher than 0");
+  const QString delayErr =
-    const QString numberErr = QStringLiteral("Invalid screen number, it must be non negative");
+    QStringLiteral("Invalid delay, it must be higher than 0");
+  const QString numberErr =
+    QStringLiteral("Invalid screen number, it must be non negative");
   auto numericChecker = [](const QString& delayValue) -> bool {
     int value = delayValue.toInt();
     return value >= 0;
   };
 
-    const QString pathErr = QStringLiteral("Invalid path, it must be a real path in the system");
+  const QString pathErr =
+    QStringLiteral("Invalid path, it must be a real path in the system");
   auto pathChecker = [pathErr](const QString& pathValue) -> bool {
     bool res = QDir(pathValue).exists();
     if (!res) {
@@ -178,7 +188,8 @@ int main(int argc, char *argv[]) {
     return res;
   };
 
-    const QString booleanErr = QStringLiteral("Invalid value, it must be defined as 'true' or 'false'");
+  const QString booleanErr =
+    QStringLiteral("Invalid value, it must be defined as 'true' or 'false'");
   auto booleanChecker = [](const QString& value) -> bool {
     return value == QLatin1String("true") || value == QLatin1String("false");
   };
@@ -201,13 +212,20 @@ int main(int argc, char *argv[]) {
   auto helpOption = parser.addHelpOption();
   auto versionOption = parser.addVersionOption();
   parser.AddOptions({ pathOption, delayOption, rawImageOption }, guiArgument);
-    parser.AddOptions({ screenNumberOption, clipboardOption, pathOption,
+  parser.AddOptions({ screenNumberOption,
-                        delayOption, rawImageOption },
+                      clipboardOption,
+                      pathOption,
+                      delayOption,
+                      rawImageOption },
                     screenArgument);
-    parser.AddOptions({ pathOption, clipboardOption, delayOption, rawImageOption },
+  parser.AddOptions(
-                      fullArgument);
+    { pathOption, clipboardOption, delayOption, rawImageOption }, fullArgument);
-    parser.AddOptions({ autostartOption, filenameOption, trayOption,
+  parser.AddOptions({ autostartOption,
-                        showHelpOption, mainColorOption, contrastColorOption },
+                      filenameOption,
+                      trayOption,
+                      showHelpOption,
+                      mainColorOption,
+                      contrastColorOption },
                     configArgument);
   // Parse
   if (!parser.parse(app.arguments())) {
@@ -217,18 +235,19 @@ int main(int argc, char *argv[]) {
   // PROCESS DATA
   //--------------
   if (parser.isSet(helpOption) || parser.isSet(versionOption)) {
-    }
+  } else if (parser.isSet(launcherArgument)) { // LAUNCHER
-    else if (parser.isSet(launcherArgument)) { // LAUNCHER
+    QDBusMessage m =
-        QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+      QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
-                                           QStringLiteral("/"), QLatin1String(""), QStringLiteral("openLauncher"));
+                                     QStringLiteral("/"),
+                                     QLatin1String(""),
+                                     QStringLiteral("openLauncher"));
     QDBusConnection sessionBus = QDBusConnection::sessionBus();
     if (!sessionBus.isConnected()) {
       SystemNotification().sendMessage(
         QObject::tr("Unable to connect via DBus"));
     }
     sessionBus.call(m);
-    }
+  } else if (parser.isSet(guiArgument)) { // GUI
-    else if (parser.isSet(guiArgument)) { // GUI
     QString pathValue = parser.value(pathOption);
     int delay = parser.value(delayOption).toInt();
     bool isRaw = parser.isSet(rawImageOption);
@@ -237,8 +256,11 @@ int main(int argc, char *argv[]) {
     uint id = req.id();
 
     // Send message
-        QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+    QDBusMessage m =
-                                           QStringLiteral("/"), QLatin1String(""), QStringLiteral("graphicCapture"));
+      QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+                                     QStringLiteral("/"),
+                                     QLatin1String(""),
+                                     QStringLiteral("graphicCapture"));
     m << pathValue << delay << id;
     QDBusConnection sessionBus = QDBusConnection::sessionBus();
     dbusUtils.checkDBusConnection(sessionBus);
@@ -248,14 +270,12 @@ int main(int argc, char *argv[]) {
       dbusUtils.connectPrintCapture(sessionBus, id);
       QTimer t;
       t.setInterval(delay + 1000 * 60 * 15); // 15 minutes timeout
-            QObject::connect(&t, &QTimer::timeout, qApp,
+      QObject::connect(&t, &QTimer::timeout, qApp, &QCoreApplication::quit);
-                             &QCoreApplication::quit);
       t.start();
       // wait
       return app.exec();
     }
-    }
+  } else if (parser.isSet(fullArgument)) { // FULL
-    else if (parser.isSet(fullArgument)) { // FULL
     QString pathValue = parser.value(pathOption);
     int delay = parser.value(delayOption).toInt();
     bool toClipboard = parser.isSet(clipboardOption);
@@ -268,7 +288,8 @@ int main(int argc, char *argv[]) {
           << pathOption.dashedNames().join(QStringLiteral(", ")) << "\n "
           << rawImageOption.dashedNames().join(QStringLiteral(", ")) << "\n "
           << clipboardOption.dashedNames().join(QStringLiteral(", ")) << "\n\n";
-            parser.parse(QStringList() << argv[0] << QStringLiteral("full") << QStringLiteral("-h"));
+      parser.parse(QStringList() << argv[0] << QStringLiteral("full")
+                                 << QStringLiteral("-h"));
       goto finish;
     }
 
@@ -283,8 +304,11 @@ int main(int argc, char *argv[]) {
     DBusUtils dbusUtils;
 
     // Send message
-        QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+    QDBusMessage m =
-                                               QStringLiteral("/"), QLatin1String(""), QStringLiteral("fullScreen"));
+      QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+                                     QStringLiteral("/"),
+                                     QLatin1String(""),
+                                     QStringLiteral("fullScreen"));
     m << pathValue << toClipboard << delay << id;
     QDBusConnection sessionBus = QDBusConnection::sessionBus();
     dbusUtils.checkDBusConnection(sessionBus);
@@ -295,16 +319,15 @@ int main(int argc, char *argv[]) {
       // timeout just in case
       QTimer t;
       t.setInterval(delay + 2000);
-            QObject::connect(&t, &QTimer::timeout, qApp,
+      QObject::connect(&t, &QTimer::timeout, qApp, &QCoreApplication::quit);
-                             &QCoreApplication::quit);
       t.start();
       // wait
       return app.exec();
     }
-    }
+  } else if (parser.isSet(screenArgument)) { // SCREEN
-    else if (parser.isSet(screenArgument)) { // SCREEN
     QString numberStr = parser.value(screenNumberOption);
-        int number = numberStr.startsWith(QLatin1String("-")) ? -1 : numberStr.toInt();
+    int number =
+      numberStr.startsWith(QLatin1String("-")) ? -1 : numberStr.toInt();
     QString pathValue = parser.value(pathOption);
     int delay = parser.value(delayOption).toInt();
     bool toClipboard = parser.isSet(clipboardOption);
@@ -317,12 +340,12 @@ int main(int argc, char *argv[]) {
           << pathOption.dashedNames().join(QStringLiteral(", ")) << "\n "
           << rawImageOption.dashedNames().join(QStringLiteral(", ")) << "\n "
           << clipboardOption.dashedNames().join(QStringLiteral(", ")) << "\n\n";
-            parser.parse(QStringList() << argv[0] << QStringLiteral("screen") << QStringLiteral("-h"));
+      parser.parse(QStringList() << argv[0] << QStringLiteral("screen")
+                                 << QStringLiteral("-h"));
       goto finish;
     }
 
-        CaptureRequest req(CaptureRequest::SCREEN_MODE,
+    CaptureRequest req(CaptureRequest::SCREEN_MODE, delay, pathValue, number);
-                           delay, pathValue, number);
     if (toClipboard) {
       req.addTask(CaptureRequest::CLIPBOARD_SAVE_TASK);
     }
@@ -333,8 +356,11 @@ int main(int argc, char *argv[]) {
     DBusUtils dbusUtils;
 
     // Send message
-        QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+    QDBusMessage m =
-                                               QStringLiteral("/"), QLatin1String(""), QStringLiteral("captureScreen"));
+      QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+                                     QStringLiteral("/"),
+                                     QLatin1String(""),
+                                     QStringLiteral("captureScreen"));
     m << number << pathValue << toClipboard << delay << id;
     QDBusConnection sessionBus = QDBusConnection::sessionBus();
     dbusUtils.checkDBusConnection(sessionBus);
@@ -345,26 +371,26 @@ int main(int argc, char *argv[]) {
       // timeout just in case
       QTimer t;
       t.setInterval(delay + 2000);
-            QObject::connect(&t, &QTimer::timeout, qApp,
+      QObject::connect(&t, &QTimer::timeout, qApp, &QCoreApplication::quit);
-                             &QCoreApplication::quit);
       t.start();
       // wait
       return app.exec();
     }
-    }
+  } else if (parser.isSet(configArgument)) { // CONFIG
-    else if (parser.isSet(configArgument)) { // CONFIG
     bool autostart = parser.isSet(autostartOption);
     bool filename = parser.isSet(filenameOption);
     bool tray = parser.isSet(trayOption);
     bool help = parser.isSet(showHelpOption);
     bool mainColor = parser.isSet(mainColorOption);
     bool contrastColor = parser.isSet(contrastColorOption);
-        bool someFlagSet = (filename || tray || help ||
+    bool someFlagSet = (filename || tray || help || mainColor || contrastColor);
-                            mainColor || contrastColor);
     ConfigHandler config;
     if (autostart) {
-            QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+      QDBusMessage m =
-                                               QStringLiteral("/"), QLatin1String(""), QStringLiteral("autostartEnabled"));
+        QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+                                       QStringLiteral("/"),
+                                       QLatin1String(""),
+                                       QStringLiteral("autostartEnabled"));
       if (parser.value(autostartOption) == QLatin1String("false")) {
         m << false;
       } else if (parser.value(autostartOption) == QLatin1String("true")) {
@@ -381,14 +407,17 @@ int main(int argc, char *argv[]) {
       QString newFilename(parser.value(filenameOption));
       config.setFilenamePattern(newFilename);
       FileNameHandler fh;
-            QTextStream(stdout)
+      QTextStream(stdout) << QStringLiteral("The new pattern is '%1'\n"
-                    << QStringLiteral("The new pattern is '%1'\n"
+                                            "Parsed pattern example: %2\n")
-                                      "Parsed pattern example: %2\n").arg(newFilename)
+                               .arg(newFilename)
                                .arg(fh.parsedPattern());
     }
     if (tray) {
-            QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+      QDBusMessage m =
-                                               QStringLiteral("/"), QLatin1String(""), QStringLiteral("trayIconEnabled"));
+        QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+                                       QStringLiteral("/"),
+                                       QLatin1String(""),
+                                       QStringLiteral("trayIconEnabled"));
       if (parser.value(trayOption) == QLatin1String("false")) {
         m << false;
       } else if (parser.value(trayOption) == QLatin1String("true")) {
@@ -421,8 +450,11 @@ int main(int argc, char *argv[]) {
 
     // Open gui when no options
     if (!someFlagSet) {
-            QDBusMessage m = QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+      QDBusMessage m =
-                                               QStringLiteral("/"), QLatin1String(""), QStringLiteral("openConfig"));
+        QDBusMessage::createMethodCall(QStringLiteral("org.dharkael.Flameshot"),
+                                       QStringLiteral("/"),
+                                       QLatin1String(""),
+                                       QStringLiteral("openConfig"));
       QDBusConnection sessionBus = QDBusConnection::sessionBus();
       if (!sessionBus.isConnected()) {
         SystemNotification().sendMessage(

src/tools/abstractactiontool.cpp

@@ -17,55 +17,78 @@
 
 #include "abstractactiontool.h"
 
-AbstractActionTool::AbstractActionTool(QObject *parent) : CaptureTool(parent) {
+AbstractActionTool::AbstractActionTool(QObject* parent)
+  : CaptureTool(parent)
+{}
 
-}
+bool
-
+AbstractActionTool::isValid() const
-bool AbstractActionTool::isValid() const {
+{
   return true;
 }
 
-bool AbstractActionTool::isSelectable() const {
+bool
+AbstractActionTool::isSelectable() const
+{
   return false;
 }
 
-bool AbstractActionTool::showMousePreview() const {
+bool
+AbstractActionTool::showMousePreview() const
+{
   return false;
 }
 
-void AbstractActionTool::undo(QPixmap &pixmap) {
+void
+AbstractActionTool::undo(QPixmap& pixmap)
+{
   Q_UNUSED(pixmap);
 }
 
-void AbstractActionTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) {
+void
+AbstractActionTool::process(QPainter& painter,
+                            const QPixmap& pixmap,
+                            bool recordUndo)
+{
   Q_UNUSED(painter);
   Q_UNUSED(pixmap);
   Q_UNUSED(recordUndo);
 }
 
-void AbstractActionTool::paintMousePreview(
+void
-        QPainter &painter, const CaptureContext &context)
+AbstractActionTool::paintMousePreview(QPainter& painter,
+                                      const CaptureContext& context)
 {
   Q_UNUSED(painter);
   Q_UNUSED(context);
 }
 
-void AbstractActionTool::drawEnd(const QPoint &p) {
+void
+AbstractActionTool::drawEnd(const QPoint& p)
+{
   Q_UNUSED(p);
 }
 
-void AbstractActionTool::drawMove(const QPoint &p) {
+void
+AbstractActionTool::drawMove(const QPoint& p)
+{
   Q_UNUSED(p);
 }
 
-void AbstractActionTool::drawStart(const CaptureContext &context) {
+void
+AbstractActionTool::drawStart(const CaptureContext& context)
+{
   Q_UNUSED(context);
 }
 
-void AbstractActionTool::colorChanged(const QColor &c) {
+void
+AbstractActionTool::colorChanged(const QColor& c)
+{
   Q_UNUSED(c);
 }
 
-void AbstractActionTool::thicknessChanged(const int th) {
+void
+AbstractActionTool::thicknessChanged(const int th)
+{
   Q_UNUSED(th);
 }

src/tools/abstractactiontool.h

@@ -19,7 +19,8 @@
 
 #include "capturetool.h"
 
-class AbstractActionTool : public CaptureTool {
+class AbstractActionTool : public CaptureTool
+{
   Q_OBJECT
 public:
   explicit AbstractActionTool(QObject* parent = nullptr);
@@ -29,8 +30,11 @@ public:
   bool showMousePreview() const override;
 
   void undo(QPixmap& pixmap) override;
-    void process(QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override;
+  void process(QPainter& painter,
-    void paintMousePreview(QPainter &painter, const CaptureContext &context) override;
+               const QPixmap& pixmap,
+               bool recordUndo = false) override;
+  void paintMousePreview(QPainter& painter,
+                         const CaptureContext& context) override;
 
 public slots:
   void drawEnd(const QPoint& p) override;

src/tools/abstractpathtool.cpp

@@ -17,59 +17,80 @@
 
 #include "abstractpathtool.h"
 
-AbstractPathTool::AbstractPathTool(QObject *parent)  :
+AbstractPathTool::AbstractPathTool(QObject* parent)
-    CaptureTool(parent), m_thickness(0), m_padding(0)
+  : CaptureTool(parent)
+  , m_thickness(0)
+  , m_padding(0)
+{}
+
+bool
+AbstractPathTool::isValid() const
 {
-
-}
-
-bool AbstractPathTool::isValid() const {
   return m_points.length() > 1;
 }
 
-bool AbstractPathTool::closeOnButtonPressed() const {
+bool
+AbstractPathTool::closeOnButtonPressed() const
+{
   return false;
 }
 
-bool AbstractPathTool::isSelectable() const {
+bool
+AbstractPathTool::isSelectable() const
+{
   return true;
 }
 
-bool AbstractPathTool::showMousePreview() const {
+bool
+AbstractPathTool::showMousePreview() const
+{
   return true;
 }
 
-void AbstractPathTool::undo(QPixmap &pixmap) {
+void
+AbstractPathTool::undo(QPixmap& pixmap)
+{
   QPainter p(&pixmap);
   const int val = m_thickness + m_padding;
   QRect area = m_backupArea + QMargins(val, val, val, val);
-    p.drawPixmap(area.intersected(pixmap.rect())
+  p.drawPixmap(area.intersected(pixmap.rect()).topLeft(), m_pixmapBackup);
-                 .topLeft(), m_pixmapBackup);
 }
 
-void AbstractPathTool::drawEnd(const QPoint &p) {
+void
+AbstractPathTool::drawEnd(const QPoint& p)
+{
   Q_UNUSED(p);
 }
 
-void AbstractPathTool::drawMove(const QPoint &p) {
+void
+AbstractPathTool::drawMove(const QPoint& p)
+{
   addPoint(p);
 }
 
-void AbstractPathTool::colorChanged(const QColor &c) {
+void
+AbstractPathTool::colorChanged(const QColor& c)
+{
   m_color = c;
 }
 
-void AbstractPathTool::thicknessChanged(const int th) {
+void
+AbstractPathTool::thicknessChanged(const int th)
+{
   m_thickness = th;
 }
 
-void AbstractPathTool::updateBackup(const QPixmap &pixmap) {
+void
+AbstractPathTool::updateBackup(const QPixmap& pixmap)
+{
   const int val = m_thickness + m_padding;
   QRect area = m_backupArea.normalized() + QMargins(val, val, val, val);
   m_pixmapBackup = pixmap.copy(area);
 }
 
-void AbstractPathTool::addPoint(const QPoint &point) {
+void
+AbstractPathTool::addPoint(const QPoint& point)
+{
   if (m_backupArea.left() > point.x()) {
     m_backupArea.setLeft(point.x());
   } else if (m_backupArea.right() < point.x()) {

src/tools/abstractpathtool.h

@@ -19,7 +19,8 @@
 
 #include "capturetool.h"
 
-class AbstractPathTool : public CaptureTool {
+class AbstractPathTool : public CaptureTool
+{
   Q_OBJECT
 public:
   explicit AbstractPathTool(QObject* parent = nullptr);

src/tools/abstracttwopointtool.cpp

@@ -23,7 +23,8 @@ namespace {
 const double ADJ_UNIT = std::atan(1.0);
 const int DIRS_NUMBER = 4;
 
-enum UNIT {
+enum UNIT
+{
   HORIZ_DIR = 0,
   DIAG1_DIR = 1,
   VERT_DIR = 2,
@@ -33,74 +34,103 @@ enum UNIT {
 const double ADJ_DIAG_UNIT = 2 * ADJ_UNIT;
 const int DIAG_DIRS_NUMBER = 2;
 
-enum DIAG_UNIT {
+enum DIAG_UNIT
+{
   DIR1 = 0,
   DIR2 = 1
 };
 
 }
 
-AbstractTwoPointTool::AbstractTwoPointTool(QObject *parent) :
+AbstractTwoPointTool::AbstractTwoPointTool(QObject* parent)
-    CaptureTool(parent), m_thickness(0), m_padding(0)
+  : CaptureTool(parent)
+  , m_thickness(0)
+  , m_padding(0)
+{}
+
+bool
+AbstractTwoPointTool::isValid() const
 {
-
-}
-
-bool AbstractTwoPointTool::isValid() const {
   return (m_points.first != m_points.second);
 }
 
-bool AbstractTwoPointTool::closeOnButtonPressed() const {
+bool
+AbstractTwoPointTool::closeOnButtonPressed() const
+{
   return false;
 }
 
-bool AbstractTwoPointTool::isSelectable() const {
+bool
+AbstractTwoPointTool::isSelectable() const
+{
   return true;
 }
 
-bool AbstractTwoPointTool::showMousePreview() const {
+bool
+AbstractTwoPointTool::showMousePreview() const
+{
   return true;
 }
 
-void AbstractTwoPointTool::undo(QPixmap &pixmap) {
+void
+AbstractTwoPointTool::undo(QPixmap& pixmap)
+{
   QPainter p(&pixmap);
   p.drawPixmap(backupRect(pixmap.rect()).topLeft(), m_pixmapBackup);
 }
 
-void AbstractTwoPointTool::drawEnd(const QPoint &p) {
+void
+AbstractTwoPointTool::drawEnd(const QPoint& p)
+{
   Q_UNUSED(p);
 }
 
-void AbstractTwoPointTool::drawMove(const QPoint &p) {
+void
+AbstractTwoPointTool::drawMove(const QPoint& p)
+{
   m_points.second = p;
 }
 
-void AbstractTwoPointTool::drawMoveWithAdjustment(const QPoint &p) {
+void
+AbstractTwoPointTool::drawMoveWithAdjustment(const QPoint& p)
+{
   m_points.second = m_points.first + adjustedVector(p - m_points.first);
 }
 
-void AbstractTwoPointTool::colorChanged(const QColor &c) {
+void
+AbstractTwoPointTool::colorChanged(const QColor& c)
+{
   m_color = c;
 }
 
-void AbstractTwoPointTool::thicknessChanged(const int th) {
+void
+AbstractTwoPointTool::thicknessChanged(const int th)
+{
   m_thickness = th;
 }
 
-void AbstractTwoPointTool::updateBackup(const QPixmap &pixmap) {
+void
+AbstractTwoPointTool::updateBackup(const QPixmap& pixmap)
+{
   m_pixmapBackup = pixmap.copy(backupRect(pixmap.rect()));
 }
 
-QRect AbstractTwoPointTool::backupRect(const QRect &limits) const {
+QRect
+AbstractTwoPointTool::backupRect(const QRect& limits) const
+{
   QRect r = QRect(m_points.first, m_points.second).normalized();
   const int val = m_thickness + m_padding;
   r += QMargins(val, val, val, val);
   return r.intersected(limits);
 }
 
-QPoint AbstractTwoPointTool::adjustedVector(QPoint v) const {
+QPoint
+AbstractTwoPointTool::adjustedVector(QPoint v) const
+{
   if (m_supportsOrthogonalAdj && m_supportsDiagonalAdj) {
-        int dir = ( static_cast<int>(round(atan2(-v.y(), v.x()) / ADJ_UNIT)) + DIRS_NUMBER ) % DIRS_NUMBER;
+    int dir =
+      (static_cast<int>(round(atan2(-v.y(), v.x()) / ADJ_UNIT)) + DIRS_NUMBER) %
+      DIRS_NUMBER;
     if (dir == UNIT::HORIZ_DIR) {
       v.setY(0);
     } else if (dir == UNIT::VERT_DIR) {
@@ -117,8 +147,10 @@ QPoint AbstractTwoPointTool::adjustedVector(QPoint v) const {
       v.setY(newY);
     }
   } else if (m_supportsDiagonalAdj) {
-        int dir = ( static_cast<int>(round((atan2(-v.y(), v.x()) - ADJ_DIAG_UNIT / 2) / ADJ_DIAG_UNIT))
+    int dir = (static_cast<int>(round(
-                    + DIAG_DIRS_NUMBER ) % DIAG_DIRS_NUMBER;
+                 (atan2(-v.y(), v.x()) - ADJ_DIAG_UNIT / 2) / ADJ_DIAG_UNIT)) +
+               DIAG_DIRS_NUMBER) %
+              DIAG_DIRS_NUMBER;
     if (dir == DIAG_UNIT::DIR1) {
       int newX = (v.x() - v.y()) / 2;
       int newY = -newX;

src/tools/abstracttwopointtool.h

@@ -19,7 +19,8 @@
 
 #include "capturetool.h"
 
-class AbstractTwoPointTool : public CaptureTool {
+class AbstractTwoPointTool : public CaptureTool
+{
   Q_OBJECT
 public:
   explicit AbstractTwoPointTool(QObject* parent = nullptr);

src/tools/arrow/arrowtool.cpp

@@ -24,7 +24,9 @@ namespace {
 const int ArrowWidth = 10;
 const int ArrowHeight = 18;
 
-QPainterPath getArrowHead(QPoint p1, QPoint p2, const int thickness) {
+QPainterPath
+getArrowHead(QPoint p1, QPoint p2, const int thickness)
+{
   QLineF base(p1, p2);
   // Create the vector for the position of the base  of the arrowhead
   QLineF temp(QPoint(0, 0), p2 - p1);
@@ -56,7 +58,9 @@ QPainterPath getArrowHead(QPoint p1, QPoint p2, const int thickness) {
 }
 
 // gets a shorter line to prevent overlap in the point of the arrow
-QLine getShorterLine(QPoint p1, QPoint p2, const int thickness) {
+QLine
+getShorterLine(QPoint p1, QPoint p2, const int thickness)
+{
   QLineF l(p1, p2);
   int val = ArrowHeight + thickness * 4;
   if (l.length() < val) {
@@ -68,53 +72,75 @@ QLine getShorterLine(QPoint p1, QPoint p2, const int thickness) {
 
 } // unnamed namespace
 
-ArrowTool::ArrowTool(QObject *parent) : AbstractTwoPointTool(parent) {
+ArrowTool::ArrowTool(QObject* parent)
+  : AbstractTwoPointTool(parent)
+{
   m_padding = ArrowWidth / 2;
   m_supportsOrthogonalAdj = true;
   m_supportsDiagonalAdj = true;
 }
 
-QIcon ArrowTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+ArrowTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "arrow-bottom-left.svg");
 }
-QString ArrowTool::name() const {
+QString
+ArrowTool::name() const
+{
   return tr("Arrow");
 }
 
-QString ArrowTool::nameID() {
+QString
+ArrowTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString ArrowTool::description() const {
+QString
+ArrowTool::description() const
+{
   return tr("Set the Arrow as the paint tool");
 }
 
-CaptureTool* ArrowTool::copy(QObject *parent) {
+CaptureTool*
+ArrowTool::copy(QObject* parent)
+{
   return new ArrowTool(parent);
 }
 
-void ArrowTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) {
+void
+ArrowTool::process(QPainter& painter, const QPixmap& pixmap, bool recordUndo)
+{
   if (recordUndo) {
     updateBackup(pixmap);
   }
   painter.setPen(QPen(m_color, m_thickness));
-    painter.drawLine(getShorterLine(m_points.first, m_points.second, m_thickness));
+  painter.drawLine(
-    painter.fillPath(getArrowHead(m_points.first, m_points.second, m_thickness), QBrush(m_color));
+    getShorterLine(m_points.first, m_points.second, m_thickness));
+  painter.fillPath(getArrowHead(m_points.first, m_points.second, m_thickness),
+                   QBrush(m_color));
 }
 
-void ArrowTool::paintMousePreview(QPainter &painter, const CaptureContext &context) {
+void
+ArrowTool::paintMousePreview(QPainter& painter, const CaptureContext& context)
+{
   painter.setPen(QPen(context.color, PADDING_VALUE + context.thickness));
   painter.drawLine(context.mousePos, context.mousePos);
 }
 
-void ArrowTool::drawStart(const CaptureContext &context) {
+void
+ArrowTool::drawStart(const CaptureContext& context)
+{
   m_color = context.color;
   m_thickness = context.thickness + PADDING_VALUE;
   m_points.first = context.mousePos;
   m_points.second = context.mousePos;
 }
 
-void ArrowTool::pressed(const CaptureContext &context) {
+void
+ArrowTool::pressed(const CaptureContext& context)
+{
   Q_UNUSED(context);
 }

src/tools/arrow/arrowtool.h

@@ -21,7 +21,8 @@
 #include <QPainter>
 #include <QPainterPath>
 
-class ArrowTool : public AbstractTwoPointTool {
+class ArrowTool : public AbstractTwoPointTool
+{
   Q_OBJECT
 public:
   explicit ArrowTool(QObject* parent = nullptr);
@@ -32,9 +33,11 @@ public:
   QString description() const override;
 
   CaptureTool* copy(QObject* parent = nullptr) override;
-    void process(
+  void process(QPainter& painter,
-            QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override;
+               const QPixmap& pixmap,
-    void paintMousePreview(QPainter &painter, const CaptureContext &context) override;
+               bool recordUndo = false) override;
+  void paintMousePreview(QPainter& painter,
+                         const CaptureContext& context) override;
 
 public slots:
   void drawStart(const CaptureContext& context) override;

src/tools/blur/blurtool.cpp

@@ -23,41 +23,59 @@
 #include <QImage>
 #include <QPainter>
 
-BlurTool::BlurTool(QObject *parent) : AbstractTwoPointTool(parent) {}
+BlurTool::BlurTool(QObject* parent)
+  : AbstractTwoPointTool(parent)
+{}
 
-QIcon BlurTool::icon(const QColor &background, bool inEditor) const
+QIcon
+BlurTool::icon(const QColor& background, bool inEditor) const
 {
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "blur.svg");
 }
-QString BlurTool::name() const { return tr("Blur"); }
+QString
+BlurTool::name() const
+{
+  return tr("Blur");
+}
 
-QString BlurTool::nameID() { return QLatin1String(""); }
+QString
+BlurTool::nameID()
+{
+  return QLatin1String("");
+}
 
-QString BlurTool::description() const
+QString
+BlurTool::description() const
 {
   return tr("Set Blur as the paint tool");
 }
 
-CaptureTool *BlurTool::copy(QObject *parent) { return new BlurTool(parent); }
+CaptureTool*
+BlurTool::copy(QObject* parent)
+{
+  return new BlurTool(parent);
+}
 
-void write_block(QImage &image, int x_start, int y_start, int pixel_size,
+void
+write_block(QImage& image,
+            int x_start,
+            int y_start,
+            int pixel_size,
             QRgb block_color)
 {
   assert(x_start + pixel_size < image.width());
   assert(y_start + pixel_size < image.height());
 
-  for (auto x = x_start; x < x_start + pixel_size; x++)
+  for (auto x = x_start; x < x_start + pixel_size; x++) {
-  {
+    for (auto y = y_start; y < y_start + pixel_size; y++) {
-    for (auto y = y_start; y < y_start + pixel_size; y++)
-    {
       image.setPixel(x, y, block_color);
     }
   }
 }
 
-QRgb calculate_block_averge(QImage &image, int x_start, int y_start,
+QRgb
-                            int pixel_size)
+calculate_block_averge(QImage& image, int x_start, int y_start, int pixel_size)
 {
   assert(x_start + pixel_size < image.width());
   assert(y_start + pixel_size < image.height());
@@ -66,10 +84,8 @@ QRgb calculate_block_averge(QImage &image, int x_start, int y_start,
   int blue_count = 0;
   int green_count = 0;
   int pixel_count = 0;
-  for (auto x = x_start; x < x_start + pixel_size; x++)
+  for (auto x = x_start; x < x_start + pixel_size; x++) {
-  {
+    for (auto y = y_start; y < y_start + pixel_size; y++) {
-    for (auto y = y_start; y < y_start + pixel_size; y++)
-    {
       auto pixel = image.pixel(x, y);
 
       red_count += qRed(pixel);
@@ -78,14 +94,14 @@ QRgb calculate_block_averge(QImage &image, int x_start, int y_start,
       pixel_count++;
     }
   }
-  return (qRgb(red_count / pixel_count, green_count / pixel_count,
+  return (qRgb(red_count / pixel_count,
+               green_count / pixel_count,
                blue_count / pixel_count));
 }
-void BlurTool::process(QPainter &painter, const QPixmap &pixmap,
+void
-                       bool recordUndo)
+BlurTool::process(QPainter& painter, const QPixmap& pixmap, bool recordUndo)
-{
-  if (recordUndo)
 {
+  if (recordUndo) {
     updateBackup(pixmap);
   }
   QPoint& p0 = m_points.first;
@@ -100,22 +116,17 @@ void BlurTool::process(QPainter &painter, const QPixmap &pixmap,
   QImage original_image{ source->toImage() };
   QImage imageResult{ source->toImage() };
   unsigned int pixel_size = m_thickness;
-  if (pixel_size < 1)
+  if (pixel_size < 1) {
-  {
     pixel_size = 1;
   }
 
-
   const unsigned int width = source->width();
   const unsigned int height = source->height();
 
   // Don't start pixelating until the region is at least as big as the pixel
-  if ((width > pixel_size) && (height > pixel_size))
+  if ((width > pixel_size) && (height > pixel_size)) {
-  {
+    for (unsigned int x = 0; x < (width - pixel_size); x += pixel_size) {
-    for (unsigned int x = 0; x < (width - pixel_size); x += pixel_size)
+      for (unsigned int y = 0; y < (height - pixel_size); y += pixel_size) {
-    {
-      for (unsigned int y = 0; y < (height - pixel_size); y += pixel_size)
-      {
         auto block_color =
           calculate_block_averge(original_image, x, y, pixel_size);
         write_block(imageResult, x, y, pixel_size, block_color);
@@ -130,18 +141,23 @@ void BlurTool::process(QPainter &painter, const QPixmap &pixmap,
   scene.render(&painter, selection, QRectF());
 }
 
-void BlurTool::paintMousePreview(QPainter &painter,
+void
-                                 const CaptureContext &context)
+BlurTool::paintMousePreview(QPainter& painter, const CaptureContext& context)
 {
   Q_UNUSED(context);
   Q_UNUSED(painter);
 }
 
-void BlurTool::drawStart(const CaptureContext &context)
+void
+BlurTool::drawStart(const CaptureContext& context)
 {
   m_thickness = context.thickness;
   m_points.first = context.mousePos;
   m_points.second = context.mousePos;
 }
 
-void BlurTool::pressed(const CaptureContext &context) { Q_UNUSED(context); }
+void
+BlurTool::pressed(const CaptureContext& context)
+{
+  Q_UNUSED(context);
+}

src/tools/blur/blurtool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstracttwopointtool.h"
 
-class BlurTool : public AbstractTwoPointTool {
+class BlurTool : public AbstractTwoPointTool
+{
   Q_OBJECT
 public:
   explicit BlurTool(QObject* parent = nullptr);
@@ -30,9 +31,11 @@ public:
   QString description() const override;
 
   CaptureTool* copy(QObject* parent = nullptr) override;
-    void process(
+  void process(QPainter& painter,
-            QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override;
+               const QPixmap& pixmap,
-    void paintMousePreview(QPainter &painter, const CaptureContext &context) override;
+               bool recordUndo = false) override;
+  void paintMousePreview(QPainter& painter,
+                         const CaptureContext& context) override;
 
 public slots:
   void drawStart(const CaptureContext& context) override;

src/tools/capturecontext.cpp

@@ -17,11 +17,12 @@
 
 #include "capturecontext.h"
 
-QPixmap CaptureContext::selectedScreenshotArea() const {
+QPixmap
+CaptureContext::selectedScreenshotArea() const
+{
   if (selection.isNull()) {
     return screenshot;
   } else {
     return screenshot.copy(selection);
   }
 }
-

src/tools/capturecontext.h

@@ -17,12 +17,13 @@
 
 #pragma once
 
-#include <QRect>
-#include <QPoint>
-#include <QPixmap>
 #include <QPainter>
+#include <QPixmap>
+#include <QPoint>
+#include <QRect>
 
-struct CaptureContext {
+struct CaptureContext
+{
   // screenshot with modifications
   QPixmap screenshot;
   // unmodified screenshot

src/tools/capturetool.h

@@ -23,12 +23,14 @@
 #include <QIcon>
 #include <QPainter>
 
-class CaptureTool : public QObject {
+class CaptureTool : public QObject
+{
   Q_OBJECT
 
 public:
   // Request actions on the main widget
-    enum Request {
+  enum Request
+  {
     // Call close() in the editor.
     REQ_CLOSE_GUI,
     // Call hide() in the editor.
@@ -66,7 +68,9 @@ public:
     REQ_INCREMENT_CIRCLE_COUNT,
   };
 
-    explicit CaptureTool(QObject *parent = nullptr) : QObject(parent){}
+  explicit CaptureTool(QObject* parent = nullptr)
+    : QObject(parent)
+  {}
 
   // Returns false when the tool is in an inconsistent state and shouldn't
   // be included in the tool undo/redo stack.
@@ -82,8 +86,7 @@ public:
   // The icon of the tool.
   // inEditor is true when the icon is requested inside the editor
   // and false otherwise.
-    virtual QIcon icon(const QColor &background,
+  virtual QIcon icon(const QColor& background, bool inEditor) const = 0;
-                       bool inEditor) const = 0;
   // Name displayed for the tool, this could be translated with tr()
   virtual QString name() const = 0;
   // Codename for the tool, this hsouldn't change as it is used as ID
@@ -95,19 +98,13 @@ public:
   // if the type is TYPE_WIDGET the widget is loaded in the main widget.
   // If the type is TYPE_EXTERNAL_WIDGET it is created outside as an
   // individual widget.
-    virtual QWidget* widget() {
+  virtual QWidget* widget() { return nullptr; }
-        return nullptr;
-    }
   // When the tool is selected this method is called and the widget is added
   // to the configuration panel inside the main widget.
-    virtual QWidget* configurationWidget() {
+  virtual QWidget* configurationWidget() { return nullptr; }
-        return nullptr;
-    }
   // Permanent configuration used in the configuration outside of the
   // capture.
-    virtual QWidget* permanentConfigurationWidget() {
+  virtual QWidget* permanentConfigurationWidget() { return nullptr; }
-        return nullptr;
-    }
   // Return a copy of the tool
   virtual CaptureTool* copy(QObject* parent = nullptr) = 0;
 
@@ -121,15 +118,17 @@ public:
                        const QPixmap& pixmap,
                        bool recordUndo = false) = 0;
   // When the tool is selected, this is called when the mouse moves
-    virtual void paintMousePreview(QPainter &painter, const CaptureContext &context) = 0;
+  virtual void paintMousePreview(QPainter& painter,
+                                 const CaptureContext& context) = 0;
 
 signals:
   void requestAction(Request r);
 
 protected:
-    QString iconPath(const QColor &c) const {
+  QString iconPath(const QColor& c) const
-        return ColorUtils::colorIsDark(c) ?
+  {
-                    PathInfo::whiteIconPath() : PathInfo::blackIconPath();
+    return ColorUtils::colorIsDark(c) ? PathInfo::whiteIconPath()
+                                      : PathInfo::blackIconPath();
   }
 
 public slots:
@@ -139,9 +138,7 @@ public slots:
   virtual void drawMove(const QPoint& p) = 0;
   // Called when drawMove is needed with an adjustment;
   // should be overridden in case an adjustment is applicable.
-    virtual void drawMoveWithAdjustment(const QPoint &p) {
+  virtual void drawMoveWithAdjustment(const QPoint& p) { drawMove(p); }
-        drawMove(p);
-    }
   // Called when the tool is activated.
   virtual void drawStart(const CaptureContext& context) = 0;
   // Called right after pressign the button which activates the tool.

src/tools/circle/circletool.cpp

@@ -22,31 +22,45 @@ namespace {
 #define PADDING_VALUE 2
 }
 
-CircleTool::CircleTool(QObject *parent) : AbstractTwoPointTool(parent) {
+CircleTool::CircleTool(QObject* parent)
+  : AbstractTwoPointTool(parent)
+{
   m_supportsDiagonalAdj = true;
 }
 
-QIcon CircleTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+CircleTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "circle-outline.svg");
 }
-QString CircleTool::name() const {
+QString
+CircleTool::name() const
+{
   return tr("Circle");
 }
 
-QString CircleTool::nameID() {
+QString
+CircleTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString CircleTool::description() const {
+QString
+CircleTool::description() const
+{
   return tr("Set the Circle as the paint tool");
 }
 
-CaptureTool* CircleTool::copy(QObject *parent) {
+CaptureTool*
+CircleTool::copy(QObject* parent)
+{
   return new CircleTool(parent);
 }
 
-void CircleTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) {
+void
+CircleTool::process(QPainter& painter, const QPixmap& pixmap, bool recordUndo)
+{
   if (recordUndo) {
     updateBackup(pixmap);
   }
@@ -54,18 +68,24 @@ void CircleTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUn
   painter.drawEllipse(QRect(m_points.first, m_points.second));
 }
 
-void CircleTool::paintMousePreview(QPainter &painter, const CaptureContext &context) {
+void
+CircleTool::paintMousePreview(QPainter& painter, const CaptureContext& context)
+{
   painter.setPen(QPen(context.color, PADDING_VALUE + context.thickness));
   painter.drawLine(context.mousePos, context.mousePos);
 }
 
-void CircleTool::drawStart(const CaptureContext &context) {
+void
+CircleTool::drawStart(const CaptureContext& context)
+{
   m_color = context.color;
   m_thickness = context.thickness + PADDING_VALUE;
   m_points.first = context.mousePos;
   m_points.second = context.mousePos;
 }
 
-void CircleTool::pressed(const CaptureContext &context) {
+void
+CircleTool::pressed(const CaptureContext& context)
+{
   Q_UNUSED(context);
 }

src/tools/circle/circletool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstracttwopointtool.h"
 
-class CircleTool : public AbstractTwoPointTool {
+class CircleTool : public AbstractTwoPointTool
+{
   Q_OBJECT
 public:
   explicit CircleTool(QObject* parent = nullptr);
@@ -30,9 +31,11 @@ public:
   QString description() const override;
 
   CaptureTool* copy(QObject* parent = nullptr) override;
-    void process(
+  void process(QPainter& painter,
-            QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override;
+               const QPixmap& pixmap,
-    void paintMousePreview(QPainter &painter, const CaptureContext &context) override;
+               bool recordUndo = false) override;
+  void paintMousePreview(QPainter& painter,
+                         const CaptureContext& context) override;
 
 public slots:
   void drawStart(const CaptureContext& context) override;

src/tools/circlecount/circlecounttool.cpp

@@ -21,31 +21,47 @@ namespace {
 #define PADDING_VALUE 2
 }
 
-CircleCountTool::CircleCountTool(QObject *parent) : AbstractTwoPointTool(parent) {
+CircleCountTool::CircleCountTool(QObject* parent)
+  : AbstractTwoPointTool(parent)
+{
   m_count = 0;
 }
 
-QIcon CircleCountTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+CircleCountTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "circlecount-outline.svg");
 }
-QString CircleCountTool::name() const {
+QString
+CircleCountTool::name() const
+{
   return tr("Circle Counter");
 }
 
-QString CircleCountTool::nameID() {
+QString
+CircleCountTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString CircleCountTool::description() const {
+QString
+CircleCountTool::description() const
+{
   return tr("Add an autoincrementing counter bubble");
 }
 
-CaptureTool* CircleCountTool::copy(QObject *parent) {
+CaptureTool*
+CircleCountTool::copy(QObject* parent)
+{
   return new CircleCountTool(parent);
 }
 
-void CircleCountTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) {
+void
+CircleCountTool::process(QPainter& painter,
+                         const QPixmap& pixmap,
+                         bool recordUndo)
+{
   if (recordUndo) {
     updateBackup(pixmap);
   }
@@ -53,23 +69,34 @@ void CircleCountTool::process(QPainter &painter, const QPixmap &pixmap, bool rec
 
   int bubble_size = 16;
   painter.drawEllipse(m_points.first, bubble_size, bubble_size);
-    painter.drawText(QRectF(m_points.first.x()-bubble_size/2, m_points.first.y()-bubble_size/2, bubble_size, bubble_size), Qt::AlignCenter, QString::number(m_count));
+  painter.drawText(QRectF(m_points.first.x() - bubble_size / 2,
+                          m_points.first.y() - bubble_size / 2,
+                          bubble_size,
+                          bubble_size),
+                   Qt::AlignCenter,
+                   QString::number(m_count));
 }
 
-void CircleCountTool::paintMousePreview(QPainter &painter, const CaptureContext &context) {
+void
+CircleCountTool::paintMousePreview(QPainter& painter,
+                                   const CaptureContext& context)
+{
   painter.setPen(QPen(context.color, PADDING_VALUE + context.thickness));
   painter.drawLine(context.mousePos, context.mousePos);
 }
 
-void CircleCountTool::drawStart(const CaptureContext &context) {
+void
+CircleCountTool::drawStart(const CaptureContext& context)
+{
   m_color = context.color;
   m_thickness = context.thickness + PADDING_VALUE;
   m_points.first = context.mousePos;
   m_count = context.circleCount;
   emit requestAction(REQ_INCREMENT_CIRCLE_COUNT);
-
 }
 
-void CircleCountTool::pressed(const CaptureContext &context) {
+void
+CircleCountTool::pressed(const CaptureContext& context)
+{
   Q_UNUSED(context);
 }

src/tools/circlecount/circlecounttool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstracttwopointtool.h"
 
-class CircleCountTool : public AbstractTwoPointTool {
+class CircleCountTool : public AbstractTwoPointTool
+{
   Q_OBJECT
 public:
   explicit CircleCountTool(QObject* parent = nullptr);
@@ -30,9 +31,12 @@ public:
   QString description() const override;
 
   CaptureTool* copy(QObject* parent = nullptr) override;
-    void process(
+  void process(QPainter& painter,
-            QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override;
+               const QPixmap& pixmap,
-    void paintMousePreview(QPainter &painter, const CaptureContext &context) override;
+               bool recordUndo = false) override;
+  void paintMousePreview(QPainter& painter,
+                         const CaptureContext& context) override;
+
 private:
   unsigned int m_count;
 public slots:

src/tools/copy/copytool.cpp

@@ -19,35 +19,49 @@
 #include "src/utils/screenshotsaver.h"
 #include <QPainter>
 
-CopyTool::CopyTool(QObject *parent) : AbstractActionTool(parent) {
+CopyTool::CopyTool(QObject* parent)
+  : AbstractActionTool(parent)
+{}
 
-}
+bool
-
+CopyTool::closeOnButtonPressed() const
-bool CopyTool::closeOnButtonPressed() const {
+{
   return true;
 }
 
-QIcon CopyTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+CopyTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "content-copy.svg");
 }
-QString CopyTool::name() const {
+QString
+CopyTool::name() const
+{
   return tr("Copy");
 }
 
-QString CopyTool::nameID() {
+QString
+CopyTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString CopyTool::description() const {
+QString
+CopyTool::description() const
+{
   return tr("Copy the selection into the clipboard");
 }
 
-CaptureTool* CopyTool::copy(QObject *parent) {
+CaptureTool*
+CopyTool::copy(QObject* parent)
+{
   return new CopyTool(parent);
 }
 
-void CopyTool::pressed(const CaptureContext &context) {
+void
+CopyTool::pressed(const CaptureContext& context)
+{
   emit requestAction(REQ_CAPTURE_DONE_OK);
   ScreenshotSaver().saveToClipboard(context.selectedScreenshotArea());
 }

src/tools/copy/copytool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstractactiontool.h"
 
-class CopyTool : public AbstractActionTool {
+class CopyTool : public AbstractActionTool
+{
   Q_OBJECT
 public:
   explicit CopyTool(QObject* parent = nullptr);

src/tools/exit/exittool.cpp

@@ -18,35 +18,49 @@
 #include "exittool.h"
 #include <QPainter>
 
-ExitTool::ExitTool(QObject *parent) : AbstractActionTool(parent) {
+ExitTool::ExitTool(QObject* parent)
+  : AbstractActionTool(parent)
+{}
 
-}
+bool
-
+ExitTool::closeOnButtonPressed() const
-bool ExitTool::closeOnButtonPressed() const {
+{
   return true;
 }
 
-QIcon ExitTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+ExitTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "close.svg");
 }
-QString ExitTool::name() const {
+QString
+ExitTool::name() const
+{
   return tr("Exit");
 }
 
-QString ExitTool::nameID() {
+QString
+ExitTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString ExitTool::description() const {
+QString
+ExitTool::description() const
+{
   return tr("Leave the capture screen");
 }
 
-CaptureTool* ExitTool::copy(QObject *parent) {
+CaptureTool*
+ExitTool::copy(QObject* parent)
+{
   return new ExitTool(parent);
 }
 
-void ExitTool::pressed(const CaptureContext &context) {
+void
+ExitTool::pressed(const CaptureContext& context)
+{
   Q_UNUSED(context);
   emit requestAction(REQ_CLOSE_GUI);
 }

src/tools/exit/exittool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstractactiontool.h"
 
-class ExitTool : public AbstractActionTool {
+class ExitTool : public AbstractActionTool
+{
   Q_OBJECT
 public:
   explicit ExitTool(QObject* parent = nullptr);

src/tools/imgur/imguruploader.cpp

@@ -16,33 +16,34 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "imguruploader.h"
+#include "src/utils/confighandler.h"
 #include "src/utils/filenamehandler.h"
 #include "src/utils/systemnotification.h"
-#include "src/widgets/loadspinner.h"
 #include "src/widgets/imagelabel.h"
+#include "src/widgets/loadspinner.h"
 #include "src/widgets/notificationwidget.h"
-#include "src/utils/confighandler.h"
 #include <QApplication>
+#include <QBuffer>
 #include <QClipboard>
 #include <QDesktopServices>
-#include <QShortcut>
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QPushButton>
 #include <QDrag>
-#include <QMimeData>
+#include <QHBoxLayout>
-#include <QBuffer>
-#include <QUrlQuery>
-#include <QNetworkRequest>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QTimer>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QLabel>
+#include <QMimeData>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QPushButton>
+#include <QShortcut>
+#include <QTimer>
+#include <QUrlQuery>
+#include <QVBoxLayout>
 
-ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) :
+ImgurUploader::ImgurUploader(const QPixmap& capture, QWidget* parent)
-    QWidget(parent), m_pixmap(capture)
+  : QWidget(parent)
+  , m_pixmap(capture)
 {
   setWindowTitle(tr("Upload to Imgur"));
   setWindowIcon(QIcon(":img/app/flameshot.svg"));
@@ -59,7 +60,9 @@ ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) :
   m_vLayout->addWidget(m_infoLabel);
 
   m_NetworkAM = new QNetworkAccessManager(this);
-    connect(m_NetworkAM, &QNetworkAccessManager::finished, this,
+  connect(m_NetworkAM,
+          &QNetworkAccessManager::finished,
+          this,
           &ImgurUploader::handleReply);
 
   setAttribute(Qt::WA_DeleteOnClose);
@@ -68,15 +71,18 @@ ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) :
   // QTimer::singleShot(2000, this, &ImgurUploader::onUploadOk); // testing
 }
 
-void ImgurUploader::handleReply(QNetworkReply *reply) {
+void
+ImgurUploader::handleReply(QNetworkReply* reply)
+{
   m_spinner->deleteLater();
   if (reply->error() == QNetworkReply::NoError) {
     QJsonDocument response = QJsonDocument::fromJson(reply->readAll());
     QJsonObject json = response.object();
     QJsonObject data = json[QStringLiteral("data")].toObject();
     m_imageURL.setUrl(data[QStringLiteral("link")].toString());
-        m_deleteImageURL.setUrl(QStringLiteral("https://imgur.com/delete/%1").arg(
+    m_deleteImageURL.setUrl(
-                                    data[QStringLiteral("deletehash")].toString()));
+      QStringLiteral("https://imgur.com/delete/%1")
+        .arg(data[QStringLiteral("deletehash")].toString()));
     if (ConfigHandler().copyAndCloseAfterUploadEnabled()) {
       QApplication::clipboard()->setText(m_imageURL.toString());
       SystemNotification().sendMessage(QObject::tr("URL copied to clipboard."));
@@ -90,25 +96,30 @@ void ImgurUploader::handleReply(QNetworkReply *reply) {
   new QShortcut(Qt::Key_Escape, this, SLOT(close()));
 }
 
-void ImgurUploader::startDrag() {
+void
+ImgurUploader::startDrag()
+{
   QMimeData* mimeData = new QMimeData;
   mimeData->setUrls(QList<QUrl>{ m_imageURL });
   mimeData->setImageData(m_pixmap);
 
   QDrag* dragHandler = new QDrag(this);
   dragHandler->setMimeData(mimeData);
-    dragHandler->setPixmap(m_pixmap.scaled(256, 256, Qt::KeepAspectRatioByExpanding,
+  dragHandler->setPixmap(m_pixmap.scaled(
-                                           Qt::SmoothTransformation));
+    256, 256, Qt::KeepAspectRatioByExpanding, Qt::SmoothTransformation));
   dragHandler->exec();
 }
 
-void ImgurUploader::upload() {
+void
+ImgurUploader::upload()
+{
   QByteArray byteArray;
   QBuffer buffer(&byteArray);
   m_pixmap.save(&buffer, "PNG");
 
   QUrlQuery urlQuery;
-    urlQuery.addQueryItem(QStringLiteral("title"), QStringLiteral("flameshot_screenshot"));
+  urlQuery.addQueryItem(QStringLiteral("title"),
+                        QStringLiteral("flameshot_screenshot"));
   QString description = FileNameHandler().parsedPattern();
   urlQuery.addQueryItem(QStringLiteral("description"), description);
 
@@ -117,12 +128,16 @@ void ImgurUploader::upload() {
   QNetworkRequest request(url);
   request.setHeader(QNetworkRequest::ContentTypeHeader,
                     "application/application/x-www-form-urlencoded");
-    request.setRawHeader("Authorization", QStringLiteral("Client-ID %1").arg(IMGUR_CLIENT_ID).toUtf8());
+  request.setRawHeader(
+    "Authorization",
+    QStringLiteral("Client-ID %1").arg(IMGUR_CLIENT_ID).toUtf8());
 
   m_NetworkAM->post(request, byteArray);
 }
 
-void ImgurUploader::onUploadOk() {
+void
+ImgurUploader::onUploadOk()
+{
   m_infoLabel->deleteLater();
 
   m_notification = new NotificationWidget();
@@ -131,7 +146,8 @@ void ImgurUploader::onUploadOk() {
   ImageLabel* imageLabel = new ImageLabel();
   imageLabel->setScreenshot(m_pixmap);
   imageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    connect(imageLabel, &ImageLabel::dragInitiated, this, &ImgurUploader::startDrag);
+  connect(
+    imageLabel, &ImageLabel::dragInitiated, this, &ImgurUploader::startDrag);
   m_vLayout->addWidget(imageLabel);
 
   m_hLayout = new QHBoxLayout();
@@ -146,29 +162,38 @@ void ImgurUploader::onUploadOk() {
   m_hLayout->addWidget(m_openDeleteUrlButton);
   m_hLayout->addWidget(m_toClipboardButton);
 
-    connect(m_copyUrlButton, &QPushButton::clicked,
+  connect(
-            this, &ImgurUploader::copyURL);
+    m_copyUrlButton, &QPushButton::clicked, this, &ImgurUploader::copyURL);
-    connect(m_openUrlButton, &QPushButton::clicked,
+  connect(
-            this, &ImgurUploader::openURL);
+    m_openUrlButton, &QPushButton::clicked, this, &ImgurUploader::openURL);
-    connect(m_openDeleteUrlButton, &QPushButton::clicked,
+  connect(m_openDeleteUrlButton,
-            this, &ImgurUploader::openDeleteURL);
+          &QPushButton::clicked,
-    connect(m_toClipboardButton, &QPushButton::clicked,
+          this,
-            this, &ImgurUploader::copyImage);
+          &ImgurUploader::openDeleteURL);
+  connect(m_toClipboardButton,
+          &QPushButton::clicked,
+          this,
+          &ImgurUploader::copyImage);
 }
 
-void ImgurUploader::openURL() {
+void
+ImgurUploader::openURL()
+{
   bool successful = QDesktopServices::openUrl(m_imageURL);
   if (!successful) {
     m_notification->showMessage(tr("Unable to open the URL."));
   }
 }
 
-void ImgurUploader::copyURL() {
+void
+ImgurUploader::copyURL()
+{
   QApplication::clipboard()->setText(m_imageURL.toString());
   m_notification->showMessage(tr("URL copied to clipboard."));
 }
 
-void ImgurUploader::openDeleteURL()
+void
+ImgurUploader::openDeleteURL()
 {
   bool successful = QDesktopServices::openUrl(m_deleteImageURL);
   if (!successful) {
@@ -176,7 +201,9 @@ void ImgurUploader::openDeleteURL()
   }
 }
 
-void ImgurUploader::copyImage() {
+void
+ImgurUploader::copyImage()
+{
   QApplication::clipboard()->setPixmap(m_pixmap);
   m_notification->showMessage(tr("Screenshot copied to clipboard."));
 }

src/tools/imgur/imguruploader.h

@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include <QWidget>
 #include <QUrl>
+#include <QWidget>
 
 class QNetworkReply;
 class QNetworkAccessManager;
@@ -30,7 +30,8 @@ class QPushButton;
 class QUrl;
 class NotificationWidget;
 
-class ImgurUploader : public QWidget {
+class ImgurUploader : public QWidget
+{
   Q_OBJECT
 public:
   explicit ImgurUploader(const QPixmap& capture, QWidget* parent = nullptr);

src/tools/imgur/imguruploadertool.cpp

@@ -19,39 +19,55 @@
 #include "imguruploader.h"
 #include <QPainter>
 
-ImgurUploaderTool::ImgurUploaderTool(QObject *parent) : AbstractActionTool(parent) {
+ImgurUploaderTool::ImgurUploaderTool(QObject* parent)
+  : AbstractActionTool(parent)
+{}
 
-}
+bool
-
+ImgurUploaderTool::closeOnButtonPressed() const
-bool ImgurUploaderTool::closeOnButtonPressed() const {
+{
   return true;
 }
 
-QIcon ImgurUploaderTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+ImgurUploaderTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "cloud-upload.svg");
 }
-QString ImgurUploaderTool::name() const {
+QString
+ImgurUploaderTool::name() const
+{
   return tr("Image Uploader");
 }
 
-QString ImgurUploaderTool::nameID() {
+QString
+ImgurUploaderTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString ImgurUploaderTool::description() const {
+QString
+ImgurUploaderTool::description() const
+{
   return tr("Upload the selection to Imgur");
 }
 
-QWidget* ImgurUploaderTool::widget() {
+QWidget*
+ImgurUploaderTool::widget()
+{
   return new ImgurUploader(capture);
 }
 
-CaptureTool* ImgurUploaderTool::copy(QObject *parent) {
+CaptureTool*
+ImgurUploaderTool::copy(QObject* parent)
+{
   return new ImgurUploaderTool(parent);
 }
 
-void ImgurUploaderTool::pressed(const CaptureContext &context) {
+void
+ImgurUploaderTool::pressed(const CaptureContext& context)
+{
   capture = context.selectedScreenshotArea();
   emit requestAction(REQ_CAPTURE_DONE_OK);
   emit requestAction(REQ_ADD_EXTERNAL_WIDGETS);

src/tools/imgur/imguruploadertool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstractactiontool.h"
 
-class ImgurUploaderTool : public AbstractActionTool {
+class ImgurUploaderTool : public AbstractActionTool
+{
   Q_OBJECT
 public:
   explicit ImgurUploaderTool(QObject* parent = nullptr);

src/tools/launcher/applaunchertool.cpp

@@ -18,39 +18,55 @@
 #include "applaunchertool.h"
 #include "applauncherwidget.h"
 
-AppLauncher::AppLauncher(QObject *parent) : AbstractActionTool(parent) {
+AppLauncher::AppLauncher(QObject* parent)
+  : AbstractActionTool(parent)
+{}
 
-}
+bool
-
+AppLauncher::closeOnButtonPressed() const
-bool AppLauncher::closeOnButtonPressed() const {
+{
   return true;
 }
 
-QIcon AppLauncher::icon(const QColor &background, bool inEditor) const {
+QIcon
+AppLauncher::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "open_with.svg");
 }
-QString AppLauncher::name() const {
+QString
+AppLauncher::name() const
+{
   return tr("App Launcher");
 }
 
-QString AppLauncher::nameID() {
+QString
+AppLauncher::nameID()
+{
   return QLatin1String("");
 }
 
-QString AppLauncher::description() const {
+QString
+AppLauncher::description() const
+{
   return tr("Choose an app to open the capture");
 }
 
-QWidget* AppLauncher::widget() {
+QWidget*
+AppLauncher::widget()
+{
   return new AppLauncherWidget(capture);
 }
 
-CaptureTool* AppLauncher::copy(QObject *parent) {
+CaptureTool*
+AppLauncher::copy(QObject* parent)
+{
   return new AppLauncher(parent);
 }
 
-void AppLauncher::pressed(const CaptureContext &context) {
+void
+AppLauncher::pressed(const CaptureContext& context)
+{
   capture = context.selectedScreenshotArea();
   emit requestAction(REQ_CAPTURE_DONE_OK);
   emit requestAction(REQ_ADD_EXTERNAL_WIDGETS);

src/tools/launcher/applaunchertool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstractactiontool.h"
 
-class AppLauncher : public AbstractActionTool {
+class AppLauncher : public AbstractActionTool
+{
   Q_OBJECT
 public:
   explicit AppLauncher(QObject* parent = nullptr);

src/tools/launcher/applauncherwidget.cpp

@@ -16,27 +16,27 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "applauncherwidget.h"
-#include "src/utils/filenamehandler.h"
 #include "src/tools/launcher/launcheritemdelegate.h"
-#include "src/utils/globalvalues.h"
 #include "src/utils/confighandler.h"
+#include "src/utils/filenamehandler.h"
+#include "src/utils/globalvalues.h"
 #include "terminallauncher.h"
-#include <QDir>
-#include <QList>
-#include <QProcess>
-#include <QPixmap>
-#include <QListView>
-#include <QTabWidget>
-#include <QListWidgetItem>
-#include <QHBoxLayout>
 #include <QCheckBox>
+#include <QDir>
+#include <QHBoxLayout>
 #include <QLineEdit>
+#include <QList>
+#include <QListView>
+#include <QListWidgetItem>
 #include <QMessageBox>
+#include <QPixmap>
+#include <QProcess>
+#include <QTabWidget>
 
 namespace {
 
-QMap<QString, QString> catIconNames({
+QMap<QString, QString> catIconNames(
-            { "Multimedia", "applications-multimedia" },
+  { { "Multimedia", "applications-multimedia" },
     { "Development", "applications-development" },
     { "Graphics", "applications-graphics" },
     { "Network", "preferences-system-network" },
@@ -44,12 +44,12 @@ QMap<QString, QString> catIconNames({
     { "Science", "applications-science" },
     { "Settings", "preferences-desktop" },
     { "System", "preferences-system" },
-            { "Utility",    "applications-utilities" }
+    { "Utility", "applications-utilities" } });
-                                    });
 }
 
-AppLauncherWidget::AppLauncherWidget(const QPixmap &p, QWidget *parent):
+AppLauncherWidget::AppLauncherWidget(const QPixmap& p, QWidget* parent)
-    QWidget(parent), m_pixmap(p)
+  : QWidget(parent)
+  , m_pixmap(p)
 {
   setAttribute(Qt::WA_DeleteOnClose);
   setWindowIcon(QIcon(":img/app/flameshot.svg"));
@@ -71,16 +71,22 @@ AppLauncherWidget::AppLauncherWidget(const QPixmap &p, QWidget *parent):
   m_terminalCheckbox = new QCheckBox(tr("Launch in terminal"), this);
   m_keepOpenCheckbox = new QCheckBox(tr("Keep open after selection"), this);
   m_keepOpenCheckbox->setChecked(ConfigHandler().keepOpenAppLauncherValue());
-    connect(m_keepOpenCheckbox, &QCheckBox::clicked, this, &AppLauncherWidget::checkboxClicked);
+  connect(m_keepOpenCheckbox,
+          &QCheckBox::clicked,
+          this,
+          &AppLauncherWidget::checkboxClicked);
 
   // search items
   m_lineEdit = new QLineEdit;
-    connect(m_lineEdit, &QLineEdit::textChanged,
+  connect(m_lineEdit,
-            this, &AppLauncherWidget::searchChanged);
+          &QLineEdit::textChanged,
+          this,
+          &AppLauncherWidget::searchChanged);
   m_filterList = new QListWidget;
   m_filterList->hide();
   configureListView(m_filterList);
-    connect(m_filterList, &QListWidget::clicked, this, &AppLauncherWidget::launch);
+  connect(
+    m_filterList, &QListWidget::clicked, this, &AppLauncherWidget::launch);
 
   m_layout = new QVBoxLayout(this);
   m_layout->addWidget(m_filterList);
@@ -91,27 +97,31 @@ AppLauncherWidget::AppLauncherWidget(const QPixmap &p, QWidget *parent):
   m_lineEdit->setFocus();
 }
 
-void AppLauncherWidget::launch(const QModelIndex &index) {
+void
+AppLauncherWidget::launch(const QModelIndex& index)
+{
   if (!QFileInfo(m_tempFile).isReadable()) {
-        m_tempFile = FileNameHandler().generateAbsolutePath(QDir::tempPath()) + ".png";
+    m_tempFile =
+      FileNameHandler().generateAbsolutePath(QDir::tempPath()) + ".png";
     bool ok = m_pixmap.save(m_tempFile);
     if (!ok) {
-            QMessageBox::about(this, tr("Error"), tr("Unable to write in")
+      QMessageBox::about(
-                               + QDir::tempPath());
+        this, tr("Error"), tr("Unable to write in") + QDir::tempPath());
       return;
     }
   }
-    QString command = index.data(Qt::UserRole).toString().replace(
+  QString command = index.data(Qt::UserRole)
-                QRegExp("(\\%.)"), '"' + m_tempFile + '"');
+                      .toString()
+                      .replace(QRegExp("(\\%.)"), '"' + m_tempFile + '"');
 
   QString app_name = index.data(Qt::UserRole).toString().split(" ").at(0);
-    bool inTerminal = index.data(Qt::UserRole+1).toBool() ||
+  bool inTerminal =
-            m_terminalCheckbox->isChecked();
+    index.data(Qt::UserRole + 1).toBool() || m_terminalCheckbox->isChecked();
   if (inTerminal) {
     bool ok = TerminalLauncher::launchDetached(command);
     if (!ok) {
-            QMessageBox::about(this, tr("Error"),
+      QMessageBox::about(
-                               tr("Unable to launch in terminal."));
+        this, tr("Error"), tr("Unable to launch in terminal."));
     }
   } else {
     QProcess::startDetached(app_name, { m_tempFile });
@@ -121,13 +131,17 @@ void AppLauncherWidget::launch(const QModelIndex &index) {
   }
 }
 
-void AppLauncherWidget::checkboxClicked(const bool enabled) {
+void
+AppLauncherWidget::checkboxClicked(const bool enabled)
+{
   m_keepOpen = enabled;
   ConfigHandler().setKeepOpenAppLauncher(enabled);
   m_keepOpenCheckbox->setChecked(enabled);
 }
 
-void AppLauncherWidget::searchChanged(const QString &text) {
+void
+AppLauncherWidget::searchChanged(const QString& text)
+{
   if (text.isEmpty()) {
     m_filterList->hide();
     m_tabWidget->show();
@@ -145,9 +159,8 @@ void AppLauncherWidget::searchChanged(const QString &text) {
       }
       const QVector<DesktopAppData>& appList = m_appsMap[cat];
       for (const DesktopAppData& app : appList) {
-                if (!apps.contains(app) && (app.name.contains(regexp) ||
+        if (!apps.contains(app) &&
-                        app.description.contains(regexp) ))
+            (app.name.contains(regexp) || app.description.contains(regexp))) {
-                {
           apps.append(app);
         }
       }
@@ -156,7 +169,9 @@ void AppLauncherWidget::searchChanged(const QString &text) {
   }
 }
 
-void AppLauncherWidget::initListWidget() {
+void
+AppLauncherWidget::initListWidget()
+{
   m_tabWidget = new QTabWidget;
   const int size = GlobalValues::buttonBaseSize();
   m_tabWidget->setIconSize(QSize(size, size));
@@ -175,7 +190,8 @@ void AppLauncherWidget::initListWidget() {
     const QVector<DesktopAppData>& appList = m_appsMap[cat];
     addAppsToListWidget(itemsWidget, appList);
 
-        m_tabWidget->addTab(itemsWidget, QIcon::fromTheme(iconName), QLatin1String(""));
+    m_tabWidget->addTab(
+      itemsWidget, QIcon::fromTheme(iconName), QLatin1String(""));
     m_tabWidget->setTabToolTip(m_tabWidget->count(), cat);
     if (cat == QLatin1String("Graphics")) {
       m_tabWidget->setCurrentIndex(m_tabWidget->count() - 1);
@@ -183,7 +199,9 @@ void AppLauncherWidget::initListWidget() {
   }
 }
 
-void AppLauncherWidget::initAppMap() {
+void
+AppLauncherWidget::initAppMap()
+{
   QStringList categories({ "AudioVideo",
                            "Audio",
                            "Video",
@@ -201,7 +219,8 @@ void AppLauncherWidget::initAppMap() {
   // Unify multimedia.
   QVector<DesktopAppData> multimediaList;
   QStringList multimediaNames;
-    multimediaNames << QStringLiteral("AudioVideo") << QStringLiteral("Audio") << QStringLiteral("Video");
+  multimediaNames << QStringLiteral("AudioVideo") << QStringLiteral("Audio")
+                  << QStringLiteral("Video");
   for (const QString& name : multimediaNames) {
     if (!m_appsMap.contains(name)) {
       continue;
@@ -216,7 +235,9 @@ void AppLauncherWidget::initAppMap() {
   m_appsMap.insert(QStringLiteral("Multimedia"), multimediaList);
 }
 
-void AppLauncherWidget::configureListView(QListWidget *widget) {
+void
+AppLauncherWidget::configureListView(QListWidget* widget)
+{
   widget->setItemDelegate(new LauncherItemDelegate());
   widget->setViewMode(QListWidget::IconMode);
   widget->setResizeMode(QListView::Adjust);
@@ -224,12 +245,12 @@ void AppLauncherWidget::configureListView(QListWidget *widget) {
   widget->setFlow(QListView::LeftToRight);
   widget->setDragEnabled(false);
   widget->setMinimumWidth(GlobalValues::buttonBaseSize() * 11);
-    connect(widget, &QListWidget::clicked,
+  connect(widget, &QListWidget::clicked, this, &AppLauncherWidget::launch);
-            this, &AppLauncherWidget::launch);
 }
 
-void AppLauncherWidget::addAppsToListWidget(
+void
-        QListWidget *widget, const QVector<DesktopAppData> &appList)
+AppLauncherWidget::addAppsToListWidget(QListWidget* widget,
+                                       const QVector<DesktopAppData>& appList)
 {
   for (const DesktopAppData& app : appList) {
     QListWidgetItem* buttonItem = new QListWidgetItem(widget);
@@ -237,8 +258,7 @@ void AppLauncherWidget::addAppsToListWidget(
     buttonItem->setData(Qt::DisplayRole, app.name);
     buttonItem->setData(Qt::UserRole, app.exec);
     buttonItem->setData(Qt::UserRole + 1, app.showInTerminal);
-        QColor foregroundColor =
+    QColor foregroundColor = this->palette().color(QWidget::foregroundRole());
-                this->palette().color(QWidget::foregroundRole());
     buttonItem->setForeground(foregroundColor);
 
     buttonItem->setIcon(app.icon);

src/tools/launcher/applauncherwidget.h

@@ -18,8 +18,8 @@
 #pragma once
 
 #include "src/utils/desktopfileparse.h"
-#include <QWidget>
 #include <QMap>
+#include <QWidget>
 
 class QTabWidget;
 class QCheckBox;
@@ -27,7 +27,8 @@ class QVBoxLayout;
 class QLineEdit;
 class QListWidget;
 
-class AppLauncherWidget: public QWidget {
+class AppLauncherWidget : public QWidget
+{
   Q_OBJECT
 public:
   explicit AppLauncherWidget(const QPixmap& p, QWidget* parent = nullptr);

src/tools/launcher/launcheritemdelegate.cpp

@@ -19,13 +19,12 @@
 #include "src/utils/globalvalues.h"
 #include <QPainter>
 
-LauncherItemDelegate::LauncherItemDelegate(QObject *parent) :
+LauncherItemDelegate::LauncherItemDelegate(QObject* parent)
-    QStyledItemDelegate(parent)
+  : QStyledItemDelegate(parent)
-{
+{}
-}
 
-void LauncherItemDelegate::paint(
+void
-        QPainter *painter,
+LauncherItemDelegate::paint(QPainter* painter,
                             const QStyleOptionViewItem& option,
                             const QModelIndex& index) const
 {
@@ -34,8 +33,7 @@ void LauncherItemDelegate::paint(
     painter->save();
     painter->setPen(Qt::transparent);
     painter->setBrush(QPalette().highlight());
-        painter->drawRect(rect.x(), rect.y(),
+    painter->drawRect(rect.x(), rect.y(), rect.width() - 1, rect.height() - 1);
-                          rect.width() -1, rect.height() -1);
     painter->restore();
   }
   QIcon icon = index.data(Qt::DecorationRole).value<QIcon>();
@@ -48,15 +46,18 @@ void LauncherItemDelegate::paint(
   QPixmap pixIcon = icon.pixmap(size).scaled(size, Qt::KeepAspectRatio);
   painter->drawPixmap(rect.x() + (halfWidth - halfIcon),
                       rect.y() + (halfHeight / 2 - halfIcon),
-                        iconSide, iconSide, pixIcon);
+                      iconSide,
-    const QRect textRect(rect.x(), rect.y() + halfHeight,
+                      iconSide,
-                         rect.width(), halfHeight);
+                      pixIcon);
-    painter->drawText(textRect, Qt::TextWordWrap | Qt::AlignHCenter,
+  const QRect textRect(
+    rect.x(), rect.y() + halfHeight, rect.width(), halfHeight);
+  painter->drawText(textRect,
+                    Qt::TextWordWrap | Qt::AlignHCenter,
                     index.data(Qt::DisplayRole).toString());
 }
 
-QSize LauncherItemDelegate::sizeHint(
+QSize
-        const QStyleOptionViewItem &option,
+LauncherItemDelegate::sizeHint(const QStyleOptionViewItem& option,
                                const QModelIndex& index) const
 {
   Q_UNUSED(option);

src/tools/launcher/launcheritemdelegate.h

@@ -20,7 +20,8 @@
 #include "src/utils/desktopfileparse.h"
 #include <QStyledItemDelegate>
 
-class LauncherItemDelegate : public QStyledItemDelegate {
+class LauncherItemDelegate : public QStyledItemDelegate
+{
   Q_OBJECT
 public:
   explicit LauncherItemDelegate(QObject* parent = nullptr);
@@ -29,5 +30,6 @@ public:
              const QStyleOptionViewItem& option,
              const QModelIndex& index) const;
 
-    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+  QSize sizeHint(const QStyleOptionViewItem& option,
+                 const QModelIndex& index) const;
 };

src/tools/launcher/openwithprogram.cpp

@@ -15,28 +15,30 @@
 //     You should have received a copy of the GNU General Public License
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
-
 #include "openwithprogram.h"
 
 #if defined(Q_OS_WIN)
 #include "src/utils/filenamehandler.h"
 #include <QDir>
 #include <QMessageBox>
-#include <windows.h>
 #include <Shlobj.h>
+#include <windows.h>
 
 #pragma comment(lib, "Shell32.lib")
 #else
 #include "src/tools/launcher/applauncherwidget.h"
 #endif
 
-void showOpenWithMenu(const QPixmap &capture) {
+void
+showOpenWithMenu(const QPixmap& capture)
+{
 #if defined(Q_OS_WIN)
   QString tempFile =
     FileNameHandler().generateAbsolutePath(QDir::tempPath()) + ".png";
   bool ok = capture.save(tempFile);
   if (!ok) {
-        QMessageBox::about(nullptr, QObject::tr("Error"),
+    QMessageBox::about(nullptr,
+                       QObject::tr("Error"),
                        QObject::tr("Unable to write in") + QDir::tempPath());
     return;
   }

src/tools/launcher/openwithprogram.h

@@ -19,4 +19,5 @@
 
 #include <QPixmap>
 
-void showOpenWithMenu(const QPixmap &capture);
+void
+showOpenWithMenu(const QPixmap& capture);

src/tools/launcher/terminallauncher.cpp

@@ -16,10 +16,10 @@
 //     along with Flameshot.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "terminallauncher.h"
-#include <QProcess>
 #include <QDir>
-#include <QStandardPaths>
+#include <QProcess>
 #include <QProcessEnvironment>
+#include <QStandardPaths>
 
 namespace {
 static const TerminalApp terminalApps[] = {
@@ -38,10 +38,13 @@ namespace {
 };
 }
 
-TerminalLauncher::TerminalLauncher(QObject *parent) : QObject(parent) {
+TerminalLauncher::TerminalLauncher(QObject* parent)
-}
+  : QObject(parent)
+{}
 
-TerminalApp TerminalLauncher::getPreferedTerminal() {
+TerminalApp
+TerminalLauncher::getPreferedTerminal()
+{
   TerminalApp res;
   for (const TerminalApp& app : terminalApps) {
     QString path = QStandardPaths::findExecutable(app.name);
@@ -53,7 +56,9 @@ TerminalApp TerminalLauncher::getPreferedTerminal() {
   return res;
 }
 
-bool TerminalLauncher::launchDetached(const QString &command) {
+bool
+TerminalLauncher::launchDetached(const QString& command)
+{
   TerminalApp app = getPreferedTerminal();
   QString s = app.name + " " + app.arg + " " + command;
   return QProcess::startDetached(app.name, { app.arg, command });

src/tools/launcher/terminallauncher.h

@@ -19,17 +19,20 @@
 
 #include <QObject>
 
-struct TerminalApp {
+struct TerminalApp
+{
   QString name;
   QString arg;
 };
 
-class TerminalLauncher : public QObject {
+class TerminalLauncher : public QObject
+{
   Q_OBJECT
 public:
   explicit TerminalLauncher(QObject* parent = nullptr);
 
   static bool launchDetached(const QString& command);
+
 private:
   static TerminalApp getPreferedTerminal();
 };

src/tools/line/linetool.cpp

@@ -24,32 +24,46 @@ namespace {
 
 }
 
-LineTool::LineTool(QObject *parent) : AbstractTwoPointTool(parent) {
+LineTool::LineTool(QObject* parent)
+  : AbstractTwoPointTool(parent)
+{
   m_supportsOrthogonalAdj = true;
   m_supportsDiagonalAdj = true;
 }
 
-QIcon LineTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+LineTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "line.svg");
 }
-QString LineTool::name() const {
+QString
+LineTool::name() const
+{
   return tr("Line");
 }
 
-QString LineTool::nameID() {
+QString
+LineTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString LineTool::description() const {
+QString
+LineTool::description() const
+{
   return tr("Set the Line as the paint tool");
 }
 
-CaptureTool* LineTool::copy(QObject *parent) {
+CaptureTool*
+LineTool::copy(QObject* parent)
+{
   return new LineTool(parent);
 }
 
-void LineTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) {
+void
+LineTool::process(QPainter& painter, const QPixmap& pixmap, bool recordUndo)
+{
   if (recordUndo) {
     updateBackup(pixmap);
   }
@@ -57,18 +71,24 @@ void LineTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo
   painter.drawLine(m_points.first, m_points.second);
 }
 
-void LineTool::paintMousePreview(QPainter &painter, const CaptureContext &context) {
+void
+LineTool::paintMousePreview(QPainter& painter, const CaptureContext& context)
+{
   painter.setPen(QPen(context.color, PADDING_VALUE + context.thickness));
   painter.drawLine(context.mousePos, context.mousePos);
 }
 
-void LineTool::drawStart(const CaptureContext &context) {
+void
+LineTool::drawStart(const CaptureContext& context)
+{
   m_color = context.color;
   m_thickness = context.thickness + PADDING_VALUE;
   m_points.first = context.mousePos;
   m_points.second = context.mousePos;
 }
 
-void LineTool::pressed(const CaptureContext &context) {
+void
+LineTool::pressed(const CaptureContext& context)
+{
   Q_UNUSED(context);
 }

src/tools/line/linetool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstracttwopointtool.h"
 
-class LineTool : public AbstractTwoPointTool {
+class LineTool : public AbstractTwoPointTool
+{
   Q_OBJECT
 public:
   explicit LineTool(QObject* parent = nullptr);
@@ -30,9 +31,11 @@ public:
   QString description() const override;
 
   CaptureTool* copy(QObject* parent = nullptr) override;
-    void process(
+  void process(QPainter& painter,
-            QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override;
+               const QPixmap& pixmap,
-    void paintMousePreview(QPainter &painter, const CaptureContext &context) override;
+               bool recordUndo = false) override;
+  void paintMousePreview(QPainter& painter,
+                         const CaptureContext& context) override;
 
 public slots:
   void drawStart(const CaptureContext& context) override;

src/tools/marker/markertool.cpp

@@ -24,32 +24,46 @@ namespace {
 
 }
 
-MarkerTool::MarkerTool(QObject *parent) : AbstractTwoPointTool(parent) {
+MarkerTool::MarkerTool(QObject* parent)
+  : AbstractTwoPointTool(parent)
+{
   m_supportsOrthogonalAdj = true;
   m_supportsDiagonalAdj = true;
 }
 
-QIcon MarkerTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+MarkerTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "marker.svg");
 }
-QString MarkerTool::name() const {
+QString
+MarkerTool::name() const
+{
   return tr("Marker");
 }
 
-QString MarkerTool::nameID() {
+QString
+MarkerTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString MarkerTool::description() const {
+QString
+MarkerTool::description() const
+{
   return tr("Set the Marker as the paint tool");
 }
 
-CaptureTool* MarkerTool::copy(QObject *parent) {
+CaptureTool*
+MarkerTool::copy(QObject* parent)
+{
   return new MarkerTool(parent);
 }
 
-void MarkerTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) {
+void
+MarkerTool::process(QPainter& painter, const QPixmap& pixmap, bool recordUndo)
+{
   if (recordUndo) {
     updateBackup(pixmap);
   }
@@ -59,24 +73,32 @@ void MarkerTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUn
   painter.drawLine(m_points.first, m_points.second);
 }
 
-void MarkerTool::paintMousePreview(QPainter &painter, const CaptureContext &context) {
+void
+MarkerTool::paintMousePreview(QPainter& painter, const CaptureContext& context)
+{
   painter.setCompositionMode(QPainter::CompositionMode_Multiply);
   painter.setOpacity(0.35);
   painter.setPen(QPen(context.color, PADDING_VALUE + context.thickness));
   painter.drawLine(context.mousePos, context.mousePos);
 }
 
-void MarkerTool::drawStart(const CaptureContext &context) {
+void
+MarkerTool::drawStart(const CaptureContext& context)
+{
   m_color = context.color;
   m_thickness = context.thickness + PADDING_VALUE;
   m_points.first = context.mousePos;
   m_points.second = context.mousePos;
 }
 
-void MarkerTool::pressed(const CaptureContext &context) {
+void
+MarkerTool::pressed(const CaptureContext& context)
+{
   Q_UNUSED(context);
 }
 
-void MarkerTool::thicknessChanged(const int th) {
+void
+MarkerTool::thicknessChanged(const int th)
+{
   m_thickness = th + PADDING_VALUE;
 }

src/tools/marker/markertool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstracttwopointtool.h"
 
-class MarkerTool : public AbstractTwoPointTool {
+class MarkerTool : public AbstractTwoPointTool
+{
   Q_OBJECT
 public:
   explicit MarkerTool(QObject* parent = nullptr);
@@ -30,9 +31,11 @@ public:
   QString description() const override;
 
   CaptureTool* copy(QObject* parent = nullptr) override;
-    void process(
+  void process(QPainter& painter,
-            QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override;
+               const QPixmap& pixmap,
-    void paintMousePreview(QPainter &painter, const CaptureContext &context) override;
+               bool recordUndo = false) override;
+  void paintMousePreview(QPainter& painter,
+                         const CaptureContext& context) override;
 
 public slots:
   void drawStart(const CaptureContext& context) override;

src/tools/move/movetool.cpp

@@ -18,35 +18,49 @@
 #include "movetool.h"
 #include <QPainter>
 
-MoveTool::MoveTool(QObject *parent) : AbstractActionTool(parent) {
+MoveTool::MoveTool(QObject* parent)
+  : AbstractActionTool(parent)
+{}
 
-}
+bool
-
+MoveTool::closeOnButtonPressed() const
-bool MoveTool::closeOnButtonPressed() const {
+{
   return false;
 }
 
-QIcon MoveTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+MoveTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "cursor-move.svg");
 }
-QString MoveTool::name() const {
+QString
+MoveTool::name() const
+{
   return tr("Move");
 }
 
-QString MoveTool::nameID() {
+QString
+MoveTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString MoveTool::description() const {
+QString
+MoveTool::description() const
+{
   return tr("Move the selection area");
 }
 
-CaptureTool* MoveTool::copy(QObject *parent) {
+CaptureTool*
+MoveTool::copy(QObject* parent)
+{
   return new MoveTool(parent);
 }
 
-void MoveTool::pressed(const CaptureContext &context) {
+void
+MoveTool::pressed(const CaptureContext& context)
+{
   Q_UNUSED(context);
   emit requestAction(REQ_MOVE_MODE);
 }

src/tools/move/movetool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstractactiontool.h"
 
-class MoveTool : public AbstractActionTool {
+class MoveTool : public AbstractActionTool
+{
   Q_OBJECT
 public:
   explicit MoveTool(QObject* parent = nullptr);

src/tools/pencil/penciltool.cpp

@@ -18,31 +18,43 @@
 #include "penciltool.h"
 #include <QPainter>
 
-PencilTool::PencilTool(QObject *parent) : AbstractPathTool(parent) {
+PencilTool::PencilTool(QObject* parent)
+  : AbstractPathTool(parent)
+{}
 
-}
+QIcon
-
+PencilTool::icon(const QColor& background, bool inEditor) const
-QIcon PencilTool::icon(const QColor &background, bool inEditor) const {
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "pencil.svg");
 }
-QString PencilTool::name() const {
+QString
+PencilTool::name() const
+{
   return tr("Pencil");
 }
 
-QString PencilTool::nameID() {
+QString
+PencilTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString PencilTool::description() const {
+QString
+PencilTool::description() const
+{
   return tr("Set the Pencil as the paint tool");
 }
 
-CaptureTool* PencilTool::copy(QObject *parent) {
+CaptureTool*
+PencilTool::copy(QObject* parent)
+{
   return new PencilTool(parent);
 }
 
-void PencilTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUndo) {
+void
+PencilTool::process(QPainter& painter, const QPixmap& pixmap, bool recordUndo)
+{
   if (recordUndo) {
     updateBackup(pixmap);
   }
@@ -50,12 +62,16 @@ void PencilTool::process(QPainter &painter, const QPixmap &pixmap, bool recordUn
   painter.drawPolyline(m_points.data(), m_points.size());
 }
 
-void PencilTool::paintMousePreview(QPainter &painter, const CaptureContext &context) {
+void
+PencilTool::paintMousePreview(QPainter& painter, const CaptureContext& context)
+{
   painter.setPen(QPen(context.color, context.thickness + 2));
   painter.drawLine(context.mousePos, context.mousePos);
 }
 
-void PencilTool::drawStart(const CaptureContext &context) {
+void
+PencilTool::drawStart(const CaptureContext& context)
+{
   m_color = context.color;
   m_thickness = context.thickness + 2;
   m_points.append(context.mousePos);
@@ -63,6 +79,8 @@ void PencilTool::drawStart(const CaptureContext &context) {
   m_backupArea.setBottomRight(context.mousePos);
 }
 
-void PencilTool::pressed(const CaptureContext &context) {
+void
+PencilTool::pressed(const CaptureContext& context)
+{
   Q_UNUSED(context);
 }

src/tools/pencil/penciltool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstractpathtool.h"
 
-class PencilTool : public AbstractPathTool {
+class PencilTool : public AbstractPathTool
+{
   Q_OBJECT
 public:
   explicit PencilTool(QObject* parent = nullptr);
@@ -31,9 +32,11 @@ public:
 
   CaptureTool* copy(QObject* parent = nullptr) override;
 
-    void process(
+  void process(QPainter& painter,
-            QPainter &painter, const QPixmap &pixmap, bool recordUndo = false) override;
+               const QPixmap& pixmap,
-    void paintMousePreview(QPainter &painter, const CaptureContext &context) override;
+               bool recordUndo = false) override;
+  void paintMousePreview(QPainter& painter,
+                         const CaptureContext& context) override;
 
 public slots:
   void drawStart(const CaptureContext& context) override;

src/tools/pin/pintool.cpp

@@ -18,31 +18,43 @@
 #include "pintool.h"
 #include "src/tools/pin/pinwidget.h"
 
-PinTool::PinTool(QObject *parent) : AbstractActionTool(parent) {
+PinTool::PinTool(QObject* parent)
+  : AbstractActionTool(parent)
+{}
 
-}
+bool
-
+PinTool::closeOnButtonPressed() const
-bool PinTool::closeOnButtonPressed() const {
+{
   return true;
 }
 
-QIcon PinTool::icon(const QColor &background, bool inEditor) const {
+QIcon
+PinTool::icon(const QColor& background, bool inEditor) const
+{
   Q_UNUSED(inEditor);
   return QIcon(iconPath(background) + "pin.svg");
 }
-QString PinTool::name() const {
+QString
+PinTool::name() const
+{
   return tr("Pin Tool");
 }
 
-QString PinTool::nameID() {
+QString
+PinTool::nameID()
+{
   return QLatin1String("");
 }
 
-QString PinTool::description() const {
+QString
+PinTool::description() const
+{
   return tr("Pin image on the desktop");
 }
 
-QWidget* PinTool::widget() {
+QWidget*
+PinTool::widget()
+{
   PinWidget* w = new PinWidget(m_pixmap);
   const int&& m = w->margin();
   QRect adjusted_pos = m_geometry + QMargins(m, m, m, m);
@@ -50,15 +62,18 @@ QWidget* PinTool::widget() {
   return w;
 }
 
-CaptureTool* PinTool::copy(QObject *parent) {
+CaptureTool*
+PinTool::copy(QObject* parent)
+{
   return new PinTool(parent);
 }
 
-void PinTool::pressed(const CaptureContext &context) {
+void
+PinTool::pressed(const CaptureContext& context)
+{
   emit requestAction(REQ_CAPTURE_DONE_OK);
   m_geometry = context.selection;
   m_geometry.setTopLeft(m_geometry.topLeft() + context.widgetOffset);
   m_pixmap = context.selectedScreenshotArea();
   emit requestAction(REQ_ADD_EXTERNAL_WIDGETS);
-
 }

src/tools/pin/pintool.h

@@ -19,7 +19,8 @@
 
 #include "src/tools/abstractactiontool.h"
 
-class PinTool : public AbstractActionTool {
+class PinTool : public AbstractActionTool
+{
   Q_OBJECT
 public:
   explicit PinTool(QObject* parent = nullptr);