Version 1.0.13

Author: 4lex4

Application.cpp

@@ -33,9 +33,7 @@
 #include <config.h>
 #include <QtCore/QDir>
 
-Application::Application(int& argc, char** argv)
-        : QApplication(argc, argv),
-          m_currentLocale("en") {
+Application::Application(int& argc, char** argv) : QApplication(argc, argv), m_currentLocale("en") {
     initTranslations();
 }
 
@@ -73,20 +71,15 @@ const QString& Application::getCurrentLocale() const {
 }
 
 std::list<QString> Application::getLanguagesList() const {
-    std::list<QString> list{ "en" };
-    std::transform(m_translationsMap.begin(), m_translationsMap.end(),
-                   std::back_inserter(list),
-                   [](const std::pair<QString, QString>& val) {
-        return val.first;
-    });
+    std::list<QString> list{"en"};
+    std::transform(m_translationsMap.begin(), m_translationsMap.end(), std::back_inserter(list),
+                   [](const std::pair<QString, QString>& val) { return val.first; });
 
     return list;
 }
 
 void Application::initTranslations() {
-    const QStringList translation_dirs(
-            QString::fromUtf8(TRANSLATION_DIRS).split(QChar(':'), QString::SkipEmptyParts)
-    );
+    const QStringList translation_dirs(QString::fromUtf8(TRANSLATION_DIRS).split(QChar(':'), QString::SkipEmptyParts));
 
     const QStringList language_file_filter("scantailor_*.qm");
     for (const QString& path : translation_dirs) {

Application.h

@@ -28,7 +28,7 @@
 #include "OutputFileNameGenerator.h"
 
 class Application : public QApplication {
-Q_OBJECT
+    Q_OBJECT
 public:
     Application(int& argc, char** argv);
 

AtomicFileOverwriter.cpp

@@ -70,4 +70,3 @@ void AtomicFileOverwriter::abort() {
     m_ptrTempFile.reset();  // See comments in commit()
     QFile::remove(temp_file_path);
 }
-

AtomicFileOverwriter.h

@@ -34,7 +34,7 @@ class QTemporaryFile;
  * in the same directory as the target file.
  */
 class AtomicFileOverwriter {
-DECLARE_NON_COPYABLE(AtomicFileOverwriter)
+    DECLARE_NON_COPYABLE(AtomicFileOverwriter)
 
 public:
     AtomicFileOverwriter();

AutoManualMode.h

@@ -19,9 +19,6 @@
 #ifndef AUTOMANUALMODE_H_
 #define AUTOMANUALMODE_H_
 
-enum AutoManualMode {
-    MODE_AUTO,
-    MODE_MANUAL
-};
+enum AutoManualMode { MODE_AUTO, MODE_MANUAL };
 
 #endif

BackgroundExecutor.cpp

@@ -56,8 +56,7 @@ class BackgroundExecutor::Impl : public QThread {
 
 /*============================ BackgroundExecutor ==========================*/
 
-BackgroundExecutor::BackgroundExecutor()
-        : m_ptrImpl(new Impl(*this)) {
+BackgroundExecutor::BackgroundExecutor() : m_ptrImpl(new Impl(*this)) {
 }
 
 BackgroundExecutor::~BackgroundExecutor() = default;
@@ -74,8 +73,7 @@ void BackgroundExecutor::enqueueTask(const TaskPtr& task) {
 
 /*===================== BackgroundExecutor::Dispatcher =====================*/
 
-BackgroundExecutor::Dispatcher::Dispatcher(Impl& owner)
-        : m_rOwner(owner) {
+BackgroundExecutor::Dispatcher::Dispatcher(Impl& owner) : m_rOwner(owner) {
 }
 
 void BackgroundExecutor::Dispatcher::customEvent(QEvent* event) {
@@ -88,9 +86,7 @@ void BackgroundExecutor::Dispatcher::customEvent(QEvent* event) {
 
         const TaskResultPtr result((*task)());
         if (result) {
-            QCoreApplication::postEvent(
-                    &m_rOwner, new ResultEvent(result)
-            );
+            QCoreApplication::postEvent(&m_rOwner, new ResultEvent(result));
         }
     } catch (const std::bad_alloc&) {
         OutOfMemoryHandler::instance().handleOutOfMemorySituation();
@@ -100,9 +96,7 @@ void BackgroundExecutor::Dispatcher::customEvent(QEvent* event) {
 /*======================= BackgroundExecutor::Impl =========================*/
 
 BackgroundExecutor::Impl::Impl(BackgroundExecutor& owner)
-        : m_rOwner(owner),
-          m_dispatcher(*this),
-          m_threadStarted(false) {
+        : m_rOwner(owner), m_dispatcher(*this), m_threadStarted(false) {
     m_dispatcher.moveToThread(this);
 }
 
@@ -132,4 +126,3 @@ void BackgroundExecutor::Impl::customEvent(QEvent* event) {
 
     (*result)();
 }
-

BackgroundExecutor.h

@@ -26,7 +26,7 @@
 #include <memory>
 
 class BackgroundExecutor {
-DECLARE_NON_COPYABLE(BackgroundExecutor)
+    DECLARE_NON_COPYABLE(BackgroundExecutor)
 
 public:
     typedef intrusive_ptr<AbstractCommand0<void>> TaskResultPtr;

BackgroundTask.cpp

@@ -27,4 +27,3 @@ void BackgroundTask::throwIfCancelled() const {
         throw CancelledException();
     }
 }
-

BackgroundTask.h

@@ -28,19 +28,15 @@
 
 class BackgroundTask : public AbstractCommand0<FilterResultPtr>, public TaskStatus {
 public:
-    enum Type {
-        INTERACTIVE,
-        BATCH
-    };
+    enum Type { INTERACTIVE, BATCH };
 
     class CancelledException : public std::exception {
     public:
         const char* what() const throw() override;
     };
 
 
-    explicit BackgroundTask(Type type)
-            : m_type(type) {
+    explicit BackgroundTask(Type type) : m_type(type) {
     }
 
     Type type() const {

BasicImageView.cpp

@@ -22,15 +22,11 @@
 #include "BasicImageView.h"
 
 BasicImageView::BasicImageView(const QImage& image, const ImagePixmapUnion& downscaled_image, const Margins& margins)
-        : ImageViewBase(
-        image, downscaled_image,
-        ImagePresentation(QTransform(), QRectF(image.rect())), margins
-),
+        : ImageViewBase(image, downscaled_image, ImagePresentation(QTransform(), QRectF(image.rect())), margins),
           m_dragHandler(*this),
           m_zoomHandler(*this) {
     rootInteractionHandler().makeLastFollower(m_dragHandler);
     rootInteractionHandler().makeLastFollower(m_zoomHandler);
 }
 
 BasicImageView::~BasicImageView() = default;
-