git-svn-id: svn://db.shs.com.ru/libs@112 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -1,14 +1,14 @@
|
||||
#ifndef CDUTILS_CORE_H
|
||||
#define CDUTILS_CORE_H
|
||||
|
||||
#include "cdutils_k_types.h"
|
||||
#include "cdutils_types.h"
|
||||
#include "piconnection.h"
|
||||
#include "pidatatransfer.h"
|
||||
|
||||
|
||||
namespace CDUtils {
|
||||
|
||||
class Core;
|
||||
class CDCore;
|
||||
|
||||
|
||||
class __Core_Initializer__ {
|
||||
@@ -16,16 +16,16 @@ public:
|
||||
__Core_Initializer__();
|
||||
~__Core_Initializer__();
|
||||
static int count_;
|
||||
static Core * __instance__;
|
||||
static CDCore * __instance__;
|
||||
};
|
||||
|
||||
|
||||
class Core: public PIObject
|
||||
class CDCore: public PIObject
|
||||
{
|
||||
PIOBJECT(CDUtils::Core)
|
||||
PIOBJECT(CDUtils::CDCore)
|
||||
friend class __Core_Initializer__;
|
||||
public:
|
||||
static Core * instance() {return __Core_Initializer__::__instance__;}
|
||||
static CDCore * instance() {return __Core_Initializer__::__instance__;}
|
||||
|
||||
EVENT(K_Sended)
|
||||
EVENT(K_Received)
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
EVENT_HANDLER(void, K_Send);
|
||||
EVENT_HANDLER(void, K_Request);
|
||||
|
||||
KSection k_;
|
||||
CDSection k_;
|
||||
|
||||
void k_write(PIIODevice * d);
|
||||
void k_read(PIIODevice * d);
|
||||
@@ -41,7 +41,7 @@ public:
|
||||
void k_update(PIIODevice * d);
|
||||
|
||||
private:
|
||||
Core(const char * conf =
|
||||
CDCore(const char * conf =
|
||||
#ifdef CDPULT
|
||||
pult_config
|
||||
#else
|
||||
@@ -55,7 +55,7 @@ private:
|
||||
|
||||
static const char app_config[], pult_config[];
|
||||
PIConnection connection;
|
||||
|
||||
PIDataTransfer datatr;
|
||||
|
||||
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user