merge

2018-11-09 14:51:18 -08:00
parent 3cbb1cac3d 7b842c0ec7
commit e7bf6b1677
21 changed files with 278 additions and 185 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -18,7 +18,7 @@ int main(int argc, char *argv[])
        qApp->setFont(QFont("Ubuntu", 11, QFont::Normal, false));
    #endif

-    std::srand(std::time(nullptr));
+    std::srand(static_cast<unsigned int>(std::time(nullptr)));
    Settings::init();
    Settings::getInstance()->setExecName(argv[0]);