moved the OptionsContainer class to the Core module

(since we might want to use it in the Scheduler, too)
This commit is contained in:
fgerlits 2006-02-10 11:41:20 +00:00
parent 6497775c9b
commit 5183197c69
7 changed files with 11 additions and 12 deletions

View file

@ -133,7 +133,8 @@ CORE_LIB_OBJS = ${TMP_DIR}/UniqueId.o \
${TMP_DIR}/BaseTestMethod.o \ ${TMP_DIR}/BaseTestMethod.o \
${TMP_DIR}/SearchCriteria.o \ ${TMP_DIR}/SearchCriteria.o \
${TMP_DIR}/MetadataType.o \ ${TMP_DIR}/MetadataType.o \
${TMP_DIR}/MetadataTypeContainer.o ${TMP_DIR}/MetadataTypeContainer.o \
${TMP_DIR}/OptionsContainer.o
TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \ TEST_RUNNER_OBJS = ${TMP_DIR}/TestRunner.o \
${TMP_DIR}/UuidTest.o \ ${TMP_DIR}/UuidTest.o \

View file

@ -26,8 +26,8 @@
Location : $URL $ Location : $URL $
------------------------------------------------------------------------------*/ ------------------------------------------------------------------------------*/
#ifndef LiveSupport_GLiveSupport_OptionsContainer_h #ifndef LiveSupport_Core_OptionsContainer_h
#define LiveSupport_GLiveSupport_OptionsContainer_h #define LiveSupport_Core_OptionsContainer_h
#ifndef __cplusplus #ifndef __cplusplus
#error This is a C++ include file #error This is a C++ include file
@ -48,9 +48,7 @@
namespace LiveSupport { namespace LiveSupport {
namespace GLiveSupport { namespace Core {
using namespace LiveSupport::Core;
/* ================================================================ constants */ /* ================================================================ constants */
@ -208,8 +206,8 @@ class OptionsContainer
/* ====================================================== function prototypes */ /* ====================================================== function prototypes */
} // namespace GLiveSupport } // namespace Core
} // namespace LiveSupport } // namespace LiveSupport
#endif // LiveSupport_GLiveSupport_OptionsContainer_h #endif // LiveSupport_Core_OptionsContainer_h

View file

@ -36,11 +36,10 @@
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include "OptionsContainer.h" #include "LiveSupport/Core/OptionsContainer.h"
using namespace LiveSupport::Core; using namespace LiveSupport::Core;
using namespace LiveSupport::GLiveSupport;
/* =================================================== local data structures */ /* =================================================== local data structures */

View file

@ -259,7 +259,6 @@ G_LIVESUPPORT_OBJS = ${TMP_DIR}/GLiveSupport.o \
${TMP_DIR}/CuePlayer.o \ ${TMP_DIR}/CuePlayer.o \
${TMP_DIR}/KeyboardShortcut.o \ ${TMP_DIR}/KeyboardShortcut.o \
${TMP_DIR}/KeyboardShortcutContainer.o \ ${TMP_DIR}/KeyboardShortcutContainer.o \
${TMP_DIR}/OptionsContainer.o \
${TMP_DIR}/OptionsWindow.o ${TMP_DIR}/OptionsWindow.o
G_LIVESUPPORT_RES = ${TMP_DIR}/${PACKAGE_NAME}_root.res \ G_LIVESUPPORT_RES = ${TMP_DIR}/${PACKAGE_NAME}_root.res \

View file

@ -49,13 +49,13 @@
#include "LiveSupport/Core/Ptr.h" #include "LiveSupport/Core/Ptr.h"
#include "LiveSupport/Core/LocalizedConfigurable.h" #include "LiveSupport/Core/LocalizedConfigurable.h"
#include "LiveSupport/Core/MetadataTypeContainer.h" #include "LiveSupport/Core/MetadataTypeContainer.h"
#include "LiveSupport/Core/OptionsContainer.h"
#include "LiveSupport/Authentication/AuthenticationClientInterface.h" #include "LiveSupport/Authentication/AuthenticationClientInterface.h"
#include "LiveSupport/Storage/StorageClientInterface.h" #include "LiveSupport/Storage/StorageClientInterface.h"
#include "LiveSupport/SchedulerClient/SchedulerClientInterface.h" #include "LiveSupport/SchedulerClient/SchedulerClientInterface.h"
#include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h" #include "LiveSupport/PlaylistExecutor/AudioPlayerInterface.h"
#include "LiveSupport/Widgets/WidgetFactory.h" #include "LiveSupport/Widgets/WidgetFactory.h"
#include "KeyboardShortcutContainer.h" #include "KeyboardShortcutContainer.h"
#include "OptionsContainer.h"
namespace LiveSupport { namespace LiveSupport {

View file

@ -42,6 +42,7 @@
#include "OptionsWindow.h" #include "OptionsWindow.h"
using namespace LiveSupport::Core;
using namespace LiveSupport::Widgets; using namespace LiveSupport::Widgets;
using namespace LiveSupport::GLiveSupport; using namespace LiveSupport::GLiveSupport;

View file

@ -49,6 +49,7 @@
#include "LiveSupport/Core/Ptr.h" #include "LiveSupport/Core/Ptr.h"
#include "LiveSupport/Core/LocalizedObject.h" #include "LiveSupport/Core/LocalizedObject.h"
#include "LiveSupport/Core/OptionsContainer.h"
#include "LiveSupport/Widgets/Button.h" #include "LiveSupport/Widgets/Button.h"
#include "LiveSupport/Widgets/EntryBin.h" #include "LiveSupport/Widgets/EntryBin.h"
#include "LiveSupport/Widgets/ComboBoxText.h" #include "LiveSupport/Widgets/ComboBoxText.h"