# HG changeset patch # User Teemu Piippo # Date 1487012356 -7200 # Node ID 67a30f5d159c1eb29ec68b1324377cd82625e920 # Parent 3ab9d11dc76e1cc24a12e890081e20932c769cd7 Fixed some compilation problems diff -r 3ab9d11dc76e -r 67a30f5d159c src/dialogs/externalprogrampathdialog.cpp --- a/src/dialogs/externalprogrampathdialog.cpp Sun Feb 12 17:28:22 2017 +0200 +++ b/src/dialogs/externalprogrampathdialog.cpp Mon Feb 13 20:59:16 2017 +0200 @@ -19,7 +19,7 @@ #include #include "externalprogrampathdialog.h" #include "configdialog.h" -#include "ui_extprogpath.h" +#include "ui_externalprogrampathdialog.h" #include "../mainwindow.h" #include "../glRenderer.h" #include "../documentation.h" diff -r 3ab9d11dc76e -r 67a30f5d159c src/miscallenous.cpp --- a/src/miscallenous.cpp Sun Feb 12 17:28:22 2017 +0200 +++ b/src/miscallenous.cpp Mon Feb 13 20:59:16 2017 +0200 @@ -87,7 +87,7 @@ QString formatFileSize (qint64 size) { static const QString suffixes[] = {" bytes", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}; - int magnitude = magnitude = (size > 0) ? floor(log(size) / log(1000) + 1e-10) : 0; + int magnitude = (size > 0) ? floor(log10(size) / 3.0 + 1e-10) : 0; magnitude = qBound(0, magnitude, countof(suffixes) - 1); return QString::number(size / pow(1000, magnitude)) + suffixes[magnitude]; }