diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2020-08-11 22:35:12 +0100 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2020-08-11 22:35:12 +0100 |
| commit | 3ac113857071fc1f225b2e1b42547269e568c6b7 (patch) | |
| tree | 8b28dd9c44a0d3c7ab8187cd8d8f19d47591d813 /DebugEngine.cpp | |
| parent | 9b10c21f5cad0e2ec27d23c59e65af7141a226f3 (diff) | |
New upstream version 2.2.4.4
Diffstat (limited to 'DebugEngine.cpp')
| -rwxr-xr-x[-rw-r--r--] | DebugEngine.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/DebugEngine.cpp b/DebugEngine.cpp index 2168210..336b138 100644..100755 --- a/DebugEngine.cpp +++ b/DebugEngine.cpp @@ -14,11 +14,15 @@ #include "DebugEngine.h" #include "ExtraSocket.h" #include "cpp11addition.h" +#include "FacilityEngine.h" #ifdef WIN32 # define __func__ __FUNCTION__ #endif +#ifdef ULTRACOPIER_DEBUGCONSOLE +#undef ULTRACOPIER_DEBUGCONSOLE +#endif /// \brief The local macro: ULTRACOPIER_DEBUGCONSOLE #if defined (__FILE__) && defined (__LINE__) # define ULTRACOPIER_DEBUGCONSOLE(a,b) addDebugInformation(a,__func__,b,__FILE__,__LINE__) @@ -59,7 +63,7 @@ DebugEngine::DebugEngine() debugHtmlContent+="</style>"; debugHtmlContent+="<title>"; debugHtmlContent+="Ultracopier"; - debugHtmlContent+=" "+std::string(ULTRACOPIER_VERSION)+" "+ULTRACOPIER_PLATFORM_NAME.toStdString()+", debug report</title>"; + debugHtmlContent+=" "+FacilityEngine::version()+" "+ULTRACOPIER_PLATFORM_NAME.toStdString()+", debug report</title>"; debugHtmlContent+="</head>"; debugHtmlContent+="<body>"; debugHtmlContent+="<table>"; @@ -335,7 +339,7 @@ void DebugEngine::addDebugInformation(const DebugLevel_custom &level,const std:: if(addDebugInformationCallNumber<ULTRACOPIER_DEBUG_MAX_GUI_LINE) { addDebugInformationCallNumber++; - DebugModel::debugModel->addDebugInformation(startTime.elapsed(),level,function,text,file,static_cast<const unsigned int>(ligne),location); + DebugModel::debugModel->addDebugInformation(startTime.elapsed(),level,function,text,file,static_cast<unsigned int>(ligne),location); } } } |