64 lines
1.7 KiB
Diff
64 lines
1.7 KiB
Diff
--- a/skgbasemodeler/skgdocument.cpp
|
|
+++ b/skgbasemodeler/skgdocument.cpp
|
|
@@ -42,7 +42,6 @@
|
|
#include <qurl.h>
|
|
|
|
#include <sqlite3.h>
|
|
-#include <math.h>
|
|
#include <cmath>
|
|
|
|
#include "skgtraces.h"
|
|
@@ -51,11 +50,6 @@
|
|
#include "skgpropertyobject.h"
|
|
#include "skgtransactionmng.h"
|
|
#include "skgreport.h"
|
|
-
|
|
-#ifdef Q_OS_WIN
|
|
-#define isnan(a) _isnan(a)
|
|
-#define isinf(a) !_finite(a)
|
|
-#endif
|
|
|
|
#ifdef SKGCIPHER
|
|
#define SQLDRIVERNAME QStringLiteral("SKGSQLCIPHER")
|
|
@@ -2693,7 +2687,7 @@
|
|
if (iValue > 0) {
|
|
p = '+' % p;
|
|
}
|
|
- if (p.count() > 10 || isnan(iValue) || isinf(iValue)) {
|
|
+ if (p.count() > 10 || std::isnan(iValue) || std::isinf(iValue)) {
|
|
p = QChar(8734);
|
|
}
|
|
return "<font color=\"" %
|
|
|
|
--- a/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
|
|
+++ b/plugins/import/skrooge_import_gnc/skgimportplugingnc.cpp
|
|
@@ -27,7 +27,6 @@
|
|
|
|
#include <qdom.h>
|
|
#include <qfileinfo.h>
|
|
-#include <math.h>
|
|
#include <cmath>
|
|
|
|
#include "skgtraces.h"
|
|
@@ -36,11 +35,6 @@
|
|
#include "skgobjectbase.h"
|
|
#include "skgpayeeobject.h"
|
|
#include "skgimportexportmanager.h"
|
|
-
|
|
-#ifdef Q_OS_WIN
|
|
-#define isnan(a) _isnan(a)
|
|
-#define isinf(a) !_finite(a)
|
|
-#endif
|
|
|
|
/**
|
|
* This plugin factory.
|
|
@@ -386,7 +380,7 @@
|
|
}
|
|
}
|
|
|
|
- if (!isnan(info.value)) {
|
|
+ if (!std::isnan(info.value)) {
|
|
QChar accountType = mapIdType[info.account.text()];
|
|
if (accountType == 'C') {
|
|
suboperationsList.push_front(info);
|