diff --git a/easy_profiler_core/current_time.h b/easy_profiler_core/current_time.h index f6b4bea..3f49a11 100644 --- a/easy_profiler_core/current_time.h +++ b/easy_profiler_core/current_time.h @@ -33,7 +33,7 @@ along with this program.If not, see . #ifndef EASY_PROFILER_CURRENT_TIME_H #define EASY_PROFILER_CURRENT_TIME_H -#include "easy/profiler.h" +#include #ifdef _WIN32 #include diff --git a/easy_profiler_core/easy_socket.cpp b/easy_profiler_core/easy_socket.cpp index b1366e7..41c6396 100644 --- a/easy_profiler_core/easy_socket.cpp +++ b/easy_profiler_core/easy_socket.cpp @@ -30,7 +30,7 @@ You should have received a copy of the GNU General Public License along with this program.If not, see . **/ -#include "easy/easy_socket.h" +#include #include #include diff --git a/easy_profiler_core/event_trace_win.cpp b/easy_profiler_core/event_trace_win.cpp index 663634d..14ce6d2 100644 --- a/easy_profiler_core/event_trace_win.cpp +++ b/easy_profiler_core/event_trace_win.cpp @@ -50,7 +50,7 @@ #include #include #include -#include "easy/profiler.h" +#include #include "profile_manager.h" #include "current_time.h" diff --git a/easy_profiler_core/include/easy/easy_socket.h b/easy_profiler_core/include/easy/easy_socket.h index 843fc53..7e071de 100644 --- a/easy_profiler_core/include/easy/easy_socket.h +++ b/easy_profiler_core/include/easy/easy_socket.h @@ -33,7 +33,7 @@ along with this program.If not, see . #define EASY________SOCKET_________H #include -#include "easy/profiler.h" +#include #ifndef _WIN32 #include #include diff --git a/easy_profiler_core/include/easy/profiler.h b/easy_profiler_core/include/easy/profiler.h index 1bef5ff..c72dc52 100644 --- a/easy_profiler_core/include/easy/profiler.h +++ b/easy_profiler_core/include/easy/profiler.h @@ -33,7 +33,7 @@ along with this program.If not, see . #ifndef EASY_PROFILER_H #define EASY_PROFILER_H -#include "easy/profiler_aux.h" +#include #if defined ( __clang__ ) # pragma clang diagnostic push @@ -59,7 +59,7 @@ along with this program.If not, see . /** Macro for beginning of a block with custom name and color. \code - #include "easy/profiler.h" + #include void foo() { // some code ... @@ -99,7 +99,7 @@ Block will be automatically completed by destructor. /** Macro for beginning of a block with function name and custom color. \code - #include "easy/profiler.h" + #include void foo(){ EASY_FUNCTION(); // Block with name="foo" and default color //some code... @@ -129,7 +129,7 @@ Name of the block automatically created with function name. /** Macro for completion of last opened block. \code -#include "easy/profiler.h" +#include int foo() { // some code ... diff --git a/easy_profiler_core/include/easy/profiler_aux.h b/easy_profiler_core/include/easy/profiler_aux.h index 164b409..82c9b2b 100644 --- a/easy_profiler_core/include/easy/profiler_aux.h +++ b/easy_profiler_core/include/easy/profiler_aux.h @@ -46,8 +46,9 @@ #define EASY_PROFILER_AUX_H #include -#include "easy/easy_compiler_support.h" -#include "easy/profiler_colors.h" + +#include +#include ////////////////////////////////////////////////////////////////////////// diff --git a/easy_profiler_core/include/easy/reader.h b/easy_profiler_core/include/easy/reader.h index 23b8a52..87190b5 100644 --- a/easy_profiler_core/include/easy/reader.h +++ b/easy_profiler_core/include/easy/reader.h @@ -39,8 +39,9 @@ along with this program.If not, see . #include #include #include -#include "easy/profiler.h" -#include "easy/serialized_block.h" + +#include +#include ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/easy_profiler_core/include/easy/serialized_block.h b/easy_profiler_core/include/easy/serialized_block.h index 4b34db4..6966502 100644 --- a/easy_profiler_core/include/easy/serialized_block.h +++ b/easy_profiler_core/include/easy/serialized_block.h @@ -33,7 +33,7 @@ along with this program.If not, see . #ifndef EASY_PROFILER_SERIALIZED_BLOCK_H #define EASY_PROFILER_SERIALIZED_BLOCK_H -#include "easy/profiler.h" +#include namespace profiler { diff --git a/easy_profiler_core/profile_manager.cpp b/easy_profiler_core/profile_manager.cpp index 51f42e9..eb7ff05 100644 --- a/easy_profiler_core/profile_manager.cpp +++ b/easy_profiler_core/profile_manager.cpp @@ -41,9 +41,11 @@ #include #include #include "profile_manager.h" -#include "easy/serialized_block.h" -#include "easy/easy_net.h" -#include "easy/easy_socket.h" + +#include +#include +#include + #include "event_trace_win.h" #include "current_time.h" diff --git a/easy_profiler_core/profile_manager.h b/easy_profiler_core/profile_manager.h index 657d4c8..4010d08 100644 --- a/easy_profiler_core/profile_manager.h +++ b/easy_profiler_core/profile_manager.h @@ -33,11 +33,13 @@ along with this program.If not, see . #ifndef EASY_PROFILER_MANAGER_H #define EASY_PROFILER_MANAGER_H -#include "easy/profiler.h" -#include "easy/easy_socket.h" +#include +#include + #include "spin_lock.h" #include "outstream.h" #include "hashed_cstr.h" + #include #include #include diff --git a/easy_profiler_core/reader.cpp b/easy_profiler_core/reader.cpp index bbd571d..28bb265 100644 --- a/easy_profiler_core/reader.cpp +++ b/easy_profiler_core/reader.cpp @@ -56,8 +56,10 @@ * : along with this program.If not, see . ************************************************************************/ -#include "easy/reader.h" +#include + #include "hashed_cstr.h" + #include #include #include diff --git a/profiler_gui/blocks_graphics_view.h b/profiler_gui/blocks_graphics_view.h index 842afad..0926d69 100644 --- a/profiler_gui/blocks_graphics_view.h +++ b/profiler_gui/blocks_graphics_view.h @@ -55,13 +55,16 @@ #include #include + #include #include #include #include #include #include -#include "easy/reader.h" + +#include + #include "common_types.h" ////////////////////////////////////////////////////////////////////////// diff --git a/profiler_gui/blocks_tree_widget.h b/profiler_gui/blocks_tree_widget.h index 78dc3cc..c597394 100644 --- a/profiler_gui/blocks_tree_widget.h +++ b/profiler_gui/blocks_tree_widget.h @@ -55,9 +55,11 @@ #include #include + #include "tree_widget_loader.h" #include "tree_widget_item.h" -#include "easy/reader.h" + +#include ////////////////////////////////////////////////////////////////////////// diff --git a/profiler_gui/common_types.h b/profiler_gui/common_types.h index 3ab28d1..a8b81db 100644 --- a/profiler_gui/common_types.h +++ b/profiler_gui/common_types.h @@ -38,7 +38,7 @@ #include #include #include -#include "easy/reader.h" +#include ////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////// diff --git a/profiler_gui/descriptors_tree_widget.h b/profiler_gui/descriptors_tree_widget.h index 49afc52..28668db 100644 --- a/profiler_gui/descriptors_tree_widget.h +++ b/profiler_gui/descriptors_tree_widget.h @@ -48,9 +48,11 @@ #include #include + #include #include -#include "easy/profiler.h" + +#include ////////////////////////////////////////////////////////////////////////// diff --git a/profiler_gui/easy_graphics_item.h b/profiler_gui/easy_graphics_item.h index d2ef945..5f0db18 100644 --- a/profiler_gui/easy_graphics_item.h +++ b/profiler_gui/easy_graphics_item.h @@ -47,10 +47,13 @@ #define EASY_GRAPHICS_ITEM_H #include + #include #include #include -#include "easy/reader.h" + +#include + #include "common_types.h" ////////////////////////////////////////////////////////////////////////// diff --git a/profiler_gui/globals_qobjects.h b/profiler_gui/globals_qobjects.h index 5fec429..609e4ba 100644 --- a/profiler_gui/globals_qobjects.h +++ b/profiler_gui/globals_qobjects.h @@ -32,7 +32,7 @@ #define EASY_GLOBALS_QOBJECTS_H #include -#include "easy/profiler.h" +#include namespace profiler_gui { diff --git a/profiler_gui/main.cpp b/profiler_gui/main.cpp index 39f900c..af0a4f9 100644 --- a/profiler_gui/main.cpp +++ b/profiler_gui/main.cpp @@ -40,11 +40,10 @@ #include #include -//#include -//#include -//#include "treemodel.h" + #include "main_window.h" -#include "easy/reader.h" + +#include #if defined(_WIN32) && defined (_BUILD_RELEASE_) diff --git a/profiler_gui/main_window.cpp b/profiler_gui/main_window.cpp index f7e1c3d..5951d9e 100644 --- a/profiler_gui/main_window.cpp +++ b/profiler_gui/main_window.cpp @@ -87,7 +87,8 @@ #include "blocks_graphics_view.h" #include "descriptors_tree_widget.h" #include "globals.h" -#include "easy/easy_net.h" + +#include #ifdef max #undef max diff --git a/profiler_gui/main_window.h b/profiler_gui/main_window.h index 2cdf339..fa810c3 100644 --- a/profiler_gui/main_window.h +++ b/profiler_gui/main_window.h @@ -53,8 +53,8 @@ #include #include -#include "easy/easy_socket.h" -#include "easy/reader.h" +#include +#include #ifdef max #undef max diff --git a/profiler_gui/tree_widget_item.h b/profiler_gui/tree_widget_item.h index c61343e..6519f3b 100644 --- a/profiler_gui/tree_widget_item.h +++ b/profiler_gui/tree_widget_item.h @@ -49,7 +49,8 @@ #include #include -#include "easy/reader.h" +#include + #include "common_types.h" ////////////////////////////////////////////////////////////////////////// diff --git a/profiler_gui/tree_widget_loader.h b/profiler_gui/tree_widget_loader.h index e59b2ad..ecbb37a 100644 --- a/profiler_gui/tree_widget_loader.h +++ b/profiler_gui/tree_widget_loader.h @@ -49,10 +49,11 @@ #include #include -//#include #include #include -#include "easy/reader.h" + +#include + #include "common_types.h" ////////////////////////////////////////////////////////////////////////// diff --git a/reader/main.cpp b/reader/main.cpp index ab78a01..f962dbf 100644 --- a/reader/main.cpp +++ b/reader/main.cpp @@ -1,5 +1,5 @@ -#include "easy/profiler.h" -#include "easy/reader.h" +#include +#include #include #include #include diff --git a/sample/main.cpp b/sample/main.cpp index 2586525..a05a4b0 100644 --- a/sample/main.cpp +++ b/sample/main.cpp @@ -1,14 +1,15 @@ //#define FULL_DISABLE_PROFILER -#include "easy/profiler.h" #include #include #include #include #include -#include "easy/reader.h" #include #include +#include +#include + std::condition_variable cv; std::mutex cv_m; int g_i = 0;