From 10597beebab65d0d6229520be344699acd6573a2 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Sun, 25 Jan 2009 00:24:42 +0100 Subject: [PATCH] mass rename: relocate basic Logging conf. from liblumieracommon to liblumiera --- src/backend/backend.c | 2 +- src/backend/file.c | 2 +- src/backend/filedescriptor.c | 2 +- src/backend/filehandle.c | 2 +- src/backend/filehandlecache.c | 2 +- src/backend/mmap.c | 2 +- src/backend/mmapcache.c | 2 +- src/backend/mmapings.c | 2 +- src/backend/thread-wrapper.hpp | 2 +- src/common/Makefile.am | 3 +-- src/common/config.c | 2 +- src/common/config_lookup.c | 2 +- src/common/config_typed.c | 2 +- src/common/config_wordlist.c | 2 +- src/common/configfacade.cpp | 2 +- src/common/configitem.c | 2 +- src/common/configrules.cpp | 2 +- src/common/instancehandle.hpp | 2 +- src/common/interface.c | 2 +- src/common/interfaceregistry.c | 2 +- src/common/plugin.c | 2 +- src/common/plugin_dynlib.c | 2 +- src/common/query/fake-configrules.cpp | 2 +- src/gui/dialogs/render.cpp | 2 +- src/gui/guistart.cpp | 2 +- src/gui/model/sequence.cpp | 2 +- src/gui/notification-service.cpp | 2 +- src/gui/output/xvdisplayer.cpp | 2 +- src/gui/widgets/timeline/timeline-body.cpp | 2 +- src/gui/widgets/timeline/timeline-track.cpp | 2 +- src/gui/window-manager.cpp | 2 +- src/gui/workspace/workspace-window.cpp | 2 +- src/{common => include}/logging.h | 2 +- src/lib/Makefile.am | 3 ++- src/lib/cmdline.cpp | 2 +- src/lib/error.hpp | 2 +- src/{common => lib}/logging.cpp | 2 +- src/lib/psplay.c | 2 +- src/lib/query.cpp | 2 +- src/lib/resourcecollector.c | 2 +- src/lib/singletonfactory.hpp | 2 +- src/lib/sync.hpp | 2 +- src/lib/test/run.hpp | 2 +- src/lib/test/suite.cpp | 2 +- src/lumiera/main.cpp | 2 +- src/proc/asset.hpp | 2 +- src/proc/asset/category.cpp | 2 +- src/proc/asset/media.cpp | 2 +- src/proc/asset/meta.cpp | 2 +- src/proc/asset/proc.cpp | 2 +- src/proc/asset/struct.cpp | 2 +- src/proc/mobject/builder/common.hpp | 2 +- src/proc/mobject/session/fixture.cpp | 2 +- tests/components/proc/asset/basicpipetest.cpp | 2 +- tests/components/proc/asset/compoundmediatest.cpp | 2 +- tests/components/proc/asset/createassettest.cpp | 2 +- tests/components/proc/asset/identityofassetstest.cpp | 2 +- tests/components/proc/asset/makecliptest.cpp | 2 +- 58 files changed, 59 insertions(+), 59 deletions(-) rename src/{common => include}/logging.h (99%) rename src/{common => lib}/logging.cpp (97%) diff --git a/src/backend/backend.c b/src/backend/backend.c index 569673405..f0099f6f6 100644 --- a/src/backend/backend.c +++ b/src/backend/backend.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/safeclib.h" #include "backend/backend.h" diff --git a/src/backend/file.c b/src/backend/file.c index ba18f93be..cd22d00ba 100644 --- a/src/backend/file.c +++ b/src/backend/file.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/mutex.h" #include "lib/safeclib.h" diff --git a/src/backend/filedescriptor.c b/src/backend/filedescriptor.c index edb6afbfd..5ab30eba8 100644 --- a/src/backend/filedescriptor.c +++ b/src/backend/filedescriptor.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/mutex.h" #include "lib/safeclib.h" diff --git a/src/backend/filehandle.c b/src/backend/filehandle.c index 5aa8de6e8..c988ca0b9 100644 --- a/src/backend/filehandle.c +++ b/src/backend/filehandle.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/llist.h" #include "lib/safeclib.h" diff --git a/src/backend/filehandlecache.c b/src/backend/filehandlecache.c index 123f8924c..73f9ecae6 100644 --- a/src/backend/filehandlecache.c +++ b/src/backend/filehandlecache.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/safeclib.h" #include "backend/file.h" diff --git a/src/backend/mmap.c b/src/backend/mmap.c index e10d3d664..4a69144f4 100644 --- a/src/backend/mmap.c +++ b/src/backend/mmap.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/safeclib.h" #include "backend/mmap.h" diff --git a/src/backend/mmapcache.c b/src/backend/mmapcache.c index 2510ead0b..1e416e68e 100644 --- a/src/backend/mmapcache.c +++ b/src/backend/mmapcache.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/safeclib.h" #include "backend/mmapcache.h" diff --git a/src/backend/mmapings.c b/src/backend/mmapings.c index 88e6cab3e..ebf0c12db 100644 --- a/src/backend/mmapings.c +++ b/src/backend/mmapings.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/mutex.h" #include "lib/safeclib.h" diff --git a/src/backend/thread-wrapper.hpp b/src/backend/thread-wrapper.hpp index 9847b6c2e..8981498cb 100644 --- a/src/backend/thread-wrapper.hpp +++ b/src/backend/thread-wrapper.hpp @@ -25,7 +25,7 @@ #define LIB_THREADWRAPPER_H -#include "common/logging.h" +#include "include/logging.h" #include "lib/sync.hpp" extern "C" { diff --git a/src/common/Makefile.am b/src/common/Makefile.am index 61738c00f..661c92f64 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -43,8 +43,7 @@ liblumieracommon_la_SOURCES = \ $(liblumieracommon_la_srcdir)/appstate.cpp \ $(liblumieracommon_la_srcdir)/option.cpp \ $(liblumieracommon_la_srcdir)/subsys.cpp \ - $(liblumieracommon_la_srcdir)/interfaceproxy.cpp \ - $(liblumieracommon_la_srcdir)/logging.cpp + $(liblumieracommon_la_srcdir)/interfaceproxy.cpp noinst_HEADERS += \ diff --git a/src/common/config.c b/src/common/config.c index 70341d68c..b3a2fb745 100644 --- a/src/common/config.c +++ b/src/common/config.c @@ -20,7 +20,7 @@ */ //TODO: Support library includes// -#include "common/logging.h" +#include "include/logging.h" #include "lib/safeclib.h" #include "common/config.h" diff --git a/src/common/config_lookup.c b/src/common/config_lookup.c index c9be918c5..03837dcb4 100644 --- a/src/common/config_lookup.c +++ b/src/common/config_lookup.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/safeclib.h" #include "common/config_lookup.h" diff --git a/src/common/config_typed.c b/src/common/config_typed.c index 59b04a674..8018c12c0 100644 --- a/src/common/config_typed.c +++ b/src/common/config_typed.c @@ -20,7 +20,7 @@ */ //TODO: Support library includes// -#include "common/logging.h" +#include "include/logging.h" #include "lib/safeclib.h" diff --git a/src/common/config_wordlist.c b/src/common/config_wordlist.c index 8a3c74212..4f90a46ff 100644 --- a/src/common/config_wordlist.c +++ b/src/common/config_wordlist.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/error.h" #include "lib/safeclib.h" diff --git a/src/common/configfacade.cpp b/src/common/configfacade.cpp index 18c95ccb0..ca4310480 100644 --- a/src/common/configfacade.cpp +++ b/src/common/configfacade.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/logging.h" +#include "include/logging.h" #include "include/lifecycle.h" #include "include/configfacade.hpp" diff --git a/src/common/configitem.c b/src/common/configitem.c index e6b8a7839..78e861ecb 100644 --- a/src/common/configitem.c +++ b/src/common/configitem.c @@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/llist.h" #include "lib/safeclib.h" diff --git a/src/common/configrules.cpp b/src/common/configrules.cpp index 85ffcf5d5..2a5530324 100644 --- a/src/common/configrules.cpp +++ b/src/common/configrules.cpp @@ -24,7 +24,7 @@ #include "common/configrules.hpp" #include "common/query/fake-configrules.hpp" //#include "lib/util.hpp" -#include "common/logging.h" +#include "include/logging.h" diff --git a/src/common/instancehandle.hpp b/src/common/instancehandle.hpp index 82bed78fe..6de4fbde9 100644 --- a/src/common/instancehandle.hpp +++ b/src/common/instancehandle.hpp @@ -41,7 +41,7 @@ #define LUMIERA_INSTANCEHANDLE_H -#include "common/logging.h" +#include "include/logging.h" #include "lib/error.hpp" #include "include/interfaceproxy.hpp" diff --git a/src/common/interface.c b/src/common/interface.c index b4a3cac85..1853c7af3 100644 --- a/src/common/interface.c +++ b/src/common/interface.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/mutex.h" #include "lib/safeclib.h" diff --git a/src/common/interfaceregistry.c b/src/common/interfaceregistry.c index e7973b361..ad8bd8224 100644 --- a/src/common/interfaceregistry.c +++ b/src/common/interfaceregistry.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/mutex.h" #include "lib/error.h" #include "lib/psplay.h" diff --git a/src/common/plugin.c b/src/common/plugin.c index 12641437c..7329d51b0 100644 --- a/src/common/plugin.c +++ b/src/common/plugin.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/safeclib.h" #include "lib/psplay.h" #include "lib/mutex.h" diff --git a/src/common/plugin_dynlib.c b/src/common/plugin_dynlib.c index be2c93c6d..c8fe5a19d 100644 --- a/src/common/plugin_dynlib.c +++ b/src/common/plugin_dynlib.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/safeclib.h" #include "common/plugin.h" diff --git a/src/common/query/fake-configrules.cpp b/src/common/query/fake-configrules.cpp index 3a3eb1d66..db7d453d1 100644 --- a/src/common/query/fake-configrules.cpp +++ b/src/common/query/fake-configrules.cpp @@ -28,7 +28,7 @@ #include "proc/asset/pipe.hpp" -#include "common/logging.h" +#include "include/logging.h" #include "lib/util.hpp" using util::isnil; diff --git a/src/gui/dialogs/render.cpp b/src/gui/dialogs/render.cpp index 7e4b40378..64dcd23d5 100644 --- a/src/gui/dialogs/render.cpp +++ b/src/gui/dialogs/render.cpp @@ -24,7 +24,7 @@ #include "render.hpp" #include "dialog.hpp" -#include "common/logging.h" +#include "include/logging.h" using namespace Gtk; diff --git a/src/gui/guistart.cpp b/src/gui/guistart.cpp index fe26d92d5..591f0ce2e 100644 --- a/src/gui/guistart.cpp +++ b/src/gui/guistart.cpp @@ -48,7 +48,7 @@ #include // need to include this to prevent errors when libintl.h defines textdomain (because gtk-lumiera removes the def when ENABLE_NLS isn't defined) #include "gui/gtk-lumiera.hpp" // need to include this before nobugcfg.h, because types.h from GTK tries to shaddow the ERROR macro from windows, which kills nobug's ERROR macro -// TODO not needed? #include "common/logging.h" +// TODO not needed? #include "include/logging.h" #include "lib/error.hpp" #include "gui/guifacade.hpp" #include "gui/notification-service.hpp" diff --git a/src/gui/model/sequence.cpp b/src/gui/model/sequence.cpp index a6bab6178..361724125 100644 --- a/src/gui/model/sequence.cpp +++ b/src/gui/model/sequence.cpp @@ -21,7 +21,7 @@ * *****************************************************/ #include "sequence.hpp" -#include "common/logging.h" +#include "include/logging.h" // TEST CODE #include "group-track.hpp" diff --git a/src/gui/notification-service.cpp b/src/gui/notification-service.cpp index ebca1bc7c..fd43c6e6c 100644 --- a/src/gui/notification-service.cpp +++ b/src/gui/notification-service.cpp @@ -23,7 +23,7 @@ #include "gui/notification-service.hpp" #include "lib/singleton.hpp" -#include "common/logging.h" +#include "include/logging.h" #include "lib/util.hpp" extern "C" { diff --git a/src/gui/output/xvdisplayer.cpp b/src/gui/output/xvdisplayer.cpp index 82f6c9115..17017ff30 100644 --- a/src/gui/output/xvdisplayer.cpp +++ b/src/gui/output/xvdisplayer.cpp @@ -27,7 +27,7 @@ #include #include "xvdisplayer.hpp" -#include "common/logging.h" +#include "include/logging.h" namespace gui { namespace output { diff --git a/src/gui/widgets/timeline/timeline-body.cpp b/src/gui/widgets/timeline/timeline-body.cpp index bd3a3451f..a3b9c7a5e 100644 --- a/src/gui/widgets/timeline/timeline-body.cpp +++ b/src/gui/widgets/timeline/timeline-body.cpp @@ -29,7 +29,7 @@ #include "timeline-arrow-tool.hpp" #include "timeline-ibeam-tool.hpp" -#include "common/logging.h" +#include "include/logging.h" using namespace Gtk; using namespace std; diff --git a/src/gui/widgets/timeline/timeline-track.cpp b/src/gui/widgets/timeline/timeline-track.cpp index 5222e64c6..6a8f4f023 100644 --- a/src/gui/widgets/timeline/timeline-track.cpp +++ b/src/gui/widgets/timeline/timeline-track.cpp @@ -27,7 +27,7 @@ #include "../timeline-widget.hpp" #include "../../window-manager.hpp" #include "../../dialogs/name-chooser.hpp" -#include "common/logging.h" +#include "include/logging.h" using namespace boost; using namespace Gtk; diff --git a/src/gui/window-manager.cpp b/src/gui/window-manager.cpp index c25992695..66cc728dd 100644 --- a/src/gui/window-manager.cpp +++ b/src/gui/window-manager.cpp @@ -21,7 +21,7 @@ * *****************************************************/ #include "window-manager.hpp" -#include "common/logging.h" +#include "include/logging.h" using namespace Gtk; using namespace Glib; diff --git a/src/gui/workspace/workspace-window.cpp b/src/gui/workspace/workspace-window.cpp index f41033421..0d5d4fb6f 100644 --- a/src/gui/workspace/workspace-window.cpp +++ b/src/gui/workspace/workspace-window.cpp @@ -34,7 +34,7 @@ #include "../gtk-lumiera.hpp" #include "workspace-window.hpp" -#include "common/logging.h" +#include "include/logging.h" using namespace Gtk; using namespace gui::model; diff --git a/src/common/logging.h b/src/include/logging.h similarity index 99% rename from src/common/logging.h rename to src/include/logging.h index 0a2e49c4a..202836c08 100644 --- a/src/common/logging.h +++ b/src/include/logging.h @@ -34,7 +34,7 @@ ** ** This header can thus be assumed to be effectively global. It should contain ** only declarations of global relevance, as any change causes the whole project - ** to be rebuilt. All flags defined here are automatic initialised. + ** to be rebuilt. All flags defined here are initialised automatically. ** ** We use the 'NOBUG_DECLARATIONS_ONLY' magic to generate declarations and ** definitions only out of this header. diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 489be37ce..ede6de1cf 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -43,7 +43,8 @@ liblumiera_la_SOURCES = \ $(liblumiera_la_srcdir)/streamtype.cpp \ $(liblumiera_la_srcdir)/test/testoption.cpp \ $(liblumiera_la_srcdir)/test/suite.cpp \ - $(liblumiera_la_srcdir)/cmdline.cpp + $(liblumiera_la_srcdir)/cmdline.cpp \ + $(liblumiera_la_srcdir)/logging.cpp noinst_HEADERS += \ $(liblumiera_la_srcdir)/error.h \ diff --git a/src/lib/cmdline.cpp b/src/lib/cmdline.cpp index aed6aae40..89ebc2137 100644 --- a/src/lib/cmdline.cpp +++ b/src/lib/cmdline.cpp @@ -24,7 +24,7 @@ #include "lib/cmdline.hpp" #include "lib/util.hpp" -#include "common/logging.h" +#include "include/logging.h" #include #include diff --git a/src/lib/error.hpp b/src/lib/error.hpp index d2e2537ef..2dd654037 100644 --- a/src/lib/error.hpp +++ b/src/lib/error.hpp @@ -25,7 +25,7 @@ #define LUMIERA_ERROR_HPP_ #include -#include "common/logging.h" +#include "include/logging.h" #include "include/lifecycle.h" #include "lib/error.h" diff --git a/src/common/logging.cpp b/src/lib/logging.cpp similarity index 97% rename from src/common/logging.cpp rename to src/lib/logging.cpp index 07a53eab3..b2a62dfce 100644 --- a/src/common/logging.cpp +++ b/src/lib/logging.cpp @@ -22,7 +22,7 @@ */ #define LUMIERA_LOGGING_CXX -#include "common/logging.h" +#include "include/logging.h" /* // Local Variables: diff --git a/src/lib/psplay.c b/src/lib/psplay.c index dcb10a24f..1f788a644 100644 --- a/src/lib/psplay.c +++ b/src/lib/psplay.c @@ -21,7 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/psplay.h" #include diff --git a/src/lib/query.cpp b/src/lib/query.cpp index 41df0fc53..259207387 100644 --- a/src/lib/query.cpp +++ b/src/lib/query.cpp @@ -23,7 +23,7 @@ #include "lib/query.hpp" #include "lib/util.hpp" -#include "common/logging.h" +#include "include/logging.h" #include #include diff --git a/src/lib/resourcecollector.c b/src/lib/resourcecollector.c index e1c21b83c..1919c853f 100644 --- a/src/lib/resourcecollector.c +++ b/src/lib/resourcecollector.c @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/llist.h" #include "lib/mutex.h" #include "lib/safeclib.h" diff --git a/src/lib/singletonfactory.hpp b/src/lib/singletonfactory.hpp index 31725dedf..0f2f4b225 100644 --- a/src/lib/singletonfactory.hpp +++ b/src/lib/singletonfactory.hpp @@ -37,7 +37,7 @@ This code is heavily inspired by #include "lib/singletonpolicies.hpp" // several Policies usable together with SingletonFactory -#include "common/logging.h" +#include "include/logging.h" #include "lib/util.hpp" #include "lib/sync-classlock.hpp" diff --git a/src/lib/sync.hpp b/src/lib/sync.hpp index 63212bfa5..077ab8b42 100644 --- a/src/lib/sync.hpp +++ b/src/lib/sync.hpp @@ -67,7 +67,7 @@ #ifndef LIB_SYNC_H #define LIB_SYNC_H -#include "common/logging.h" +#include "include/logging.h" #include "lib/error.hpp" #include "lib/util.hpp" diff --git a/src/lib/test/run.hpp b/src/lib/test/run.hpp index 9f6f2f415..0b3e896b3 100644 --- a/src/lib/test/run.hpp +++ b/src/lib/test/run.hpp @@ -28,7 +28,7 @@ #include "pre.hpp" -#include "common/logging.h" +#include "include/logging.h" #include "lib/test/suite.hpp" #include "lib/util.hpp" diff --git a/src/lib/test/suite.cpp b/src/lib/test/suite.cpp index a4df524b6..f6107fafc 100644 --- a/src/lib/test/suite.cpp +++ b/src/lib/test/suite.cpp @@ -30,7 +30,7 @@ #include #include -#include "common/logging.h" +#include "include/logging.h" #include "lib/cmdline.hpp" #include "lib/test/suite.hpp" #include "lib/test/run.hpp" diff --git a/src/lumiera/main.cpp b/src/lumiera/main.cpp index 9d143d419..3cc2b2eeb 100644 --- a/src/lumiera/main.cpp +++ b/src/lumiera/main.cpp @@ -22,7 +22,7 @@ */ -#include "common/logging.h" +#include "include/logging.h" #include "lib/error.hpp" #include "common/appstate.hpp" #include "common/option.hpp" diff --git a/src/proc/asset.hpp b/src/proc/asset.hpp index 785c4948e..0186289fd 100644 --- a/src/proc/asset.hpp +++ b/src/proc/asset.hpp @@ -56,7 +56,7 @@ #include "proc/asset/category.hpp" -#include "common/logging.h" +#include "include/logging.h" #include "lib/error.hpp" #include "lib/p.hpp" diff --git a/src/proc/asset/category.cpp b/src/proc/asset/category.cpp index 622ae8205..e285bf011 100644 --- a/src/proc/asset/category.cpp +++ b/src/proc/asset/category.cpp @@ -23,7 +23,7 @@ #include "proc/asset/category.hpp" #include "lib/util.hpp" -#include "common/logging.h" +#include "include/logging.h" #include diff --git a/src/proc/asset/media.cpp b/src/proc/asset/media.cpp index cb7d9249d..e8c6ac12b 100644 --- a/src/proc/asset/media.cpp +++ b/src/proc/asset/media.cpp @@ -29,7 +29,7 @@ #include "proc/mobject/session/clip.hpp" #include "proc/mobject/session/mobjectfactory.hpp" #include "lib/util.hpp" -#include "common/logging.h" +#include "include/logging.h" #include #include diff --git a/src/proc/asset/meta.cpp b/src/proc/asset/meta.cpp index d72767265..ecb918ed1 100644 --- a/src/proc/asset/meta.cpp +++ b/src/proc/asset/meta.cpp @@ -24,7 +24,7 @@ #include "proc/assetmanager.hpp" #include "proc/asset/meta.hpp" #include "lib/util.hpp" -#include "common/logging.h" +#include "include/logging.h" namespace asset diff --git a/src/proc/asset/proc.cpp b/src/proc/asset/proc.cpp index 870fdc739..764c3a928 100644 --- a/src/proc/asset/proc.cpp +++ b/src/proc/asset/proc.cpp @@ -24,7 +24,7 @@ #include "proc/assetmanager.hpp" #include "proc/asset/proc.hpp" #include "lib/util.hpp" -#include "common/logging.h" +#include "include/logging.h" namespace asset diff --git a/src/proc/asset/struct.cpp b/src/proc/asset/struct.cpp index 9503bed13..4288e066a 100644 --- a/src/proc/asset/struct.cpp +++ b/src/proc/asset/struct.cpp @@ -31,7 +31,7 @@ #include "proc/asset/structfactoryimpl.hpp" #include "lib/util.hpp" -#include "common/logging.h" +#include "include/logging.h" #include diff --git a/src/proc/mobject/builder/common.hpp b/src/proc/mobject/builder/common.hpp index b22786f75..e0503499b 100644 --- a/src/proc/mobject/builder/common.hpp +++ b/src/proc/mobject/builder/common.hpp @@ -24,7 +24,7 @@ #ifndef MOBJECT_BUILDER_COMMON_H #define MOBJECT_BUILDER_COMMON_H -#include "common/logging.h" +#include "include/logging.h" namespace mobject { diff --git a/src/proc/mobject/session/fixture.cpp b/src/proc/mobject/session/fixture.cpp index 1c47cd889..2ff3b1612 100644 --- a/src/proc/mobject/session/fixture.cpp +++ b/src/proc/mobject/session/fixture.cpp @@ -22,7 +22,7 @@ #include "proc/mobject/session/fixture.hpp" -#include "common/logging.h" +#include "include/logging.h" namespace mobject { diff --git a/tests/components/proc/asset/basicpipetest.cpp b/tests/components/proc/asset/basicpipetest.cpp index 7ab6972af..c10c77ea8 100644 --- a/tests/components/proc/asset/basicpipetest.cpp +++ b/tests/components/proc/asset/basicpipetest.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/logging.h" +#include "include/logging.h" #include "lib/test/run.hpp" #include "lib/util.hpp" diff --git a/tests/components/proc/asset/compoundmediatest.cpp b/tests/components/proc/asset/compoundmediatest.cpp index aec887051..e6e045895 100644 --- a/tests/components/proc/asset/compoundmediatest.cpp +++ b/tests/components/proc/asset/compoundmediatest.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/logging.h" +#include "include/logging.h" #include "lib/test/run.hpp" #include "lib/util.hpp" diff --git a/tests/components/proc/asset/createassettest.cpp b/tests/components/proc/asset/createassettest.cpp index 5eea290d4..c2eb633f8 100644 --- a/tests/components/proc/asset/createassettest.cpp +++ b/tests/components/proc/asset/createassettest.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/logging.h" +#include "include/logging.h" #include "lib/test/run.hpp" #include "lib/util.hpp" diff --git a/tests/components/proc/asset/identityofassetstest.cpp b/tests/components/proc/asset/identityofassetstest.cpp index 21c45a474..98ba41e84 100644 --- a/tests/components/proc/asset/identityofassetstest.cpp +++ b/tests/components/proc/asset/identityofassetstest.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/logging.h" +#include "include/logging.h" #include "lib/test/run.hpp" #include "lib/util.hpp" diff --git a/tests/components/proc/asset/makecliptest.cpp b/tests/components/proc/asset/makecliptest.cpp index 7e21a996d..0dc4365cc 100644 --- a/tests/components/proc/asset/makecliptest.cpp +++ b/tests/components/proc/asset/makecliptest.cpp @@ -21,7 +21,7 @@ * *****************************************************/ -#include "common/logging.h" +#include "include/logging.h" #include "lib/test/run.hpp" #include "lib/util.hpp"