Przeglądaj źródła

Fix for bug #51

closes #51

added define needed for MSVC
Felix 4 lat temu
rodzic
commit
edac915953
2 zmienionych plików z 7 dodań i 4 usunięć
  1. 4 4
      src/database/adatabasesetup.cpp
  2. 3 0
      src/functions/acalc.h

+ 4 - 4
src/database/adatabasesetup.cpp

@@ -302,12 +302,12 @@ bool ADataBaseSetup::backupOldData()
         return true;
     }
 
-    auto date_string = QDateTime::currentDateTime().toString(Qt::ISODate);
+    auto date_string = QDateTime::currentDateTime().toString("yyyy_MM_dd_T_hh_mm");
     auto backup_dir = QDir(AStandardPaths::absPathOf(AStandardPaths::DatabaseBackup));
-    auto backup_name = database_file.baseName() + "_bak_" + date_string + ".db";
+    auto backup_name = database_file.baseName() % "_bak_" % date_string + ".db";
     auto file = QFile(aDB->databaseFile.absoluteFilePath());
 
-    if (!file.rename(backup_dir.absolutePath() + '/' + backup_name)) {
+    if (!file.rename(backup_dir.absolutePath() % '/' % backup_name)) {
         DEB << "Unable to backup old database.";
         return false;
     }
@@ -398,7 +398,7 @@ bool ADataBaseSetup::createSchemata(const QStringList &statements)
 
     if (!errors.isEmpty()) {
         DEB_SRC << "The following errors have ocurred: ";
-        for (const auto& error : errors) {
+        for (const auto& error : qAsConst(errors)) {
             DEB_RAW << error;
         }
         return false;

+ 3 - 0
src/functions/acalc.h

@@ -2,6 +2,9 @@
 #define ACALC_H
 
 #include <QDateTime>
+#ifdef _MSC_VER
+#define _USE_MATH_DEFINES
+#endif
 #include <cmath>
 #include <QDebug>
 /*!