git-svn-id: svn://db.shs.com.ru/pip@217 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

This commit is contained in:
2016-08-09 15:35:02 +00:00
parent 08b56782b1
commit 250965920c
8 changed files with 18 additions and 15 deletions

View File

@@ -34,7 +34,7 @@ class PIP_EXPORT PIScreen: public PIThread, public PIScreenTypes::PIScreenBase
public:
//! Constructs %PIScreen with key handler "slot" and if "startNow" start it
PIScreen(bool startNow = true, PIKbdListener::KBFunc slot = 0);
PIScreen(bool startNow = false, PIKbdListener::KBFunc slot = 0);
~PIScreen();

View File

@@ -373,7 +373,7 @@ int PIFile::write(const void * data, int max_size) {
}
PIFile & PIFile::writeToBinLog(ushort id, const void * data, int size) {
PIFile & PIFile::writeToBinLog(ushort id, const void * data, int size) { /// DEPRECATED
if (!isWriteable() || fd == 0) return *this;
writeBinary(id).writeBinary((ushort)size);
write(data, size);

View File

@@ -153,8 +153,11 @@ public:
//! Write to file "data" with size "max_size" and return written bytes count
int write(const void * data, int max_size);
//! Write "data" to device
int write(const PIByteArray & data) {return write(data.data(), data.size_s());}
PIFile & writeToBinLog(ushort id, const void * data, int size);
PIFile & writeToBinLog(ushort id, const void * data, int size); /// DEPRECATED
//! Write to file binary content of "v"

View File

@@ -184,7 +184,7 @@ public:
//! Write "data" to device
int write(const PIByteArray & data) {return write(data.data(), data.size_s());}
//! Add task to threaded write queue and return task ID
ullong writeThreaded(const void * data, int max_size) {return writeThreaded(PIByteArray(data, uint(max_size)));}

View File

@@ -18,4 +18,4 @@
*/
#include "pimultiprotocol.h"
/// DEPRECATED

View File

@@ -22,10 +22,10 @@
#include "piprotocol.h"
class PIMultiProtocol: public PIMultiProtocolBase
class PIMultiProtocol: public PIMultiProtocolBase /// DEPRECATED
{
public:
PIMultiProtocol() {;}
PIMultiProtocol() {;} /// DEPRECATED
virtual ~PIMultiProtocol() {clear();}
void addProtocol(PIProtocol & prot) {prots.push_back(&prot); prot.setMultiProtocolOwner(this); prot.new_mp_prot = false;}
@@ -59,9 +59,9 @@ private:
};
class PIRepeater: public PIMultiProtocol {
class PIRepeater: public PIMultiProtocol { /// DEPRECATED
public:
PIRepeater(const PIString & config, const PIString & name_) {
PIRepeater(const PIString & config, const PIString & name_) { /// DEPRECATED
PIConfig conf(config, PIIODevice::ReadOnly);
if (!conf.isOpened()) {
piCoutObj << "[PIRepeater \"" << name_ << "\"] Can`t open \"" << config << "\"!";

View File

@@ -29,7 +29,7 @@
*
* */
/// DEPRECATED
PIProtocol::PIProtocol(const PIString & config, const PIString & name_, void * recHeaderPtr, int recHeaderSize, void * recDataPtr, int recDataSize, void * sendDataPtr_, int sendDataSize_): PIObject() {
init();
protName = name_;

View File

@@ -31,14 +31,14 @@
#include "pifile.h"
#include "math.h"
class PIProtocol;
class PIProtocol; /// DEPRECATED
class PIP_EXPORT PIMultiProtocolBase: protected PIObject
class PIP_EXPORT PIMultiProtocolBase: protected PIObject /// DEPRECATED
{
PIOBJECT_SUBCLASS(PIMultiProtocolBase, PIObject)
friend class PIProtocol;
public:
PIMultiProtocolBase() {;}
PIMultiProtocolBase() {;} /// DEPRECATED
virtual ~PIMultiProtocolBase() {;}
protected:
@@ -70,7 +70,7 @@ typedef void (*ReceiveFunc)(void * );
/// void stop()
/// void send()
/// void send(const void * data, int size, bool direct = false)
class PIP_EXPORT PIProtocol: public PIObject
class PIP_EXPORT PIProtocol: public PIObject /// DEPRECATED
{
PIOBJECT_SUBCLASS(PIProtocol, PIObject)
friend class PIMultiProtocolBase;
@@ -79,7 +79,7 @@ class PIP_EXPORT PIProtocol: public PIObject
public:
//! Contructs an empty unconfigured protocol
PIProtocol(): PIObject() {init();}
PIProtocol(): PIObject() {init();} /// DEPRECATED
//! Contructs protocol configured from file "config", config file section "name"
PIProtocol(const PIString & config, const PIString & name, void * recHeaderPtr = 0, int recHeaderSize = 0,