Code formatting/indentation unified in trunk

[qtrapids] / src / include / qtrapids / format.hpp

diff --git a/src/include/qtrapids/format.hpp b/src/include/qtrapids/format.hpp
index 6bb49c8..8880348 100644 (file)
--- a/src/include/qtrapids/format.hpp
+++ b/src/include/qtrapids/format.hpp
@@ -9,41 +9,44 @@
 namespace qtrapids
 {
 
-   
-    static inline QString formatProgress(uint progress)
-    {
-        return QString::number(progress / torrent_progress_percent);
-    }
 
-    namespace 
-    {
+static inline QString formatProgress(uint progress)
+{
+    return QString::number(progress / torrent_progress_percent);
+}
 
-        static const qulonglong size_KB = 1024;
-        static const qulonglong size_MB = size_KB << 10;
-        static const qulonglong size_GB = size_MB << 10;
+namespace
+{
 
-        static char const* size_names[] = {
-            "GB",
-            "MB",
-            "KB",
-            "B"
-        };
-    }
+static const qulonglong size_KB = 1024;
+static const qulonglong size_MB = size_KB << 10;
+static const qulonglong size_GB = size_MB << 10;
 
-    static inline QString formatSize(qulonglong size)
+static char const* size_names[] =
+{
+    "GB",
+    "MB",
+    "KB",
+    "B"
+};
+}
+
+static inline QString formatSize(qulonglong size)
+{
+    qulonglong unit = size_GB;
+    char const ** unit_name = &size_names[0];
+    QString ret("");
+    for (unit = size_GB; unit > 0; unit >>= 10, ++unit_name)
     {
-        qulonglong unit = size_GB;
-        char const ** unit_name = &size_names[0];
-        QString ret("");
-        for (unit = size_GB; unit > 0; unit >>= 10, ++unit_name) {
-            if (size & (~(unit - 1))) {
-                ret += (QString::number(size / unit) + *unit_name);
-                return ret;
-            }
+        if (size & (~(unit - 1)))
+        {
+            ret += (QString::number(size / unit) + *unit_name);
+            return ret;
         }
-        ret = QString::number(size) + "B";
-        return ret;
     }
+    ret = QString::number(size) + "B";
+    return ret;
+}
 
 
 } // namespace qtrapids