diff --git a/dollar/Engine.cpp b/dollar/Engine.cpp index 493bea4..ba769dd 100644 --- a/dollar/Engine.cpp +++ b/dollar/Engine.cpp @@ -4,14 +4,14 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include dollar::Engine::Engine(): diff --git a/dollar/Engine.h b/dollar/Engine.hpp similarity index 89% rename from dollar/Engine.h rename to dollar/Engine.hpp index 305d558..9689994 100644 --- a/dollar/Engine.h +++ b/dollar/Engine.hpp @@ -6,13 +6,13 @@ #pragma once -#include +#include +#include +#include +#include #include #include -#include #include -#include -#include /** * @brief dollar library main namespace diff --git a/dollar/EngineN.cpp b/dollar/EngineN.cpp index ba9a7e6..aa17521 100644 --- a/dollar/EngineN.cpp +++ b/dollar/EngineN.cpp @@ -4,13 +4,15 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + #include #include + #define MAX_FLOAT std::numeric_limits::max() // simple decree to radian convertion #define DEG_2_RAD(ddd) (ddd*M_PI/180.0) diff --git a/dollar/EngineN.h b/dollar/EngineN.hpp similarity index 89% rename from dollar/EngineN.h rename to dollar/EngineN.hpp index 19381a1..9ffbfbc 100644 --- a/dollar/EngineN.h +++ b/dollar/EngineN.hpp @@ -6,14 +6,14 @@ #pragma once -#include +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include -#include namespace dollar { class EngineN : public dollar::Engine { diff --git a/dollar/EngineP.cpp b/dollar/EngineP.cpp index 3571868..f2ab19c 100644 --- a/dollar/EngineP.cpp +++ b/dollar/EngineP.cpp @@ -4,11 +4,11 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #define MAX_FLOAT std::numeric_limits::max() diff --git a/dollar/EngineP.h b/dollar/EngineP.hpp similarity index 89% rename from dollar/EngineP.h rename to dollar/EngineP.hpp index 28d387f..3b2a1b6 100644 --- a/dollar/EngineP.h +++ b/dollar/EngineP.hpp @@ -6,13 +6,13 @@ #pragma once -#include +#include +#include +#include +#include #include #include -#include #include -#include -#include namespace dollar { class EngineP : public dollar::Engine { diff --git a/dollar/EnginePPlus.cpp b/dollar/EnginePPlus.cpp index 3a9cae1..1c07822 100644 --- a/dollar/EnginePPlus.cpp +++ b/dollar/EnginePPlus.cpp @@ -4,17 +4,17 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + #include #include + #define MAX_FLOAT std::numeric_limits::max() - - dollar::EnginePPlus::EnginePPlus(): m_PPlusDistance(0.10f), m_PPlusExcludeDistance(0.2*0.2), diff --git a/dollar/EnginePPlus.h b/dollar/EnginePPlus.hpp similarity index 93% rename from dollar/EnginePPlus.h rename to dollar/EnginePPlus.hpp index 08b4333..3ef4625 100644 --- a/dollar/EnginePPlus.h +++ b/dollar/EnginePPlus.hpp @@ -6,13 +6,13 @@ #pragma once -#include +#include +#include +#include +#include #include #include -#include #include -#include -#include namespace dollar { class EnginePPlus : public dollar::Engine { diff --git a/dollar/Gesture.cpp b/dollar/Gesture.cpp index 0e8cfc3..1093c3f 100644 --- a/dollar/Gesture.cpp +++ b/dollar/Gesture.cpp @@ -4,13 +4,13 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include static std::vector> loadPointsJson(const ejson::Document& _doc) { diff --git a/dollar/Gesture.h b/dollar/Gesture.hpp similarity index 94% rename from dollar/Gesture.h rename to dollar/Gesture.hpp index 3a22d14..efce6b9 100644 --- a/dollar/Gesture.h +++ b/dollar/Gesture.hpp @@ -3,11 +3,12 @@ * @copyright 2016, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ - #pragma once + +#include +#include + #include -#include -#include namespace dollar { class Gesture { diff --git a/dollar/GestureN.cpp b/dollar/GestureN.cpp index d9f5595..f8be743 100644 --- a/dollar/GestureN.cpp +++ b/dollar/GestureN.cpp @@ -4,13 +4,13 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include diff --git a/dollar/GestureN.h b/dollar/GestureN.hpp similarity index 95% rename from dollar/GestureN.h rename to dollar/GestureN.hpp index 209b77a..3f4502b 100644 --- a/dollar/GestureN.h +++ b/dollar/GestureN.hpp @@ -3,12 +3,12 @@ * @copyright 2016, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ - #pragma once -#include -#include -#include +#include +#include + +#include namespace dollar { class GestureN : public dollar::Gesture { diff --git a/dollar/GestureP.h b/dollar/GestureP.hpp similarity index 90% rename from dollar/GestureP.h rename to dollar/GestureP.hpp index 508d8be..4562a7a 100644 --- a/dollar/GestureP.h +++ b/dollar/GestureP.hpp @@ -3,11 +3,12 @@ * @copyright 2016, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ - #pragma once + +#include +#include + #include -#include -#include namespace dollar { class GestureP : public dollar::Gesture { diff --git a/dollar/GesturePPlus.cpp b/dollar/GesturePPlus.cpp index eb16c6b..fbf9376 100644 --- a/dollar/GesturePPlus.cpp +++ b/dollar/GesturePPlus.cpp @@ -4,13 +4,13 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include dollar::GesturePPlus::GesturePPlus() { diff --git a/dollar/GesturePPlus.h b/dollar/GesturePPlus.hpp similarity index 91% rename from dollar/GesturePPlus.h rename to dollar/GesturePPlus.hpp index fe47379..a0e4c54 100644 --- a/dollar/GesturePPlus.h +++ b/dollar/GesturePPlus.hpp @@ -3,11 +3,12 @@ * @copyright 2016, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ - #pragma once + +#include +#include + #include -#include -#include namespace dollar { class GesturePPlus : public dollar::Gesture { diff --git a/dollar/Rectangle.cpp b/dollar/Rectangle.cpp index 113f652..fd948d5 100644 --- a/dollar/Rectangle.cpp +++ b/dollar/Rectangle.cpp @@ -3,8 +3,8 @@ * @copyright 2016, Edouard DUPIN, all right reserved * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include #define MAX_FLOAT std::numeric_limits::max() diff --git a/dollar/Rectangle.h b/dollar/Rectangle.hpp similarity index 97% rename from dollar/Rectangle.h rename to dollar/Rectangle.hpp index 1539d21..0a8c3ff 100644 --- a/dollar/Rectangle.h +++ b/dollar/Rectangle.hpp @@ -5,11 +5,11 @@ */ #pragma once +#include #include #include #include #include -#include namespace dollar { /** diff --git a/dollar/Results.cpp b/dollar/Results.cpp index 7de7662..df757bb 100644 --- a/dollar/Results.cpp +++ b/dollar/Results.cpp @@ -4,8 +4,8 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include dollar::Results::Results() { diff --git a/dollar/debug.cpp b/dollar/debug.cpp index e242d8c..1853690 100644 --- a/dollar/debug.cpp +++ b/dollar/debug.cpp @@ -4,7 +4,7 @@ * @license APACHE v2.0 (see license file) */ -#include +#include int32_t dollar::getLogId() { static int32_t g_val = elog::registerInstance("dollar"); diff --git a/dollar/debug.h b/dollar/debug.hpp similarity index 96% rename from dollar/debug.h rename to dollar/debug.hpp index a64f380..8208480 100644 --- a/dollar/debug.h +++ b/dollar/debug.hpp @@ -4,11 +4,11 @@ * @license APACHE v2.0 (see license file) */ -#include +#include #pragma once -#include +#include namespace dollar { int32_t getLogId(); diff --git a/dollar/tools.cpp b/dollar/tools.cpp index 689cf62..e6ceb5a 100644 --- a/dollar/tools.cpp +++ b/dollar/tools.cpp @@ -4,8 +4,9 @@ * @license APACHE v2.0 (see license file) */ -#include -#include +#include +#include + #include #include diff --git a/dollar/tools.h b/dollar/tools.hpp similarity index 98% rename from dollar/tools.h rename to dollar/tools.hpp index 5e90828..7ec6cc1 100644 --- a/dollar/tools.h +++ b/dollar/tools.hpp @@ -4,9 +4,9 @@ * @license APACHE v2.0 (see license file) */ #pragma once -#include -#include -#include +#include +#include +#include namespace dollar { /** diff --git a/lutin_dollar.py b/lutin_dollar.py index e492e73..1f4a843 100644 --- a/lutin_dollar.py +++ b/lutin_dollar.py @@ -44,7 +44,7 @@ def create(target, module_name): ]) my_module.add_header_file([ - 'dollar/*.h', + 'dollar/*.hpp', ], destination_path="dollar") diff --git a/test/main.cpp b/test/main.cpp index 072285a..bf0e11f 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -5,10 +5,10 @@ */ #include -#include +#include -#include -#include +#include +#include #include int main(int _argc, const char *_argv[]) { diff --git a/tool/bench-corpus/main.cpp b/tool/bench-corpus/main.cpp index 6851d33..80c6d3f 100644 --- a/tool/bench-corpus/main.cpp +++ b/tool/bench-corpus/main.cpp @@ -5,12 +5,12 @@ */ #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include #include void usage(const std::string& _progName) { diff --git a/tool/converter/main.cpp b/tool/converter/main.cpp index ef7a385..86f1ffa 100644 --- a/tool/converter/main.cpp +++ b/tool/converter/main.cpp @@ -5,10 +5,10 @@ */ #include -#include +#include -#include -#include +#include +#include void usage(const std::string& _progName) { TEST_PRINT("usage:"); diff --git a/tool/generate-form/main.cpp b/tool/generate-form/main.cpp index 2a5ce31..b621484 100644 --- a/tool/generate-form/main.cpp +++ b/tool/generate-form/main.cpp @@ -4,13 +4,13 @@ * @license APACHE v2.0 (see license file) */ -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include +#include #include void usage(const std::string& _progName) { diff --git a/tool/recorder/appl/Main.cpp b/tool/recorder/appl/Main.cpp index 07c2b78..6c62c15 100644 --- a/tool/recorder/appl/Main.cpp +++ b/tool/recorder/appl/Main.cpp @@ -5,16 +5,16 @@ */ -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include class MainApplication : public ewol::context::Application { diff --git a/tool/recorder/appl/Main.h b/tool/recorder/appl/Main.hpp similarity index 100% rename from tool/recorder/appl/Main.h rename to tool/recorder/appl/Main.hpp diff --git a/tool/recorder/appl/Windows.cpp b/tool/recorder/appl/Windows.cpp index 7443461..2a721e2 100644 --- a/tool/recorder/appl/Windows.cpp +++ b/tool/recorder/appl/Windows.cpp @@ -4,14 +4,14 @@ * @license PROPRIETARY (see license file) */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include appl::Windows::Windows() : m_composer(nullptr), diff --git a/tool/recorder/appl/Windows.h b/tool/recorder/appl/Windows.hpp similarity index 92% rename from tool/recorder/appl/Windows.h rename to tool/recorder/appl/Windows.hpp index ba7df6a..13090a0 100644 --- a/tool/recorder/appl/Windows.h +++ b/tool/recorder/appl/Windows.hpp @@ -5,8 +5,8 @@ */ #pragma once -#include -#include +#include +#include namespace appl { class Windows; diff --git a/tool/recorder/appl/debug.cpp b/tool/recorder/appl/debug.cpp index 82869dc..4689714 100644 --- a/tool/recorder/appl/debug.cpp +++ b/tool/recorder/appl/debug.cpp @@ -5,7 +5,7 @@ */ -#include +#include int32_t appl::getLogId() { static int32_t g_val = elog::registerInstance("LGDT-tool-rec"); diff --git a/tool/recorder/appl/debug.h b/tool/recorder/appl/debug.hpp similarity index 97% rename from tool/recorder/appl/debug.h rename to tool/recorder/appl/debug.hpp index a7fb7ba..40c0ca4 100644 --- a/tool/recorder/appl/debug.h +++ b/tool/recorder/appl/debug.hpp @@ -5,7 +5,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); diff --git a/tool/recorder/appl/widget/TextAreaRecognition.cpp b/tool/recorder/appl/widget/TextAreaRecognition.cpp index 17700f5..fe46718 100644 --- a/tool/recorder/appl/widget/TextAreaRecognition.cpp +++ b/tool/recorder/appl/widget/TextAreaRecognition.cpp @@ -4,14 +4,13 @@ * @license PROPRIETARY (see license file) */ -#include -#include -#include -#include -#include -#include -//#include -#include +#include +#include +#include +#include +#include +#include +#include appl::widget::TextAreaRecognition::TextAreaRecognition() { addObjectType("appl::widget::TextAreaRecognition"); diff --git a/tool/recorder/appl/widget/TextAreaRecognition.h b/tool/recorder/appl/widget/TextAreaRecognition.hpp similarity index 91% rename from tool/recorder/appl/widget/TextAreaRecognition.h rename to tool/recorder/appl/widget/TextAreaRecognition.hpp index 6814c0a..d541c91 100644 --- a/tool/recorder/appl/widget/TextAreaRecognition.h +++ b/tool/recorder/appl/widget/TextAreaRecognition.hpp @@ -5,12 +5,12 @@ */ #pragma once -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include namespace appl { class DrawingLine {