Merge pull request #169 from saeugetier/feature/143-code-formating

Feature/143 code formating
saeugetier · Jun 19, 2024 · b527c23 · b527c23
2 parents d39f2e4 + 9aa00df
commit b527c23
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 28 deletions.
diff --git a/src/call_once.h b/src/call_once.h
@@ -9,13 +9,13 @@
 #include <QThread>
 
 namespace CallOnce {
-    enum ECallOnce {
-        CO_Request,
-        CO_InProgress,
-        CO_Finished
-    };
+enum ECallOnce {
+    CO_Request,
+    CO_InProgress,
+    CO_Finished
+};
 
-    Q_GLOBAL_STATIC(QThreadStorage<QAtomicInt*>, once_flag)
+Q_GLOBAL_STATIC(QThreadStorage<QAtomicInt*>, once_flag)
 }
 
 template <class Function>
@@ -32,7 +32,7 @@ inline static void qCallOnce(Function func, QBasicAtomicInt& flag)
     if (protectFlag == CO_Finished)
         return;
     if (protectFlag == CO_Request && flag.testAndSetRelaxed(protectFlag,
-                                                           CO_InProgress)) {
+                                                            CO_InProgress)) {
         func();
         flag.fetchAndStoreRelease(CO_Finished);
     }

diff --git a/src/collageiconmodel.cpp b/src/collageiconmodel.cpp
@@ -138,11 +138,11 @@ void CollageIconModel::clear()
 
 QString CollageIconModel::getIconName(int index)
 {
-     if (index < 0 || index >= mIcons.count())
-         return QString();
+    if (index < 0 || index >= mIcons.count())
+        return QString();
 
-     const CollageIcon &icon = mIcons[index];
-     return icon.name();
+    const CollageIcon &icon = mIcons[index];
+    return icon.name();
 }
 
 bool CollageIconModel::showPrintable() const

diff --git a/src/collageiconmodel.h b/src/collageiconmodel.h
@@ -30,9 +30,9 @@ class CollageIconModel : public QAbstractListModel
     Q_PROPERTY(bool showPrintable READ showPrintable WRITE setShowPrintable NOTIFY showPrintableChanged)
 public:
     enum IconRoles {
-       NameRole = Qt::UserRole + 1,
-       IconRole,
-       PrintableRole
+        NameRole = Qt::UserRole + 1,
+        IconRole,
+        PrintableRole
     };
 
     CollageIconModel(QObject *parent = 0);

diff --git a/src/collageimagemodel.cpp b/src/collageimagemodel.cpp
@@ -459,10 +459,10 @@ bool CollageImage::parseXml(const QDomNode &node)
         if(borderMarginNode.count() == 1)
         {
             if(borderMarginNode.item(0).hasAttributes() &&
-                    borderMarginNode.item(0).toElement().hasAttribute("top") &&
-                    borderMarginNode.item(0).toElement().hasAttribute("left") &&
-                    borderMarginNode.item(0).toElement().hasAttribute("right") &&
-                    borderMarginNode.item(0).toElement().hasAttribute("bottom"))
+                borderMarginNode.item(0).toElement().hasAttribute("top") &&
+                borderMarginNode.item(0).toElement().hasAttribute("left") &&
+                borderMarginNode.item(0).toElement().hasAttribute("right") &&
+                borderMarginNode.item(0).toElement().hasAttribute("bottom"))
             {
                 bool ok;
                 QString top = borderMarginNode.item(0).toElement().attribute("top");

diff --git a/src/collagemodelfactory.cpp b/src/collagemodelfactory.cpp
@@ -126,9 +126,9 @@ bool CollageModelFactory::parseXml(const QDomNode &node)
 
     if(rootElement.tagName() != "catalog")
     {
-       mErrorMsg = "Excepted 'catalog' root node";
-       mLine = rootElement.lineNumber();
-       return false;
+        mErrorMsg = "Excepted 'catalog' root node";
+        mLine = rootElement.lineNumber();
+        return false;
     }
 
     if(!rootElement.hasAttribute("version") || rootElement.attribute("version") != "1.0")

diff --git a/src/fileio.cpp b/src/fileio.cpp
@@ -13,7 +13,7 @@ QByteArray FileIO::read()
     }
     else
     {
-         file.setFileName(mSource.toLocalFile());
+        file.setFileName(mSource.toLocalFile());
     }
 
     if (!file.open(QIODevice::ReadOnly))

diff --git a/src/filesystem.cpp b/src/filesystem.cpp
@@ -140,7 +140,7 @@ void FileSystem::startCopyFilesToRemovableDrive()
                     int progress = (100 * i + 1) / files.count();
                     qDebug() << "Copy file: " << imagePath + "/" + files[i] << " to: " << removableDrivePath + "/" + files[i] << " Progress: " << progress;
                     if(QFile::exists(removableDrivePath + "/" + files[i]))
-                            QFile::remove(removableDrivePath + "/" + files[i]);
+                        QFile::remove(removableDrivePath + "/" + files[i]);
 
                     if(!QFile::copy(imagePath + "/" + files[i], removableDrivePath + "/" + files[i]))
                     {

diff --git a/src/standardprinter.cpp b/src/standardprinter.cpp
@@ -63,11 +63,11 @@ StandardPrinter *StandardPrinter::createInternal(const QString &name)
     auto printers = QPrinterInfo::availablePrinters();
     for(auto printer: printers)
     {
-       if(printer.printerName() == name)
-       {
+        if(printer.printerName() == name)
+        {
             ptr = new StandardPrinter(printer);
             break;
-       }
+        }
     }
     return ptr;
 }
diff --git a/src/system.cpp b/src/system.cpp
@@ -49,9 +49,9 @@ bool System::setTime(QDateTime date)
         }
     }
 #elif __APPLE__
-    #pragma message ( "setting the time is not implemented for MacOS" )
+#pragma message ( "setting the time is not implemented for MacOS" )
 #elif _WIN32
-    #pragma message ( "setting the time is not implemented for Windows" )
+#pragma message ( "setting the time is not implemented for Windows" )
 #endif
     return (result == 0);
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ QByteArray FileIO::read() @@
         }
         else
         {
-             file.setFileName(mSource.toLocalFile());
+            file.setFileName(mSource.toLocalFile());
         }
         if (!file.open(QIODevice::ReadOnly))
@@ Expand Down @@