From 5183197c6909c22eaf8684bbd21c0be61e2fa7d9 Mon Sep 17 00:00:00 2001 From: fgerlits Date: Fri, 10 Feb 2006 11:41:20 +0000 Subject: [PATCH] moved the OptionsContainer class to the Core module (since we might want to use it in the Scheduler, too) --- livesupport/src/modules/core/etc/Makefile.in | 3 ++- .../include/LiveSupport/Core}/OptionsContainer.h | 12 +++++------- .../core}/src/OptionsContainer.cxx | 3 +-- .../src/products/gLiveSupport/etc/Makefile.in | 1 - .../src/products/gLiveSupport/src/GLiveSupport.h | 2 +- .../src/products/gLiveSupport/src/OptionsWindow.cxx | 1 + .../src/products/gLiveSupport/src/OptionsWindow.h | 1 + 7 files changed, 11 insertions(+), 12 deletions(-) rename livesupport/src/{products/gLiveSupport/src => modules/core/include/LiveSupport/Core}/OptionsContainer.h (96%) rename livesupport/src/{products/gLiveSupport => modules/core}/src/OptionsContainer.cxx (99%) diff --git a/livesupport/src/modules/core/etc/Makefile.in b/livesupport/src/modules/core/etc/Makefile.in index 8973c2f4e..359bb8383 100644 --- a/livesupport/src/modules/core/etc/Makefile.in +++ b/livesupport/src/modules/core/etc/Makefile.in @@ -133,7 +133,8 @@ CORE_LIB_OBJS = ${TMP_DIR}/UniqueId.o \ ${TMP_DIR}/BaseTestMethod.o \ ${TMP_DIR}/SearchCriteria.o \ ${TMP_DIR}/MetadataType.o \ - ${TMP_DIR}/MetadataTypeContainer.o + ${TMP_DIR}/MetadataTypeContainer.o \ + ${TMP_DIR}/OptionsContainer.o TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ ${TMP_DIR}/UuidTest.o \ diff --git a/livesupport/src/products/gLiveSupport/src/OptionsContainer.h b/livesupport/src/modules/core/include/LiveSupport/Core/OptionsContainer.h similarity index 96% rename from livesupport/src/products/gLiveSupport/src/OptionsContainer.h rename to livesupport/src/modules/core/include/LiveSupport/Core/OptionsContainer.h index be254c91c..f77729f83 100644 --- a/livesupport/src/products/gLiveSupport/src/OptionsContainer.h +++ b/livesupport/src/modules/core/include/LiveSupport/Core/OptionsContainer.h @@ -26,8 +26,8 @@ Location : $URL $ ------------------------------------------------------------------------------*/ -#ifndef LiveSupport_GLiveSupport_OptionsContainer_h -#define LiveSupport_GLiveSupport_OptionsContainer_h +#ifndef LiveSupport_Core_OptionsContainer_h +#define LiveSupport_Core_OptionsContainer_h #ifndef __cplusplus #error This is a C++ include file @@ -48,9 +48,7 @@ namespace LiveSupport { -namespace GLiveSupport { - -using namespace LiveSupport::Core; +namespace Core { /* ================================================================ constants */ @@ -208,8 +206,8 @@ class OptionsContainer /* ====================================================== function prototypes */ -} // namespace GLiveSupport +} // namespace Core } // namespace LiveSupport -#endif // LiveSupport_GLiveSupport_OptionsContainer_h +#endif // LiveSupport_Core_OptionsContainer_h diff --git a/livesupport/src/products/gLiveSupport/src/OptionsContainer.cxx b/livesupport/src/modules/core/src/OptionsContainer.cxx similarity index 99% rename from livesupport/src/products/gLiveSupport/src/OptionsContainer.cxx rename to livesupport/src/modules/core/src/OptionsContainer.cxx index 1d800cbb4..d3da6ae4f 100644 --- a/livesupport/src/products/gLiveSupport/src/OptionsContainer.cxx +++ b/livesupport/src/modules/core/src/OptionsContainer.cxx @@ -36,11 +36,10 @@ #include #include -#include "OptionsContainer.h" +#include "LiveSupport/Core/OptionsContainer.h" using namespace LiveSupport::Core; -using namespace LiveSupport::GLiveSupport; /* =================================================== local data structures */ diff --git a/livesupport/src/products/gLiveSupport/etc/Makefile.in b/livesupport/src/products/gLiveSupport/etc/Makefile.in index d1c24da26..5d369e6fd 100644 --- a/livesupport/src/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/src/products/gLiveSupport/etc/Makefile.in @@ -259,7 +259,6 @@ G_LIVESUPPORT_OBJS = ${TMP_DIR}/GLiveSupport.o \ ${TMP_DIR}/CuePlayer.o \ ${TMP_DIR}/KeyboardShortcut.o \ ${TMP_DIR}/KeyboardShortcutContainer.o \ - ${TMP_DIR}/OptionsContainer.o \ ${TMP_DIR}/OptionsWindow.o G_LIVESUPPORT_RES = ${TMP_DIR}/${PACKAGE_NAME}_root.res \ diff --git a/livesupport/src/products/gLiveSupport/src/GLiveSupport.h b/livesupport/src/products/gLiveSupport/src/GLiveSupport.h index c7005a899..98011e5b8 100644 --- a/livesupport/src/products/gLiveSupport/src/GLiveSupport.h +++ b/livesupport/src/products/gLiveSupport/src/GLiveSupport.h @@ -49,13 +49,13 @@ #include "LiveSupport/Core/Ptr.h" #include "LiveSupport/Core/LocalizedConfigurable.h" #include "LiveSupport/Core/MetadataTypeContainer.h" +#include "LiveSupport/Core/OptionsContainer.h" #include "LiveSupport/Authentication/AuthenticationClientInterface.h" #include "LiveSupport/Storage/StorageClientInterface.h" #include "LiveSupport/SchedulerClient/SchedulerClientInterface.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" #include "LiveSupport/Widgets/WidgetFactory.h" #include "KeyboardShortcutContainer.h" -#include "OptionsContainer.h" namespace LiveSupport { diff --git a/livesupport/src/products/gLiveSupport/src/OptionsWindow.cxx b/livesupport/src/products/gLiveSupport/src/OptionsWindow.cxx index b81e6d589..0162d56a4 100644 --- a/livesupport/src/products/gLiveSupport/src/OptionsWindow.cxx +++ b/livesupport/src/products/gLiveSupport/src/OptionsWindow.cxx @@ -42,6 +42,7 @@ #include "OptionsWindow.h" +using namespace LiveSupport::Core; using namespace LiveSupport::Widgets; using namespace LiveSupport::GLiveSupport; diff --git a/livesupport/src/products/gLiveSupport/src/OptionsWindow.h b/livesupport/src/products/gLiveSupport/src/OptionsWindow.h index 35f675749..4743daaa5 100644 --- a/livesupport/src/products/gLiveSupport/src/OptionsWindow.h +++ b/livesupport/src/products/gLiveSupport/src/OptionsWindow.h @@ -49,6 +49,7 @@ #include "LiveSupport/Core/Ptr.h" #include "LiveSupport/Core/LocalizedObject.h" +#include "LiveSupport/Core/OptionsContainer.h" #include "LiveSupport/Widgets/Button.h" #include "LiveSupport/Widgets/EntryBin.h" #include "LiveSupport/Widgets/ComboBoxText.h"