From c465a38306a0fa19c2be52f07508d966d764e9ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emmanuel=20Beno=C3=AEt?= Date: Thu, 23 Nov 2017 23:37:52 +0100 Subject: [PATCH] UI - Refactoring progress (see previous log message) --- Makefile | 11 +++++------ c-opast.cc | 4 +++- c-opparser.cc | 4 +++- c-ops.hh | 2 +- sync.cc => c-sync.cc | 7 ++++--- sync.hh => c-sync.hh | 0 syncedit.cc => c-syncedit.cc | 3 ++- syncedit.hh => c-syncedit.hh | 4 ++-- syncoverrides.cc => c-syncoverrides.cc | 6 +++--- syncoverrides.hh => c-syncoverrides.hh | 2 +- undo.cc => c-undo.cc | 2 +- undo.hh => c-undo.hh | 0 common.cc | 4 ++-- demo.cc | 5 ++++- main.cc | 8 +++++--- ui-opemu.cc | 4 +++- ui-overrides.hh | 2 +- ui-sequencer.cc | 8 +++++--- ui-sync.hh | 2 +- 19 files changed, 46 insertions(+), 32 deletions(-) rename sync.cc => c-sync.cc (99%) rename sync.hh => c-sync.hh (100%) rename syncedit.cc => c-syncedit.cc (99%) rename syncedit.hh => c-syncedit.hh (98%) rename syncoverrides.cc => c-syncoverrides.cc (99%) rename syncoverrides.hh => c-syncoverrides.hh (99%) rename undo.cc => c-undo.cc (98%) rename undo.hh => c-undo.hh (100%) diff --git a/Makefile b/Makefile index b262cd3..39224cb 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ COMMON = \ common.cc \ c-filewatcher.cc \ c-utilities.cc \ + c-undo.cc \ \ c-ops.cc \ c-opast.cc \ @@ -25,14 +26,12 @@ COMMON = \ c-opcomp.cc \ c-opmgr.cc \ \ + c-sync.cc \ + c-syncedit.cc \ + c-syncoverrides.cc \ + \ camera.cc \ \ - undo.cc \ - \ - sync.cc \ - syncedit.cc \ - syncoverrides.cc \ - \ ui.cc \ ui-actions.cc \ ui-app.cc \ diff --git a/c-opast.cc b/c-opast.cc index 6b85b1f..f16b332 100644 --- a/c-opast.cc +++ b/c-opast.cc @@ -1,6 +1,8 @@ #include "externals.hh" + #include "c-opast.hh" -#include "sync.hh" +#include "c-sync.hh" + #include using namespace ebcl; diff --git a/c-opparser.cc b/c-opparser.cc index 26a16ce..989cfed 100644 --- a/c-opparser.cc +++ b/c-opparser.cc @@ -1,8 +1,10 @@ #include "externals.hh" + #include "c-opast.hh" #include "c-ops.hh" #include "c-opcomp.hh" -#include "syncoverrides.hh" +#include "c-syncoverrides.hh" + #include #include diff --git a/c-ops.hh b/c-ops.hh index c4c6cce..ca4e6f8 100644 --- a/c-ops.hh +++ b/c-ops.hh @@ -1,6 +1,6 @@ #pragma once -#include "sync.hh" #include "c-opast.hh" +#include "c-sync.hh" struct T_Rendertarget; diff --git a/sync.cc b/c-sync.cc similarity index 99% rename from sync.cc rename to c-sync.cc index fe1fe8a..47d83ee 100644 --- a/sync.cc +++ b/c-sync.cc @@ -1,8 +1,9 @@ #include "externals.hh" + #include "common.hh" -#include "sync.hh" -#include "syncedit.hh" -#include "undo.hh" +#include "c-sync.hh" +#include "c-syncedit.hh" +#include "c-undo.hh" #include #include diff --git a/sync.hh b/c-sync.hh similarity index 100% rename from sync.hh rename to c-sync.hh diff --git a/syncedit.cc b/c-syncedit.cc similarity index 99% rename from syncedit.cc rename to c-syncedit.cc index 0518c0a..bd1a018 100644 --- a/syncedit.cc +++ b/c-syncedit.cc @@ -1,6 +1,7 @@ #include "externals.hh" -#include "syncedit.hh" + #include "common.hh" +#include "c-syncedit.hh" /*= T_UndoSyncChanges ========================================================*/ diff --git a/syncedit.hh b/c-syncedit.hh similarity index 98% rename from syncedit.hh rename to c-syncedit.hh index 754c3c7..670c0fb 100644 --- a/syncedit.hh +++ b/c-syncedit.hh @@ -1,6 +1,6 @@ #pragma once -#include "sync.hh" -#include "undo.hh" +#include "c-sync.hh" +#include "c-undo.hh" /*= GENERAL STRUCTURE FOR SYNC EDITOR UNDOS ==================================*/ diff --git a/syncoverrides.cc b/c-syncoverrides.cc similarity index 99% rename from syncoverrides.cc rename to c-syncoverrides.cc index 0d4970c..92edbfa 100644 --- a/syncoverrides.cc +++ b/c-syncoverrides.cc @@ -1,10 +1,10 @@ #include "externals.hh" -#include "syncoverrides.hh" -#include "ui-colorgrading.hh" -#include +#include "c-syncoverrides.hh" + #include + using namespace sov; #define M_SETOPT_( FIELD , VAR ) \ diff --git a/syncoverrides.hh b/c-syncoverrides.hh similarity index 99% rename from syncoverrides.hh rename to c-syncoverrides.hh index 201a03f..bb639d8 100644 --- a/syncoverrides.hh +++ b/c-syncoverrides.hh @@ -1,5 +1,5 @@ #pragma once -#include "sync.hh" +#include "c-sync.hh" #include "camera.hh" namespace sov { diff --git a/undo.cc b/c-undo.cc similarity index 98% rename from undo.cc rename to c-undo.cc index 58e6c02..24995f4 100644 --- a/undo.cc +++ b/c-undo.cc @@ -1,5 +1,5 @@ #include "externals.hh" -#include "undo.hh" +#include "c-undo.hh" /*= A_UndoAction ===============================================================*/ diff --git a/undo.hh b/c-undo.hh similarity index 100% rename from undo.hh rename to c-undo.hh diff --git a/common.cc b/common.cc index 4cca881..8c2928c 100644 --- a/common.cc +++ b/common.cc @@ -4,8 +4,8 @@ #include "c-filewatcher.hh" #include "c-opcomp.hh" #include "c-ops.hh" -#include "sync.hh" -#include "undo.hh" +#include "c-sync.hh" +#include "c-undo.hh" namespace { diff --git a/demo.cc b/demo.cc index f06f6d4..6ebdc22 100644 --- a/demo.cc +++ b/demo.cc @@ -1,10 +1,13 @@ #include "externals.hh" #include "demo.hh" -#include "sync.hh" + #include "common.hh" #include "c-opcomp.hh" +#include "c-sync.hh" + #include "ui-opemu.hh" #include "ui-rendertarget.hh" + #include #include diff --git a/main.cc b/main.cc index d476655..5a83d59 100644 --- a/main.cc +++ b/main.cc @@ -1,10 +1,13 @@ #include "externals.hh" -#include "ui-imgui-sdl.hh" #include "demo.hh" + #include "common.hh" -#include "sync.hh" +#include "c-sync.hh" +#include "c-undo.hh" + #include "ui.hh" #include "ui-app.hh" +#include "ui-imgui-sdl.hh" #include "ui-odbg.hh" #include "ui-opemu.hh" #include "ui-profiling.hh" @@ -13,7 +16,6 @@ #include "ui-shaders.hh" #include "ui-sync.hh" #include "ui-utilities.hh" -#include "undo.hh" /*= T_Main ===================================================================*/ diff --git a/ui-opemu.cc b/ui-opemu.cc index 5b434a9..580f897 100644 --- a/ui-opemu.cc +++ b/ui-opemu.cc @@ -1,11 +1,13 @@ #include "externals.hh" + #include "common.hh" +#include "c-sync.hh" + #include "ui.hh" #include "ui-odbg.hh" #include "ui-opemu.hh" #include "ui-profiling.hh" #include "ui-rendertarget.hh" -#include "sync.hh" using namespace ops; using namespace ebcl; diff --git a/ui-overrides.hh b/ui-overrides.hh index 323d858..362081c 100644 --- a/ui-overrides.hh +++ b/ui-overrides.hh @@ -1,5 +1,5 @@ #pragma once -#include "syncoverrides.hh" +#include "c-syncoverrides.hh" #define M_DECL_SOVUI(NAME) \ void UI##NAME( A_SyncOverride& ovp , \ diff --git a/ui-sequencer.cc b/ui-sequencer.cc index 0e7d6e4..9a173c7 100644 --- a/ui-sequencer.cc +++ b/ui-sequencer.cc @@ -1,10 +1,12 @@ #include "externals.hh" -#include "ui-sequencer.hh" -#include "sync.hh" + #include "common.hh" -#include "syncedit.hh" +#include "c-sync.hh" +#include "c-syncedit.hh" + #include "ui.hh" #include "ui-app.hh" +#include "ui-sequencer.hh" #include "ui-utilities.hh" #define IMGUI_DEFINE_MATH_OPERATORS diff --git a/ui-sync.hh b/ui-sync.hh index e357cff..55466d7 100644 --- a/ui-sync.hh +++ b/ui-sync.hh @@ -1,5 +1,5 @@ #pragma once -#include "sync.hh" +#include "c-sync.hh" #include "ui-mousectrl.hh"