tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor the demo library.

This commit is contained in:
Gunnar Beutner 2013-09-25 09:39:31 +02:00
parent c3746e7c73
commit b3ff87b9dd
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/demo/Makefile.am
View File

@ -10,8 +10,8 @@ CLEANFILES = \
$(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@ $(top_builddir)/tools/mkembedconfig/mkembedconfig $< $@
libdemo_la_SOURCES = \ libdemo_la_SOURCES = \
democomponent.cpp \ demo.cpp \
democomponent.h \ demo.h \
demo-type.conf demo-type.conf
libdemo_la_CPPFLAGS = \ libdemo_la_CPPFLAGS = \

2
components/demo/demo-type.conf
View File

@ -17,5 +17,5 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/ ******************************************************************************/
type DemoComponent { type Demo {
} }

12
components/demo/democomponent.cpp → components/demo/demo.cpp
View File

@ -17,32 +17,32 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/ ******************************************************************************/
#include "demo/democomponent.h" #include "demo/demo.h"
#include "base/dynamictype.h" #include "base/dynamictype.h"
#include "base/logger_fwd.h" #include "base/logger_fwd.h"
#include <boost/smart_ptr/make_shared.hpp> #include <boost/smart_ptr/make_shared.hpp>
using namespace icinga; using namespace icinga;
REGISTER_TYPE(DemoComponent); REGISTER_TYPE(Demo);
/** /**
* Starts the component. * Starts the component.
*/ */
void DemoComponent::Start(void) void Demo::Start(void)
{ {
DynamicObject::Start(); DynamicObject::Start();
m_DemoTimer = boost::make_shared<Timer>(); m_DemoTimer = boost::make_shared<Timer>();
m_DemoTimer->SetInterval(5); m_DemoTimer->SetInterval(5);
m_DemoTimer->OnTimerExpired.connect(boost::bind(&DemoComponent::DemoTimerHandler, this)); m_DemoTimer->OnTimerExpired.connect(boost::bind(&Demo::DemoTimerHandler, this));
m_DemoTimer->Start(); m_DemoTimer->Start();
} }
/** /**
* Stops the component. * Stops the component.
*/ */
void DemoComponent::Stop(void) void Demo::Stop(void)
{ {
/* Nothing to do here. */ /* Nothing to do here. */
} }
@ -52,7 +52,7 @@ void DemoComponent::Stop(void)
* *
* @param - Event arguments for the timer. * @param - Event arguments for the timer.
*/ */
void DemoComponent::DemoTimerHandler(void) void Demo::DemoTimerHandler(void)
{ {
Log(LogInformation, "demo", "Hello World!"); Log(LogInformation, "demo", "Hello World!");
} }

12
components/demo/democomponent.h → components/demo/demo.h
View File

@ -17,8 +17,8 @@
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. * * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. *
******************************************************************************/ ******************************************************************************/
#ifndef DEMOCOMPONENT_H #ifndef DEMO_H
#define DEMOCOMPONENT_H #define DEMO_H
#include "base/dynamicobject.h" #include "base/dynamicobject.h"
#include "base/timer.h" #include "base/timer.h"
@ -29,11 +29,11 @@ namespace icinga
/** /**
* @ingroup demo * @ingroup demo
*/ */
class DemoComponent : public DynamicObject class Demo : public DynamicObject
{ {
public: public:
DECLARE_PTR_TYPEDEFS(DemoComponent); DECLARE_PTR_TYPEDEFS(Demo);
DECLARE_TYPENAME(DemoComponent); DECLARE_TYPENAME(Demo);
virtual void Start(void); virtual void Start(void);
virtual void Stop(void); virtual void Stop(void);
@ -46,4 +46,4 @@ private:
} }
#endif /* DEMOCOMPONENT_H */ #endif /* DEMO_H */