Merge branch 'master' into 'master'

Reformat code to common style and fix some small issues See individual commits @Sage @rainemak See merge request !6
sailfishos · Oct 11, 2016 · 55f003e · 55f003e
2 parents a470b9b + 3321d4a
commit 55f003e
Show file tree

Hide file tree

Showing 75 changed files with 4,980 additions and 4,689 deletions.
diff --git a/declarative/declarativessudeviceinfo.h b/declarative/declarativessudeviceinfo.h
@@ -19,9 +19,9 @@ class DeclarativeSsuDeviceInfo : public QObject
      * A list of types ssu provides shiny values suitable for displaying
      */
     enum DisplayType {
-      DeviceManufacturer = Ssu::DeviceManufacturer,  ///< Manufacturer, like ACME Corp. Board mappings key "deviceManufacturer"
-      DeviceModel = Ssu::DeviceModel,                ///< Marketed device name, like Pogoblaster 3000. Board mappings key "prettyModel"
-      DeviceDesignation = Ssu::DeviceDesignation,    ///< Type designation, like NCC-1701. Beard mappings key "deviceDesignation"
+        DeviceManufacturer = Ssu::DeviceManufacturer,  ///< Manufacturer, like ACME Corp. Board mappings key "deviceManufacturer"
+        DeviceModel = Ssu::DeviceModel,                ///< Marketed device name, like Pogoblaster 3000. Board mappings key "prettyModel"
+        DeviceDesignation = Ssu::DeviceDesignation,    ///< Type designation, like NCC-1701. Beard mappings key "deviceDesignation"
     };
 
     DeclarativeSsuDeviceInfo();
@@ -37,7 +37,7 @@ class DeclarativeSsuDeviceInfo : public QObject
      * If the device is not a variant it will return an empty string. If
      * fallback is set to true it return the device model in this case.
      */
-    Q_INVOKABLE QString deviceVariant(bool fallback=false);
+    Q_INVOKABLE QString deviceVariant(bool fallback = false);
     /**
      * Try to find out ond what kind of system this is running
      */