formatting is changed according to last astyle settings

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

diff --git a/src/include/qtrapids/format.hpp b/src/include/qtrapids/format.hpp
index 8094101..2fcbc6f 100644 (file)
--- a/src/include/qtrapids/format.hpp
+++ b/src/include/qtrapids/format.hpp
@@ -9,41 +9,40 @@
 namespace qtrapids
 {
 
-   
-    static inline QString formatProgress(uint progress)
-    {
-        return QString::number(((double)progress) / torrent_progress_max * 100);
-    }
-
-    namespace 
-    {
-
-        static const qulonglong size_KB = 1024;
-        static const qulonglong size_MB = size_KB << 10;
-        static const qulonglong size_GB = size_MB << 10;
-
-        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) {
-            if (size & (~(unit - 1))) {
-                ret += (QString::number(size / unit) + *unit_name);
-                return ret;
-            }
-        }
-        ret += (QString::number(size / unit) + "B");
-        return ret;
-    }
+
+static inline QString formatProgress(uint progress)
+{
+       return QString::number(progress / torrent_progress_percent);
+}
+
+namespace {
+
+static const qulonglong size_KB = 1024;
+static const qulonglong size_MB = size_KB << 10;
+static const qulonglong size_GB = size_MB << 10;
+
+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) {
+               if (size & (~(unit - 1))) {
+                       ret += (QString::number(size / unit) + *unit_name);
+                       return ret;
+               }
+       }
+       ret = QString::number(size) + "B";
+       return ret;
+}
 
 
 } // namespace qtrapids