From 3654473b75014a04eccb75b8bc660e5733ed8a4e Mon Sep 17 00:00:00 2001 From: Christian Thaeter Date: Wed, 17 Dec 2008 17:53:32 +0100 Subject: [PATCH] WIP: Merge common into lib * breaks lumigui linking * test non functional yet * tools cant not be linked because of cross dependency problems --- Makefile.am | 1 - src/backend/enginefacade.cpp | 2 +- src/backend/mediaaccessfacade.cpp | 2 +- src/backend/mediaaccessfacade.hpp | 2 +- src/backend/netnodefacade.cpp | 2 +- src/backend/scriptrunnerfacade.cpp | 2 +- src/gui/Makefile.am | 9 +- src/gui/gtk-lumiera.hpp | 2 +- src/gui/guinotificationfacade.cpp | 4 +- src/gui/model/project.hpp | 2 +- src/include/configfacade.hpp | 2 +- src/include/guinotificationfacade.h | 2 +- src/lib/Makefile.am | 85 +++++++++++++------ src/{common => lib}/accesscasted.hpp | 0 src/lib/allocationcluster.cpp | 2 +- src/lib/allocationcluster.hpp | 2 +- src/lib/cmdline.cpp | 2 +- src/{common => lib}/configrules.cpp | 6 +- src/{common => lib}/configrules.hpp | 8 +- src/{common => lib}/error.cpp | 2 +- src/{common => lib}/factory.hpp | 0 src/{common => lib}/frameid.hpp | 0 src/lib/lifecycleregistry.hpp | 2 +- src/{common => lib}/lumitime.cpp | 2 +- src/{common => lib}/lumitime.hpp | 0 src/{common => lib}/meta/configflags.hpp | 2 +- src/{common => lib}/meta/generator.hpp | 2 +- src/{common => lib}/meta/typelist.hpp | 0 src/{common => lib}/meta/typelistutil.hpp | 2 +- src/{common => lib}/meta/util.hpp | 0 src/{common => lib}/multithread.hpp | 2 +- src/{common => lib}/observable-list.hpp | 0 src/{common => lib}/p.hpp | 0 src/{common => lib}/query.cpp | 4 +- src/{common => lib}/query.hpp | 0 src/{common => lib}/query/mockconfigrules.cpp | 4 +- src/{common => lib}/query/mockconfigrules.hpp | 4 +- src/{common => lib}/singleton.hpp | 6 +- src/{common => lib}/singletonfactory.hpp | 4 +- src/{common => lib}/singletonpolicies.hpp | 2 +- src/{common => lib}/singletonpreconfigure.hpp | 2 +- src/{common => lib}/singletonsubclass.hpp | 2 +- src/{common => lib}/streamtype.cpp | 2 +- src/{common => lib}/streamtype.hpp | 2 +- src/{common => lib}/test/mockinjector.hpp | 2 +- src/{common => lib}/test/run.hpp | 4 +- src/{common => lib}/test/suite.cpp | 6 +- src/{common => lib}/test/suite.hpp | 0 src/{common => lib}/test/testoption.cpp | 4 +- src/{common => lib}/test/testoption.hpp | 0 src/{common => lib}/util.cpp | 2 +- src/{common => lib}/util.hpp | 0 src/{common => lib}/variant.hpp | 4 +- src/{common => lib}/visitor.cpp | 2 +- src/{common => lib}/visitor.hpp | 6 +- src/{common => lib}/visitordispatcher.hpp | 6 +- src/{common => lib}/visitorpolicies.hpp | 0 src/{common => lib}/wrapperptr.hpp | 8 +- src/lumiera/appstate.cpp | 2 +- src/lumiera/guifacade.cpp | 2 +- src/{ => lumiera}/guistart.cpp | 2 +- src/lumiera/interfaceproxy.cpp | 4 +- src/{ => lumiera}/main.cpp | 0 src/lumiera/option.cpp | 2 +- src/lumiera/subsys.cpp | 2 +- src/lumiera/subsystemrunner.hpp | 4 +- src/proc/asset.cpp | 2 +- src/proc/asset.hpp | 2 +- src/proc/asset/category.cpp | 2 +- src/proc/asset/media.cpp | 2 +- src/proc/asset/media.hpp | 2 +- src/proc/asset/meta.cpp | 2 +- src/proc/asset/meta.hpp | 2 +- src/proc/asset/pipe.cpp | 2 +- src/proc/asset/proc.cpp | 2 +- src/proc/asset/proc.hpp | 2 +- src/proc/asset/procpatt.cpp | 2 +- src/proc/asset/procpatt.hpp | 2 +- src/proc/asset/struct.cpp | 4 +- src/proc/asset/struct.hpp | 6 +- src/proc/asset/structfactoryimpl.hpp | 4 +- src/proc/assetmanager.cpp | 4 +- src/proc/assetmanager.hpp | 2 +- src/proc/common.hpp | 6 +- src/proc/control/mediaimpllib.hpp | 2 +- src/proc/control/stypemanager.hpp | 4 +- src/proc/control/styperegistry.hpp | 6 +- src/proc/engine/buffhandle.hpp | 2 +- src/proc/engine/nodeoperation.hpp | 4 +- src/proc/engine/nodewiring.cpp | 2 +- src/proc/engine/nodewiringconfig.hpp | 4 +- src/proc/facade.cpp | 2 +- src/proc/mobject/builder/buildertool.hpp | 6 +- src/proc/mobject/builder/operationpoint.hpp | 2 +- src/proc/mobject/session.hpp | 2 +- src/proc/mobject/session/defsmanager.cpp | 2 +- src/proc/mobject/session/defsmanager.hpp | 4 +- src/proc/mobject/session/defsregistry.hpp | 8 +- src/proc/mobject/session/session.cpp | 2 +- src/proc/state.hpp | 2 +- 100 files changed, 191 insertions(+), 158 deletions(-) rename src/{common => lib}/accesscasted.hpp (100%) rename src/{common => lib}/configrules.cpp (94%) rename src/{common => lib}/configrules.hpp (98%) rename src/{common => lib}/error.cpp (99%) rename src/{common => lib}/factory.hpp (100%) rename src/{common => lib}/frameid.hpp (100%) rename src/{common => lib}/lumitime.cpp (97%) rename src/{common => lib}/lumitime.hpp (100%) rename src/{common => lib}/meta/configflags.hpp (99%) rename src/{common => lib}/meta/generator.hpp (99%) rename src/{common => lib}/meta/typelist.hpp (100%) rename src/{common => lib}/meta/typelistutil.hpp (99%) rename src/{common => lib}/meta/util.hpp (100%) rename src/{common => lib}/multithread.hpp (98%) rename src/{common => lib}/observable-list.hpp (100%) rename src/{common => lib}/p.hpp (100%) rename src/{common => lib}/query.cpp (98%) rename src/{common => lib}/query.hpp (100%) rename src/{common => lib}/query/mockconfigrules.cpp (98%) rename src/{common => lib}/query/mockconfigrules.hpp (99%) rename src/{common => lib}/singleton.hpp (93%) rename src/{common => lib}/singletonfactory.hpp (97%) rename src/{common => lib}/singletonpolicies.hpp (99%) rename src/{common => lib}/singletonpreconfigure.hpp (98%) rename src/{common => lib}/singletonsubclass.hpp (99%) rename src/{common => lib}/streamtype.cpp (97%) rename src/{common => lib}/streamtype.hpp (99%) rename src/{common => lib}/test/mockinjector.hpp (98%) rename src/{common => lib}/test/run.hpp (97%) rename src/{common => lib}/test/suite.cpp (98%) rename src/{common => lib}/test/suite.hpp (100%) rename src/{common => lib}/test/testoption.cpp (98%) rename src/{common => lib}/test/testoption.hpp (100%) rename src/{common => lib}/util.cpp (98%) rename src/{common => lib}/util.hpp (100%) rename src/{common => lib}/variant.hpp (99%) rename src/{common => lib}/visitor.cpp (97%) rename src/{common => lib}/visitor.hpp (98%) rename src/{common => lib}/visitordispatcher.hpp (98%) rename src/{common => lib}/visitorpolicies.hpp (100%) rename src/{common => lib}/wrapperptr.hpp (94%) rename src/{ => lumiera}/guistart.cpp (99%) rename src/{ => lumiera}/main.cpp (100%) diff --git a/Makefile.am b/Makefile.am index 8b31a802c..f4f73130c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,6 @@ include $(top_srcdir)/admin/Makefile.am # core include $(top_srcdir)/src/proc/Makefile.am -include $(top_srcdir)/src/common/Makefile.am include $(top_srcdir)/src/lib/Makefile.am include $(top_srcdir)/src/backend/Makefile.am include $(top_srcdir)/src/lumiera/Makefile.am diff --git a/src/backend/enginefacade.cpp b/src/backend/enginefacade.cpp index e081b116e..2fbe9bc19 100644 --- a/src/backend/enginefacade.cpp +++ b/src/backend/enginefacade.cpp @@ -22,7 +22,7 @@ #include "backend/enginefacade.hpp" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include diff --git a/src/backend/mediaaccessfacade.cpp b/src/backend/mediaaccessfacade.cpp index ad52698b8..f3308f4a7 100644 --- a/src/backend/mediaaccessfacade.cpp +++ b/src/backend/mediaaccessfacade.cpp @@ -23,7 +23,7 @@ #include "backend/mediaaccessfacade.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" using util::isnil; using lumiera::error::Invalid; diff --git a/src/backend/mediaaccessfacade.hpp b/src/backend/mediaaccessfacade.hpp index 539d4141e..2f244be27 100644 --- a/src/backend/mediaaccessfacade.hpp +++ b/src/backend/mediaaccessfacade.hpp @@ -25,7 +25,7 @@ #define BACKEND_INTERFACE_MEDIAACCESSFACADE_H -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include "include/error.hpp" diff --git a/src/backend/netnodefacade.cpp b/src/backend/netnodefacade.cpp index df019fbaa..e61baaeed 100644 --- a/src/backend/netnodefacade.cpp +++ b/src/backend/netnodefacade.cpp @@ -22,7 +22,7 @@ #include "backend/netnodefacade.hpp" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include diff --git a/src/backend/scriptrunnerfacade.cpp b/src/backend/scriptrunnerfacade.cpp index 533ea3481..2e8955af1 100644 --- a/src/backend/scriptrunnerfacade.cpp +++ b/src/backend/scriptrunnerfacade.cpp @@ -22,7 +22,7 @@ #include "backend/scriptrunnerfacade.hpp" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index d7490a271..ad482f910 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -101,12 +101,11 @@ lumigui_SOURCES = \ lumigui_LDFLAGS = # $(LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS) -lumigui_LDADD = $(LUMIERA_GUI_LIBS) liblumicommon.a liblumiera.a $(NOBUGMT_LUMIERA_LIBS) +lumigui_LDADD = $(LUMIERA_GUI_LIBS) liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -lumigui_DEPENDENCIES = \ - $(top_builddir)/lumiera_ui.rc \ - $(top_builddir)/liblumicommon.a \ - $(top_builddir)/liblumiera.a +lumigui_DEPENDENCIES = \ + $(top_builddir)/lumiera_ui.rc \ + $(top_builddir)/liblumiera.la $(top_builddir)/lumiera_ui.rc: cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir) diff --git a/src/gui/gtk-lumiera.hpp b/src/gui/gtk-lumiera.hpp index 6e0013a2c..c1800580a 100644 --- a/src/gui/gtk-lumiera.hpp +++ b/src/gui/gtk-lumiera.hpp @@ -33,7 +33,7 @@ #include #include #include -#include "../common/util.hpp" +#include "lib/util.hpp" extern "C" { #include diff --git a/src/gui/guinotificationfacade.cpp b/src/gui/guinotificationfacade.cpp index 181006de7..7822abe1b 100644 --- a/src/gui/guinotificationfacade.cpp +++ b/src/gui/guinotificationfacade.cpp @@ -22,9 +22,9 @@ #include "include/guinotificationfacade.h" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include "include/nobugcfg.h" -#include "common/util.hpp" +#include "lib/util.hpp" extern "C" { #include "lumiera/interfacedescriptor.h" diff --git a/src/gui/model/project.hpp b/src/gui/model/project.hpp index c943496f4..f70029f88 100644 --- a/src/gui/model/project.hpp +++ b/src/gui/model/project.hpp @@ -28,7 +28,7 @@ #define PROJECT_HPP #include "sequence.hpp" -#include "../../common/observable-list.hpp" +#include "lib/observable-list.hpp" namespace gui { namespace model { diff --git a/src/include/configfacade.hpp b/src/include/configfacade.hpp index db30b9937..d2eb44a30 100644 --- a/src/include/configfacade.hpp +++ b/src/include/configfacade.hpp @@ -36,7 +36,7 @@ #define INTERFACE_CONFIGFACADE_H -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include diff --git a/src/include/guinotificationfacade.h b/src/include/guinotificationfacade.h index 2e5ad92dd..ecb0f3b49 100644 --- a/src/include/guinotificationfacade.h +++ b/src/include/guinotificationfacade.h @@ -40,7 +40,7 @@ #ifdef __cplusplus /* ============== C++ Interface ================= */ -#include "common/singletonsubclass.hpp" +#include "lib/singletonsubclass.hpp" #include diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 3c05de355..b66d5c0d2 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -20,30 +20,38 @@ lib_LTLIBRARIES += liblumiera.la liblumiera_la_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror -DLUMIERA_PLUGIN_PATH="\"$(pkglibdir)\"" -liblumiera_la_SOURCES = \ - $(liblumiera_la_srcdir)/error.c \ - $(liblumiera_la_srcdir)/mutex.c \ - $(liblumiera_la_srcdir)/rwlock.c \ - $(liblumiera_la_srcdir)/condition.c \ - $(liblumiera_la_srcdir)/luid.c \ - $(liblumiera_la_srcdir)/safeclib.c \ - $(liblumiera_la_srcdir)/cuckoo.c \ - $(liblumiera_la_srcdir)/psplay.c \ - $(liblumiera_la_srcdir)/mrucache.c \ - $(liblumiera_la_srcdir)/time.c \ - $(liblumiera_la_srcdir)/config.c \ - $(liblumiera_la_srcdir)/config_typed.c \ - $(liblumiera_la_srcdir)/config_wordlist.c \ - $(liblumiera_la_srcdir)/configentry.c \ - $(liblumiera_la_srcdir)/configitem.c \ - $(liblumiera_la_srcdir)/config_lookup.c \ - $(liblumiera_la_srcdir)/config_interface.c \ - $(liblumiera_la_srcdir)/interface.c \ - $(liblumiera_la_srcdir)/interfaceregistry.c \ - $(liblumiera_la_srcdir)/plugin.c \ - $(liblumiera_la_srcdir)/plugin_dynlib.c \ - $(liblumiera_la_srcdir)/allocationcluster.cpp \ - $(liblumiera_la_srcdir)/external/libgavl.cpp \ +liblumiera_la_SOURCES = \ + $(liblumiera_la_srcdir)/error.c \ + $(liblumiera_la_srcdir)/mutex.c \ + $(liblumiera_la_srcdir)/rwlock.c \ + $(liblumiera_la_srcdir)/condition.c \ + $(liblumiera_la_srcdir)/luid.c \ + $(liblumiera_la_srcdir)/safeclib.c \ + $(liblumiera_la_srcdir)/cuckoo.c \ + $(liblumiera_la_srcdir)/psplay.c \ + $(liblumiera_la_srcdir)/mrucache.c \ + $(liblumiera_la_srcdir)/time.c \ + $(liblumiera_la_srcdir)/config.c \ + $(liblumiera_la_srcdir)/config_typed.c \ + $(liblumiera_la_srcdir)/config_wordlist.c \ + $(liblumiera_la_srcdir)/configentry.c \ + $(liblumiera_la_srcdir)/configitem.c \ + $(liblumiera_la_srcdir)/config_lookup.c \ + $(liblumiera_la_srcdir)/config_interface.c \ + $(liblumiera_la_srcdir)/interface.c \ + $(liblumiera_la_srcdir)/interfaceregistry.c \ + $(liblumiera_la_srcdir)/plugin.c \ + $(liblumiera_la_srcdir)/plugin_dynlib.c \ + $(liblumiera_la_srcdir)/allocationcluster.cpp \ + $(liblumiera_la_srcdir)/external/libgavl.cpp \ + $(liblumiera_la_srcdir)/lumitime.cpp \ + $(liblumiera_la_srcdir)/util.cpp \ + $(liblumiera_la_srcdir)/visitor.cpp \ + $(liblumiera_la_srcdir)/configrules.cpp \ + $(liblumiera_la_srcdir)/error.cpp \ + $(liblumiera_la_srcdir)/query.cpp \ + $(liblumiera_la_srcdir)/query/mockconfigrules.cpp \ + $(liblumiera_la_srcdir)/streamtype.cpp \ $(liblumiera_la_srcdir)/cmdline.cpp noinst_HEADERS += \ @@ -71,4 +79,31 @@ noinst_HEADERS += \ $(liblumiera_la_srcdir)/scopedholdertransfer.hpp \ $(liblumiera_la_srcdir)/scopedholder.hpp \ $(liblumiera_la_srcdir)/external/libgavl.hpp \ - $(liblumiera_la_srcdir)/lifecycleregistry.hpp + $(liblumiera_la_srcdir)/lifecycleregistry.hpp \ + $(liblumiera_la_srcdir)/factory.hpp \ + $(liblumiera_la_srcdir)/frameid.hpp \ + $(liblumiera_la_srcdir)/singleton.hpp \ + $(liblumiera_la_srcdir)/singletonpolicies.hpp \ + $(liblumiera_la_srcdir)/singletonpreconfigure.hpp \ + $(liblumiera_la_srcdir)/lumitime.hpp \ + $(liblumiera_la_srcdir)/visitor.hpp \ + $(liblumiera_la_srcdir)/visitordispatcher.hpp \ + $(liblumiera_la_srcdir)/visitorpolicies.hpp \ + $(liblumiera_la_srcdir)/configrules.hpp \ + $(liblumiera_la_srcdir)/multithread.hpp \ + $(liblumiera_la_srcdir)/p.hpp \ + $(liblumiera_la_srcdir)/query.hpp \ + $(liblumiera_la_srcdir)/singletonfactory.hpp \ + $(liblumiera_la_srcdir)/singletonsubclass.hpp \ + $(liblumiera_la_srcdir)/meta/typelist.hpp \ + $(liblumiera_la_srcdir)/meta/configflags.hpp \ + $(liblumiera_la_srcdir)/meta/generator.hpp \ + $(liblumiera_la_srcdir)/meta/typelistutil.hpp \ + $(liblumiera_la_srcdir)/util.hpp \ + $(liblumiera_la_srcdir)/observable-list.hpp \ + $(liblumiera_la_srcdir)/test/mockinjector.hpp \ + $(liblumiera_la_srcdir)/test/suite.hpp \ + $(liblumiera_la_srcdir)/test/testoption.hpp \ + $(liblumiera_la_srcdir)/test/run.hpp \ + $(liblumiera_la_srcdir)/query/mockconfigrules.hpp + diff --git a/src/common/accesscasted.hpp b/src/lib/accesscasted.hpp similarity index 100% rename from src/common/accesscasted.hpp rename to src/lib/accesscasted.hpp diff --git a/src/lib/allocationcluster.cpp b/src/lib/allocationcluster.cpp index ccd2b3804..e30561952 100644 --- a/src/lib/allocationcluster.cpp +++ b/src/lib/allocationcluster.cpp @@ -23,7 +23,7 @@ #include "lib/allocationcluster.hpp" #include "include/error.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" using util::isnil; diff --git a/src/lib/allocationcluster.hpp b/src/lib/allocationcluster.hpp index 881d9cd4b..0e6a61a8d 100644 --- a/src/lib/allocationcluster.hpp +++ b/src/lib/allocationcluster.hpp @@ -51,7 +51,7 @@ #include #include -#include "common/multithread.hpp" +#include "lib/multithread.hpp" #include "include/error.hpp" #include "lib/scopedholder.hpp" #include "lib/scopedholdertransfer.hpp" diff --git a/src/lib/cmdline.cpp b/src/lib/cmdline.cpp index f2105394a..e7474a021 100644 --- a/src/lib/cmdline.cpp +++ b/src/lib/cmdline.cpp @@ -23,7 +23,7 @@ #include "lib/cmdline.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include "include/nobugcfg.h" #include diff --git a/src/common/configrules.cpp b/src/lib/configrules.cpp similarity index 94% rename from src/common/configrules.cpp rename to src/lib/configrules.cpp index 8d121532b..c563579ba 100644 --- a/src/common/configrules.cpp +++ b/src/lib/configrules.cpp @@ -21,9 +21,9 @@ * *****************************************************/ -#include "common/configrules.hpp" -#include "common/query/mockconfigrules.hpp" -//#include "common/util.hpp" +#include "lib/configrules.hpp" +#include "lib/query/mockconfigrules.hpp" +//#include "lib/util.hpp" #include "include/nobugcfg.h" diff --git a/src/common/configrules.hpp b/src/lib/configrules.hpp similarity index 98% rename from src/common/configrules.hpp rename to src/lib/configrules.hpp index 7b015dfdd..f16cf3a9f 100644 --- a/src/common/configrules.hpp +++ b/src/lib/configrules.hpp @@ -46,10 +46,10 @@ #ifndef LUMIERA_CONFIGRULES_H #define LUMIERA_CONFIGRULES_H -#include "common/p.hpp" -#include "common/query.hpp" -#include "common/meta/generator.hpp" -#include "common/singletonsubclass.hpp" +#include "lib/p.hpp" +#include "lib/query.hpp" +#include "lib/meta/generator.hpp" +#include "lib/singletonsubclass.hpp" //TODO: is it sensible to bring in the types explicitly here? (it's not necessary, but may be convenient...) #include "proc/mobject/session/track.hpp" diff --git a/src/common/error.cpp b/src/lib/error.cpp similarity index 99% rename from src/common/error.cpp rename to src/lib/error.cpp index e069fef5a..b11d063cb 100644 --- a/src/common/error.cpp +++ b/src/lib/error.cpp @@ -23,7 +23,7 @@ #include "include/error.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include #include diff --git a/src/common/factory.hpp b/src/lib/factory.hpp similarity index 100% rename from src/common/factory.hpp rename to src/lib/factory.hpp diff --git a/src/common/frameid.hpp b/src/lib/frameid.hpp similarity index 100% rename from src/common/frameid.hpp rename to src/lib/frameid.hpp diff --git a/src/lib/lifecycleregistry.hpp b/src/lib/lifecycleregistry.hpp index b6e744b02..7a9c603e2 100644 --- a/src/lib/lifecycleregistry.hpp +++ b/src/lib/lifecycleregistry.hpp @@ -44,7 +44,7 @@ #include #include -#include "common/util.hpp" +#include "lib/util.hpp" namespace lumiera { diff --git a/src/common/lumitime.cpp b/src/lib/lumitime.cpp similarity index 97% rename from src/common/lumitime.cpp rename to src/lib/lumitime.cpp index bd50c78bf..9590b6c3a 100644 --- a/src/common/lumitime.cpp +++ b/src/lib/lumitime.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/lumitime.hpp" +#include "lib/lumitime.hpp" #include diff --git a/src/common/lumitime.hpp b/src/lib/lumitime.hpp similarity index 100% rename from src/common/lumitime.hpp rename to src/lib/lumitime.hpp diff --git a/src/common/meta/configflags.hpp b/src/lib/meta/configflags.hpp similarity index 99% rename from src/common/meta/configflags.hpp rename to src/lib/meta/configflags.hpp index c63552855..af6686ea9 100644 --- a/src/common/meta/configflags.hpp +++ b/src/lib/meta/configflags.hpp @@ -49,7 +49,7 @@ #define LUMIERA_META_CONFIGFLAGS_H -#include "common/meta/typelist.hpp" +#include "lib/meta/typelist.hpp" namespace lumiera { diff --git a/src/common/meta/generator.hpp b/src/lib/meta/generator.hpp similarity index 99% rename from src/common/meta/generator.hpp rename to src/lib/meta/generator.hpp index 59f340b5d..1eff99500 100644 --- a/src/common/meta/generator.hpp +++ b/src/lib/meta/generator.hpp @@ -53,7 +53,7 @@ This code is heavily inspired by #ifndef LUMIERA_META_GENERATOR_H #define LUMIERA_META_GENERATOR_H -#include "common/meta/typelist.hpp" +#include "lib/meta/typelist.hpp" diff --git a/src/common/meta/typelist.hpp b/src/lib/meta/typelist.hpp similarity index 100% rename from src/common/meta/typelist.hpp rename to src/lib/meta/typelist.hpp diff --git a/src/common/meta/typelistutil.hpp b/src/lib/meta/typelistutil.hpp similarity index 99% rename from src/common/meta/typelistutil.hpp rename to src/lib/meta/typelistutil.hpp index 3a0d56284..2e9e05d14 100644 --- a/src/common/meta/typelistutil.hpp +++ b/src/lib/meta/typelistutil.hpp @@ -26,7 +26,7 @@ -#include "common/meta/typelist.hpp" +#include "lib/meta/typelist.hpp" namespace lumiera { namespace typelist { diff --git a/src/common/meta/util.hpp b/src/lib/meta/util.hpp similarity index 100% rename from src/common/meta/util.hpp rename to src/lib/meta/util.hpp diff --git a/src/common/multithread.hpp b/src/lib/multithread.hpp similarity index 98% rename from src/common/multithread.hpp rename to src/lib/multithread.hpp index 794d4a18d..2d3b4b31f 100644 --- a/src/common/multithread.hpp +++ b/src/lib/multithread.hpp @@ -27,7 +27,7 @@ #define LUMIERA_MULTITHREAD_H #include "include/nobugcfg.h" -#include "common/util.hpp" +#include "lib/util.hpp" namespace lumiera diff --git a/src/common/observable-list.hpp b/src/lib/observable-list.hpp similarity index 100% rename from src/common/observable-list.hpp rename to src/lib/observable-list.hpp diff --git a/src/common/p.hpp b/src/lib/p.hpp similarity index 100% rename from src/common/p.hpp rename to src/lib/p.hpp diff --git a/src/common/query.cpp b/src/lib/query.cpp similarity index 98% rename from src/common/query.cpp rename to src/lib/query.cpp index 10b43e12e..522ece750 100644 --- a/src/common/query.cpp +++ b/src/lib/query.cpp @@ -21,8 +21,8 @@ * *****************************************************/ -#include "common/query.hpp" -#include "common/util.hpp" +#include "lib/query.hpp" +#include "lib/util.hpp" #include "include/nobugcfg.h" #include diff --git a/src/common/query.hpp b/src/lib/query.hpp similarity index 100% rename from src/common/query.hpp rename to src/lib/query.hpp diff --git a/src/common/query/mockconfigrules.cpp b/src/lib/query/mockconfigrules.cpp similarity index 98% rename from src/common/query/mockconfigrules.cpp rename to src/lib/query/mockconfigrules.cpp index 62848245e..9a68372d8 100644 --- a/src/common/query/mockconfigrules.cpp +++ b/src/lib/query/mockconfigrules.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/query/mockconfigrules.hpp" +#include "lib/query/mockconfigrules.hpp" #include "proc/mobject/session/track.hpp" #include "proc/asset/procpatt.hpp" @@ -29,7 +29,7 @@ #include "include/nobugcfg.h" -#include "common/util.hpp" +#include "lib/util.hpp" using util::isnil; diff --git a/src/common/query/mockconfigrules.hpp b/src/lib/query/mockconfigrules.hpp similarity index 99% rename from src/common/query/mockconfigrules.hpp rename to src/lib/query/mockconfigrules.hpp index f56519ed6..0d0fca8a3 100644 --- a/src/common/query/mockconfigrules.hpp +++ b/src/lib/query/mockconfigrules.hpp @@ -39,8 +39,8 @@ #define LUMIERA_MOCKCONFIGRULES_H #include "proc/mobject/session.hpp" -#include "common/configrules.hpp" -#include "common/util.hpp" +#include "lib/configrules.hpp" +#include "lib/util.hpp" #include #include diff --git a/src/common/singleton.hpp b/src/lib/singleton.hpp similarity index 93% rename from src/common/singleton.hpp rename to src/lib/singleton.hpp index c5de1474d..fc5a99de4 100644 --- a/src/common/singleton.hpp +++ b/src/lib/singleton.hpp @@ -44,9 +44,9 @@ #define LUMIERA_SINGLETON_H -#include "common/singletonpolicies.hpp" -#include "common/singletonfactory.hpp" -#include "common/singletonpreconfigure.hpp" +#include "lib/singletonpolicies.hpp" +#include "lib/singletonfactory.hpp" +#include "lib/singletonpreconfigure.hpp" #endif diff --git a/src/common/singletonfactory.hpp b/src/lib/singletonfactory.hpp similarity index 97% rename from src/common/singletonfactory.hpp rename to src/lib/singletonfactory.hpp index 8d7b7a4b9..853d18fcd 100644 --- a/src/common/singletonfactory.hpp +++ b/src/lib/singletonfactory.hpp @@ -35,9 +35,9 @@ This code is heavily inspired by #define LUMIERA_SINGLETONFACTORY_H -#include "common/singletonpolicies.hpp" // several Policies usable together with SingletonFactory +#include "lib/singletonpolicies.hpp" // several Policies usable together with SingletonFactory -#include "common/util.hpp" +#include "lib/util.hpp" #include "include/nobugcfg.h" diff --git a/src/common/singletonpolicies.hpp b/src/lib/singletonpolicies.hpp similarity index 99% rename from src/common/singletonpolicies.hpp rename to src/lib/singletonpolicies.hpp index ce53e0109..572467264 100644 --- a/src/common/singletonpolicies.hpp +++ b/src/lib/singletonpolicies.hpp @@ -34,7 +34,7 @@ This code is heavily inspired by #ifndef LUMIERA_SINGLETONPOLICIES_H #define LUMIERA_SINGLETONPOLICIES_H -#include "common/multithread.hpp" +#include "lib/multithread.hpp" #include "include/error.hpp" #include diff --git a/src/common/singletonpreconfigure.hpp b/src/lib/singletonpreconfigure.hpp similarity index 98% rename from src/common/singletonpreconfigure.hpp rename to src/lib/singletonpreconfigure.hpp index 188c67b30..4884509a0 100644 --- a/src/common/singletonpreconfigure.hpp +++ b/src/lib/singletonpreconfigure.hpp @@ -44,7 +44,7 @@ #ifndef LUMIERA_SINGLETONPRECONFIGURE_H #define LUMIERA_SINGLETONPRECONFIGURE_H -#include "common/test/mockinjector.hpp" +#include "lib/test/mockinjector.hpp" namespace lumiera diff --git a/src/common/singletonsubclass.hpp b/src/lib/singletonsubclass.hpp similarity index 99% rename from src/common/singletonsubclass.hpp rename to src/lib/singletonsubclass.hpp index 48586f0f6..2cf9ce32f 100644 --- a/src/common/singletonsubclass.hpp +++ b/src/lib/singletonsubclass.hpp @@ -39,7 +39,7 @@ #define LUMIERA_SINGLETONSUBCLASS_H -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include #include diff --git a/src/common/streamtype.cpp b/src/lib/streamtype.cpp similarity index 97% rename from src/common/streamtype.cpp rename to src/lib/streamtype.cpp index b6b1d3e0c..5d90af0c0 100644 --- a/src/common/streamtype.cpp +++ b/src/lib/streamtype.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/streamtype.hpp" +#include "lib/streamtype.hpp" namespace lumiera diff --git a/src/common/streamtype.hpp b/src/lib/streamtype.hpp similarity index 99% rename from src/common/streamtype.hpp rename to src/lib/streamtype.hpp index 4f79969d7..fe5bbeb41 100644 --- a/src/common/streamtype.hpp +++ b/src/lib/streamtype.hpp @@ -35,7 +35,7 @@ #define LUMIERA_STREAMTYPE_HPP -#include "common/query.hpp" +#include "lib/query.hpp" #include diff --git a/src/common/test/mockinjector.hpp b/src/lib/test/mockinjector.hpp similarity index 98% rename from src/common/test/mockinjector.hpp rename to src/lib/test/mockinjector.hpp index f9df2d102..0941e271b 100644 --- a/src/common/test/mockinjector.hpp +++ b/src/lib/test/mockinjector.hpp @@ -26,7 +26,7 @@ #define LUMIERA_TEST_MOCKINJECTOR_H -#include "common/singletonfactory.hpp" +#include "lib/singletonfactory.hpp" #include diff --git a/src/common/test/run.hpp b/src/lib/test/run.hpp similarity index 97% rename from src/common/test/run.hpp rename to src/lib/test/run.hpp index 06b1cda95..c79753dad 100644 --- a/src/common/test/run.hpp +++ b/src/lib/test/run.hpp @@ -30,8 +30,8 @@ #include "include/nobugcfg.h" -#include "common/test/suite.hpp" -#include "common/util.hpp" +#include "lib/test/suite.hpp" +#include "lib/util.hpp" #include #include diff --git a/src/common/test/suite.cpp b/src/lib/test/suite.cpp similarity index 98% rename from src/common/test/suite.cpp rename to src/lib/test/suite.cpp index 0f8036997..094635242 100644 --- a/src/common/test/suite.cpp +++ b/src/lib/test/suite.cpp @@ -32,10 +32,10 @@ #include "include/nobugcfg.h" #include "lib/cmdline.hpp" -#include "common/test/suite.hpp" -#include "common/test/run.hpp" +#include "lib/test/suite.hpp" +#include "lib/test/run.hpp" #include "include/error.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" diff --git a/src/common/test/suite.hpp b/src/lib/test/suite.hpp similarity index 100% rename from src/common/test/suite.hpp rename to src/lib/test/suite.hpp diff --git a/src/common/test/testoption.cpp b/src/lib/test/testoption.cpp similarity index 98% rename from src/common/test/testoption.cpp rename to src/lib/test/testoption.cpp index d898eaef9..df42c0d8e 100644 --- a/src/common/test/testoption.cpp +++ b/src/lib/test/testoption.cpp @@ -21,8 +21,8 @@ * *****************************************************/ -#include "common/test/testoption.hpp" -#include "common/test/suite.hpp" +#include "lib/test/testoption.hpp" +#include "lib/test/suite.hpp" #include "include/error.hpp" diff --git a/src/common/test/testoption.hpp b/src/lib/test/testoption.hpp similarity index 100% rename from src/common/test/testoption.hpp rename to src/lib/test/testoption.hpp diff --git a/src/common/util.cpp b/src/lib/util.cpp similarity index 98% rename from src/common/util.cpp rename to src/lib/util.cpp index 32e5bc84f..aa2871c17 100644 --- a/src/common/util.cpp +++ b/src/lib/util.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/util.hpp" +#include "lib/util.hpp" #include #include diff --git a/src/common/util.hpp b/src/lib/util.hpp similarity index 100% rename from src/common/util.hpp rename to src/lib/util.hpp diff --git a/src/common/variant.hpp b/src/lib/variant.hpp similarity index 99% rename from src/common/variant.hpp rename to src/lib/variant.hpp index 751c2d9fc..15002b7f8 100644 --- a/src/common/variant.hpp +++ b/src/lib/variant.hpp @@ -41,8 +41,8 @@ #define LUMIERA_VARIANT_H -#include "common/meta/typelistutil.hpp" -#include "common/meta/generator.hpp" +#include "lib/meta/typelistutil.hpp" +#include "lib/meta/generator.hpp" #include diff --git a/src/common/visitor.cpp b/src/lib/visitor.cpp similarity index 97% rename from src/common/visitor.cpp rename to src/lib/visitor.cpp index 91b195623..996d22c16 100644 --- a/src/common/visitor.cpp +++ b/src/lib/visitor.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/visitor.hpp" +#include "lib/visitor.hpp" namespace lumiera { diff --git a/src/common/visitor.hpp b/src/lib/visitor.hpp similarity index 98% rename from src/common/visitor.hpp rename to src/lib/visitor.hpp index 49bbcedb5..52fdc4f7d 100644 --- a/src/common/visitor.hpp +++ b/src/lib/visitor.hpp @@ -76,10 +76,10 @@ Credits for many further implementation ideas go to #ifndef LUMIERA_VISITOR_H #define LUMIERA_VISITOR_H -#include "common/visitorpolicies.hpp" -#include "common/visitordispatcher.hpp" +#include "lib/visitorpolicies.hpp" +#include "lib/visitordispatcher.hpp" -#include "common/meta/typelist.hpp" +#include "lib/meta/typelist.hpp" namespace lumiera diff --git a/src/common/visitordispatcher.hpp b/src/lib/visitordispatcher.hpp similarity index 98% rename from src/common/visitordispatcher.hpp rename to src/lib/visitordispatcher.hpp index 34d166b33..857047aa5 100644 --- a/src/common/visitordispatcher.hpp +++ b/src/lib/visitordispatcher.hpp @@ -26,9 +26,9 @@ #define LUMIERA_VISITORDISPATCHER_H #include "include/error.hpp" -#include "common/util.hpp" -#include "common/singleton.hpp" -#include "common/multithread.hpp" +#include "lib/util.hpp" +#include "lib/singleton.hpp" +#include "lib/multithread.hpp" #include diff --git a/src/common/visitorpolicies.hpp b/src/lib/visitorpolicies.hpp similarity index 100% rename from src/common/visitorpolicies.hpp rename to src/lib/visitorpolicies.hpp diff --git a/src/common/wrapperptr.hpp b/src/lib/wrapperptr.hpp similarity index 94% rename from src/common/wrapperptr.hpp rename to src/lib/wrapperptr.hpp index 81afa1177..c9b8bcd70 100644 --- a/src/common/wrapperptr.hpp +++ b/src/lib/wrapperptr.hpp @@ -26,12 +26,12 @@ #define LUMIERA_WRAPPERPTR_H -#include "common/variant.hpp" -#include "common/accesscasted.hpp" +#include "lib/variant.hpp" +#include "lib/accesscasted.hpp" -#include "common/meta/typelist.hpp" +#include "lib/meta/typelist.hpp" #include "proc/mobject/placement.hpp" -#include "common/p.hpp" +#include "lib/p.hpp" namespace asset { class Asset; } diff --git a/src/lumiera/appstate.cpp b/src/lumiera/appstate.cpp index 1126fd099..9f2ecba28 100644 --- a/src/lumiera/appstate.cpp +++ b/src/lumiera/appstate.cpp @@ -35,7 +35,7 @@ extern "C" { #include "lib/plugin.h" } -#include "common/util.hpp" +#include "lib/util.hpp" #include "include/configfacade.hpp" //////////TODO: temp hack to force configfacade.o to be linked in using util::cStr; diff --git a/src/lumiera/guifacade.cpp b/src/lumiera/guifacade.cpp index e0620fe18..a8d94100b 100644 --- a/src/lumiera/guifacade.cpp +++ b/src/lumiera/guifacade.cpp @@ -24,7 +24,7 @@ #include "gui/guifacade.hpp" #include "include/guinotificationfacade.h" #include "include/error.hpp" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include "lib/functorutil.hpp" #include "lumiera/instancehandle.hpp" diff --git a/src/guistart.cpp b/src/lumiera/guistart.cpp similarity index 99% rename from src/guistart.cpp rename to src/lumiera/guistart.cpp index fa47d8ee7..0047dd3ca 100644 --- a/src/guistart.cpp +++ b/src/lumiera/guistart.cpp @@ -45,7 +45,7 @@ #include "gui/guifacade.hpp" #include "lumiera/subsys.hpp" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" extern "C" { #include "lib/interface.h" diff --git a/src/lumiera/interfaceproxy.cpp b/src/lumiera/interfaceproxy.cpp index 97b1c43ea..ea12e5239 100644 --- a/src/lumiera/interfaceproxy.cpp +++ b/src/lumiera/interfaceproxy.cpp @@ -21,9 +21,9 @@ * *****************************************************/ -#include "common/singletonsubclass.hpp" +#include "lib/singletonsubclass.hpp" #include "include/guinotificationfacade.h" -#include "common/util.hpp" +#include "lib/util.hpp" #include "include/error.hpp" extern "C" { diff --git a/src/main.cpp b/src/lumiera/main.cpp similarity index 100% rename from src/main.cpp rename to src/lumiera/main.cpp diff --git a/src/lumiera/option.cpp b/src/lumiera/option.cpp index ef8225836..b8f3b2c3f 100644 --- a/src/lumiera/option.cpp +++ b/src/lumiera/option.cpp @@ -24,7 +24,7 @@ #include "lumiera/option.hpp" #include "include/error.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" diff --git a/src/lumiera/subsys.cpp b/src/lumiera/subsys.cpp index 823b838e4..9cbfd3162 100644 --- a/src/lumiera/subsys.cpp +++ b/src/lumiera/subsys.cpp @@ -24,7 +24,7 @@ #include "lumiera/subsys.hpp" #include "include/error.hpp" -//#include "common/util.hpp" +//#include "lib/util.hpp" //using util::isnil; diff --git a/src/lumiera/subsystemrunner.hpp b/src/lumiera/subsystemrunner.hpp index a04e4708d..7e2e9b735 100644 --- a/src/lumiera/subsystemrunner.hpp +++ b/src/lumiera/subsystemrunner.hpp @@ -25,9 +25,9 @@ #define LUMIERA_SUBSYSTEMRUNNER_H #include "include/error.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include "lumiera/subsys.hpp" -#include "common/multithread.hpp" +#include "lib/multithread.hpp" #include #include diff --git a/src/proc/asset.cpp b/src/proc/asset.cpp index e576b4b44..8da1f0eb8 100644 --- a/src/proc/asset.cpp +++ b/src/proc/asset.cpp @@ -23,7 +23,7 @@ #include "proc/asset.hpp" #include "proc/assetmanager.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include #include diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp index 2298a9a01..a3e9cb7d7 100644 --- a/src/proc/asset.hpp +++ b/src/proc/asset.hpp @@ -58,7 +58,7 @@ #include "proc/asset/category.hpp" #include "include/nobugcfg.h" #include "include/error.hpp" -#include "common/p.hpp" +#include "lib/p.hpp" #include #include diff --git a/src/proc/asset/category.cpp b/src/proc/asset/category.cpp index ad2e22cf0..151e64268 100644 --- a/src/proc/asset/category.cpp +++ b/src/proc/asset/category.cpp @@ -22,7 +22,7 @@ #include "proc/asset/category.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include "include/nobugcfg.h" #include diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp index 75f78ea31..a8c4a9255 100644 --- a/src/proc/asset/media.cpp +++ b/src/proc/asset/media.cpp @@ -28,7 +28,7 @@ #include "proc/asset/unknown.hpp" #include "proc/mobject/session/clip.hpp" #include "proc/mobject/session/mobjectfactory.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include "include/nobugcfg.h" #include diff --git a/src/proc/asset/media.hpp b/src/proc/asset/media.hpp index b14399ce5..b73a619e9 100644 --- a/src/proc/asset/media.hpp +++ b/src/proc/asset/media.hpp @@ -38,7 +38,7 @@ #include "pre_a.hpp" #include "proc/asset.hpp" -#include "common/factory.hpp" +#include "lib/factory.hpp" #include "proc/mobject/mobject.hpp" #include "proc/mobject/session/clip.hpp" diff --git a/src/proc/asset/meta.cpp b/src/proc/asset/meta.cpp index 8d71b8a1b..3b0eaaa5e 100644 --- a/src/proc/asset/meta.cpp +++ b/src/proc/asset/meta.cpp @@ -23,7 +23,7 @@ #include "proc/assetmanager.hpp" #include "proc/asset/meta.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include "include/nobugcfg.h" diff --git a/src/proc/asset/meta.hpp b/src/proc/asset/meta.hpp index c15f14fbf..18d94ddc7 100644 --- a/src/proc/asset/meta.hpp +++ b/src/proc/asset/meta.hpp @@ -39,7 +39,7 @@ #include "pre_a.hpp" #include "proc/asset.hpp" -#include "common/factory.hpp" +#include "lib/factory.hpp" diff --git a/src/proc/asset/pipe.cpp b/src/proc/asset/pipe.cpp index 719b91246..cd3da52e6 100644 --- a/src/proc/asset/pipe.cpp +++ b/src/proc/asset/pipe.cpp @@ -22,7 +22,7 @@ #include "proc/asset/pipe.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" using util::isnil; diff --git a/src/proc/asset/proc.cpp b/src/proc/asset/proc.cpp index 223d3616b..66b670bbd 100644 --- a/src/proc/asset/proc.cpp +++ b/src/proc/asset/proc.cpp @@ -23,7 +23,7 @@ #include "proc/assetmanager.hpp" #include "proc/asset/proc.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include "include/nobugcfg.h" diff --git a/src/proc/asset/proc.hpp b/src/proc/asset/proc.hpp index 5b68d3d0f..5ab69dfc9 100644 --- a/src/proc/asset/proc.hpp +++ b/src/proc/asset/proc.hpp @@ -38,7 +38,7 @@ #include "pre_a.hpp" #include "proc/asset.hpp" -#include "common/factory.hpp" +#include "lib/factory.hpp" diff --git a/src/proc/asset/procpatt.cpp b/src/proc/asset/procpatt.cpp index 5f2c842fd..95e985134 100644 --- a/src/proc/asset/procpatt.cpp +++ b/src/proc/asset/procpatt.cpp @@ -25,7 +25,7 @@ #include "proc/asset/proc.hpp" #include "proc/assetmanager.hpp" #include "proc/asset/buildinstruct.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" using util::isnil; diff --git a/src/proc/asset/procpatt.hpp b/src/proc/asset/procpatt.hpp index 65f832b41..4eee80fb2 100644 --- a/src/proc/asset/procpatt.hpp +++ b/src/proc/asset/procpatt.hpp @@ -24,7 +24,7 @@ #ifndef ASSET_PROCPATT_H #define ASSET_PROCPATT_H -#include "common/query.hpp" +#include "lib/query.hpp" #include "proc/asset/struct.hpp" #include diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp index 68764b008..fce504c46 100644 --- a/src/proc/asset/struct.cpp +++ b/src/proc/asset/struct.cpp @@ -26,11 +26,11 @@ #include "proc/asset/procpatt.hpp" #include "proc/asset/track.hpp" #include "proc/asset/pipe.hpp" -#include "common/configrules.hpp" +#include "lib/configrules.hpp" #include "proc/asset/structfactoryimpl.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include "include/nobugcfg.h" #include diff --git a/src/proc/asset/struct.hpp b/src/proc/asset/struct.hpp index 530f1efa6..a7a1df437 100644 --- a/src/proc/asset/struct.hpp +++ b/src/proc/asset/struct.hpp @@ -40,9 +40,9 @@ #include "pre_a.hpp" #include "proc/asset.hpp" -#include "common/query.hpp" -#include "common/factory.hpp" -#include "common/singleton.hpp" +#include "lib/query.hpp" +#include "lib/factory.hpp" +#include "lib/singleton.hpp" #include #include diff --git a/src/proc/asset/structfactoryimpl.hpp b/src/proc/asset/structfactoryimpl.hpp index 249259a13..49a9ca1c4 100644 --- a/src/proc/asset/structfactoryimpl.hpp +++ b/src/proc/asset/structfactoryimpl.hpp @@ -35,9 +35,9 @@ #include "proc/mobject/session.hpp" -#include "common/configrules.hpp" +#include "lib/configrules.hpp" #include "include/error.hpp" -#include "common/util.hpp" +#include "lib/util.hpp" #include diff --git a/src/proc/assetmanager.cpp b/src/proc/assetmanager.cpp index 9acb29daa..3c17421a9 100644 --- a/src/proc/assetmanager.cpp +++ b/src/proc/assetmanager.cpp @@ -24,8 +24,8 @@ #include "proc/assetmanager.hpp" #include "proc/asset/db.hpp" -#include "common/multithread.hpp" -#include "common/util.hpp" +#include "lib/multithread.hpp" +#include "lib/util.hpp" #include diff --git a/src/proc/assetmanager.hpp b/src/proc/assetmanager.hpp index ec1e715f0..44bb5afc0 100644 --- a/src/proc/assetmanager.hpp +++ b/src/proc/assetmanager.hpp @@ -40,7 +40,7 @@ #include "proc/asset.hpp" #include "include/error.hpp" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include diff --git a/src/proc/common.hpp b/src/proc/common.hpp index 876f96fb6..a9d1756d7 100644 --- a/src/proc/common.hpp +++ b/src/proc/common.hpp @@ -42,9 +42,9 @@ /* common types frequently used... */ -#include "common/p.hpp" -#include "common/util.hpp" -#include "common/lumitime.hpp" +#include "lib/p.hpp" +#include "lib/util.hpp" +#include "lib/lumitime.hpp" #include "include/symbol.hpp" #include "include/error.hpp" ///< pulls in NoBug via nobugcfg.h diff --git a/src/proc/control/mediaimpllib.hpp b/src/proc/control/mediaimpllib.hpp index 396d573ef..958d65a12 100644 --- a/src/proc/control/mediaimpllib.hpp +++ b/src/proc/control/mediaimpllib.hpp @@ -25,7 +25,7 @@ #define CONTROL_MEDIAIMPLLIB_H -#include "common/streamtype.hpp" +#include "lib/streamtype.hpp" diff --git a/src/proc/control/stypemanager.hpp b/src/proc/control/stypemanager.hpp index dcefe74f3..31ec08675 100644 --- a/src/proc/control/stypemanager.hpp +++ b/src/proc/control/stypemanager.hpp @@ -25,8 +25,8 @@ #define CONTROL_STYPEMANAGER_H -#include "common/streamtype.hpp" -#include "common/singleton.hpp" +#include "lib/streamtype.hpp" +#include "lib/singleton.hpp" #include diff --git a/src/proc/control/styperegistry.hpp b/src/proc/control/styperegistry.hpp index 5104a6df8..5979582d2 100644 --- a/src/proc/control/styperegistry.hpp +++ b/src/proc/control/styperegistry.hpp @@ -37,9 +37,9 @@ #define CONTROL_STYPEREGISTRY_H -//#include "common/query.hpp" -//#include "common/util.hpp" -//#include "common/p.hpp" +//#include "lib/query.hpp" +//#include "lib/util.hpp" +//#include "lib/p.hpp" //#include //#include diff --git a/src/proc/engine/buffhandle.hpp b/src/proc/engine/buffhandle.hpp index a3d690398..7374fe2bd 100644 --- a/src/proc/engine/buffhandle.hpp +++ b/src/proc/engine/buffhandle.hpp @@ -40,7 +40,7 @@ #include "include/error.hpp" -#include "common/streamtype.hpp" +#include "lib/streamtype.hpp" namespace engine { diff --git a/src/proc/engine/nodeoperation.hpp b/src/proc/engine/nodeoperation.hpp index b30c6cbeb..e206a811b 100644 --- a/src/proc/engine/nodeoperation.hpp +++ b/src/proc/engine/nodeoperation.hpp @@ -63,8 +63,8 @@ #include "proc/engine/bufftable.hpp" #include "proc/engine/nodeinvocation.hpp" -#include "common/meta/util.hpp" -#include "common/meta/configflags.hpp" +#include "lib/meta/util.hpp" +#include "lib/meta/configflags.hpp" diff --git a/src/proc/engine/nodewiring.cpp b/src/proc/engine/nodewiring.cpp index 7d999aa48..e6449f755 100644 --- a/src/proc/engine/nodewiring.cpp +++ b/src/proc/engine/nodewiring.cpp @@ -26,7 +26,7 @@ #include "proc/engine/nodeoperation.hpp" #include "proc/engine/nodewiringconfig.hpp" -#include "common/meta/typelistutil.hpp" +#include "lib/meta/typelistutil.hpp" namespace engine { diff --git a/src/proc/engine/nodewiringconfig.hpp b/src/proc/engine/nodewiringconfig.hpp index 562767ccc..29bb9504a 100644 --- a/src/proc/engine/nodewiringconfig.hpp +++ b/src/proc/engine/nodewiringconfig.hpp @@ -51,8 +51,8 @@ #define ENGINE_NODEWIRINGCONFIG_H -#include "common/util.hpp" -#include "common/meta/configflags.hpp" +#include "lib/util.hpp" +#include "lib/meta/configflags.hpp" #include #include diff --git a/src/proc/facade.cpp b/src/proc/facade.cpp index f1fbdd239..f2c18bfab 100644 --- a/src/proc/facade.cpp +++ b/src/proc/facade.cpp @@ -22,7 +22,7 @@ #include "proc/facade.hpp" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include diff --git a/src/proc/mobject/builder/buildertool.hpp b/src/proc/mobject/builder/buildertool.hpp index 6cdad7456..fefa22172 100644 --- a/src/proc/mobject/builder/buildertool.hpp +++ b/src/proc/mobject/builder/buildertool.hpp @@ -53,10 +53,10 @@ #ifndef MOBJECT_BUILDER_TOOL_H #define MOBJECT_BUILDER_TOOL_H -#include "common/visitor.hpp" -#include "common/wrapperptr.hpp" +#include "lib/visitor.hpp" +#include "lib/wrapperptr.hpp" -#include "common/p.hpp" +#include "lib/p.hpp" #include "proc/mobject/placement.hpp" #include "proc/mobject/explicitplacement.hpp" diff --git a/src/proc/mobject/builder/operationpoint.hpp b/src/proc/mobject/builder/operationpoint.hpp index f72d9c711..7324f11f8 100644 --- a/src/proc/mobject/builder/operationpoint.hpp +++ b/src/proc/mobject/builder/operationpoint.hpp @@ -25,7 +25,7 @@ #define MOBJECT_BUILDER_OPERATIONPOINT_H #include "proc/engine/procnode.hpp" -#include "common/query.hpp" +#include "lib/query.hpp" #include #include diff --git a/src/proc/mobject/session.hpp b/src/proc/mobject/session.hpp index d91e5f32a..fb4c1960d 100644 --- a/src/proc/mobject/session.hpp +++ b/src/proc/mobject/session.hpp @@ -35,7 +35,7 @@ #include "proc/mobject/placement.hpp" #include "proc/mobject/session/defsmanager.hpp" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" #include #include diff --git a/src/proc/mobject/session/defsmanager.cpp b/src/proc/mobject/session/defsmanager.cpp index 456ff4b0d..63579b789 100644 --- a/src/proc/mobject/session/defsmanager.cpp +++ b/src/proc/mobject/session/defsmanager.cpp @@ -23,7 +23,7 @@ #include "proc/mobject/session/defsmanager.hpp" #include "proc/mobject/session/defsregistry.hpp" -#include "common/configrules.hpp" +#include "lib/configrules.hpp" #include "include/error.hpp" #include diff --git a/src/proc/mobject/session/defsmanager.hpp b/src/proc/mobject/session/defsmanager.hpp index 276ed4c88..0a0a25aa8 100644 --- a/src/proc/mobject/session/defsmanager.hpp +++ b/src/proc/mobject/session/defsmanager.hpp @@ -25,8 +25,8 @@ #define MOBJECT_SESSION_DEFSMANAGER_H -#include "common/p.hpp" -#include "common/query.hpp" +#include "lib/p.hpp" +#include "lib/query.hpp" #include #include diff --git a/src/proc/mobject/session/defsregistry.hpp b/src/proc/mobject/session/defsregistry.hpp index 2973b85e7..da79f40fa 100644 --- a/src/proc/mobject/session/defsregistry.hpp +++ b/src/proc/mobject/session/defsregistry.hpp @@ -40,10 +40,10 @@ #define MOBJECT_SESSION_DEFSREGISTRY_H -#include "common/multithread.hpp" -#include "common/query.hpp" -#include "common/util.hpp" -#include "common/p.hpp" +#include "lib/multithread.hpp" +#include "lib/query.hpp" +#include "lib/util.hpp" +#include "lib/p.hpp" #include #include diff --git a/src/proc/mobject/session/session.cpp b/src/proc/mobject/session/session.cpp index d8d20ed4c..19a8aa7f1 100644 --- a/src/proc/mobject/session/session.cpp +++ b/src/proc/mobject/session/session.cpp @@ -35,7 +35,7 @@ #include "proc/mobject/session/defsmanager.hpp" #include "proc/mobject/session/sessionimpl.hpp" -#include "common/singleton.hpp" +#include "lib/singleton.hpp" using lumiera::Singleton; diff --git a/src/proc/state.hpp b/src/proc/state.hpp index 9f7ee9788..a4a95edb7 100644 --- a/src/proc/state.hpp +++ b/src/proc/state.hpp @@ -28,7 +28,7 @@ #include "pre.hpp" #include "proc/common.hpp" -#include "common/frameid.hpp" +#include "lib/frameid.hpp" #include "proc/engine/buffhandle.hpp" #include