Merge branch 'develop' into icon-indexing

Signed-off-by: Tayou <31988415+TayouVR@users.noreply.github.com>

2 files changed, 17 insertions, 32 deletions

diff --git a/libraries/systeminfo/include/distroutils.h b/libraries/systeminfo/include/distroutils.h
index 2e85f433..caa2688c 100644
--- a/libraries/systeminfo/include/distroutils.h
+++ b/libraries/systeminfo/include/distroutils.h
@@ -1,23 +1,22 @@
-#include "sys.h"
 #include <QString>
+#include "sys.h"
 
 namespace Sys {
-struct LsbInfo
-{
+struct LsbInfo {
     QString distributor;
     QString version;
     QString description;
     QString codename;
 };
 
-bool main_lsb_info(LsbInfo & out);
-bool fallback_lsb_info(Sys::LsbInfo & out);
-void lsb_postprocess(Sys::LsbInfo & lsb, Sys::DistributionInfo & out);
+bool main_lsb_info(LsbInfo& out);
+bool fallback_lsb_info(Sys::LsbInfo& out);
+void lsb_postprocess(Sys::LsbInfo& lsb, Sys::DistributionInfo& out);
 Sys::DistributionInfo read_lsb_release();
 
-QString _extract_distribution(const QString & x);
-QString _extract_version(const QString & x);
+QString _extract_distribution(const QString& x);
+QString _extract_version(const QString& x);
 Sys::DistributionInfo read_legacy_release();
 
 Sys::DistributionInfo read_os_release();
-}
+}  // namespace Sys
diff --git a/libraries/systeminfo/include/sys.h b/libraries/systeminfo/include/sys.h
index 6a6a7c82..dfebbe90 100644
--- a/libraries/systeminfo/include/sys.h
+++ b/libraries/systeminfo/include/sys.h
@@ -1,19 +1,12 @@
 #pragma once
 #include <QString>
 
-namespace Sys
-{
+namespace Sys {
 const uint64_t mebibyte = 1024ull * 1024ull;
 
-enum class KernelType {
-    Undetermined,
-    Windows,
-    Darwin,
-    Linux
-};
+enum class KernelType { Undetermined, Windows, Darwin, Linux };
 
-struct KernelInfo
-{
+struct KernelInfo {
     QString kernelName;
     QString kernelVersion;
 
@@ -26,25 +19,18 @@ struct KernelInfo
 
 KernelInfo getKernelInfo();
 
-struct DistributionInfo
-{
+struct DistributionInfo {
     DistributionInfo operator+(const DistributionInfo& rhs) const
     {
         DistributionInfo out;
-        if(!distributionName.isEmpty())
-        {
+        if (!distributionName.isEmpty()) {
             out.distributionName = distributionName;
-        }
-        else
-        {
+        } else {
             out.distributionName = rhs.distributionName;
         }
-        if(!distributionVersion.isEmpty())
-        {
+        if (!distributionVersion.isEmpty()) {
             out.distributionVersion = distributionVersion;
-        }
-        else
-        {
+        } else {
             out.distributionVersion = rhs.distributionVersion;
         }
         return out;
@@ -56,4 +42,4 @@ struct DistributionInfo
 DistributionInfo getDistributionInfo();
 
 uint64_t getSystemRam();
-}
+}  // namespace Sys