String -> std::string, toString methods removed

This commit is contained in:
Matej Sekoranja
2014-06-19 14:30:40 +02:00
parent 61edf17cdf
commit c39b966121
37 changed files with 284 additions and 308 deletions
+19 -19
View File
@@ -575,10 +575,10 @@ public:
virtual void destroy();
static PVRecordPtr create(
epics::pvData::String const & recordName,
std::string const & recordName,
epics::pvData::PVStructurePtr const & pvStructure);
virtual ~PVRecord();
epics::pvData::String getRecordName();
std::string getRecordName();
PVRecordStructurePtr getPVRecordStructure();
PVRecordFieldPtr findPVRecordField(
epics::pvData::PVFieldPtr const & pvField);
@@ -596,13 +596,13 @@ public:
bool removeListener(PVListenerPtr const & pvListener);
void beginGroupPut();
void endGroupPut();
epics::pvData::String getRequesterName() {return getRecordName();}
std::string getRequesterName() {return getRecordName();}
virtual void message(
epics::pvData::String const & message,
std::string const & message,
epics::pvData::MessageType messageType);
void message(
PVRecordFieldPtr const & pvRecordField,
epics::pvData::String const & message,
std::string const & message,
epics::pvData::MessageType messageType);
void toString(epics::pvData::StringBuilder buf);
void toString(epics::pvData::StringBuilder buf,int indentLevel);
@@ -610,7 +610,7 @@ public:
void setTraceLevel(int level);
protected:
PVRecord(
epics::pvData::String const & recordName,
std::string const & recordName,
epics::pvData::PVStructurePtr const & pvStructure);
void initPVRecord();
epics::pvData::PVStructurePtr getPVStructure();
@@ -742,14 +742,14 @@ public:
virtual void destroy();
PVRecordStructurePtr getParent();
epics::pvData::PVFieldPtr getPVField();
epics::pvData::String getFullFieldName();
epics::pvData::String getFullName();
std::string getFullFieldName();
std::string getFullName();
PVRecordPtr getPVRecord();
bool addListener(PVListenerPtr const & pvListener);
virtual void removeListener(PVListenerPtr const & pvListener);
virtual void postPut();
virtual void message(
epics::pvData::String const & message,
std::string const & message,
epics::pvData::MessageType messageType);
protected:
PVRecordFieldPtr getPtrSelf()
@@ -896,13 +896,13 @@ public:
static PVDatabasePtr getMaster();
virtual ~PVDatabase();
virtual void destroy();
PVRecordPtr findRecord(epics::pvData::String const& recordName);
PVRecordPtr findRecord(std::string const& recordName);
bool addRecord(PVRecordPtr const & record);
epics::pvData::PVStringArrayPtr getRecordNames();
bool removeRecord(PVRecordPtr const & record);
virtual epics::pvData::String getRequesterName();
virtual std::string getRequesterName();
virtual void message(
epics::pvData::String const &message,
std::string const &message,
epics::pvData::MessageType messageType);
private:
PVDatabase();
@@ -1227,13 +1227,13 @@ class ExampleServer :
public:
POINTER_DEFINITIONS(ExampleServer);
static ExampleServerPtr create(
epics::pvData::String const & recordName);
std::string const & recordName);
virtual ~ExampleServer();
virtual void destroy();
virtual bool init();
virtual void process();
private:
ExampleServer(epics::pvData::String const & recordName,
ExampleServer(std::string const & recordName,
epics::pvData::PVStructurePtr const & pvStructure);
epics::pvData::PVStringPtr pvArgumentValue;
@@ -1271,7 +1271,7 @@ private:
<p>The implementation of create method is:</p>
<pre>
ExampleServerPtr ExampleServer::create(
epics::pvData::String const &amp; recordName)
std::string const &amp; recordName)
{
StandardPVFieldPtr standardPVField = getStandardPVField();
PVDataCreatePtr pvDataCreate = getPVDataCreate();
@@ -1302,7 +1302,7 @@ This:
<p>The private constructor method is:</p>
<pre>
ExampleServer::ExampleServer(
epics::pvData::String const &amp; recordName,
std::string const &amp; recordName,
epics::pvData::PVStructurePtr const &amp; pvStructure)
: PVRecord(recordName,pvStructure)
{
@@ -1576,9 +1576,9 @@ class ExampleLink :
public:
POINTER_DEFINITIONS(ExampleLink);
static ExampleLinkPtr create(
epics::pvData::String const &amp; recordName,
epics::pvData::String const &amp; providerName,
epics::pvData::String const &amp; channelName
std::string const &amp; recordName,
std::string const &amp; providerName,
std::string const &amp; channelName
);
virtual ~ExampleLink() {}
virtual void destroy();