[dss-commits] digitalSTROM Server branch, master, updated. 2d34b1660646ed2d0999d389beb2f4c4399f2744
git version control
dss-commits at forum.digitalstrom.org
Thu Dec 17 10:48:58 CET 2009
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".
The branch, master has been updated
via 2d34b1660646ed2d0999d389beb2f4c4399f2744 (commit)
from 1aa3478d34a584f6768bfe36b8e34eeb2b4b7468 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2d34b1660646ed2d0999d389beb2f4c4399f2744
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date: Thu Dec 17 10:48:20 2009 +0100
Don't use using std::* in headers
-----------------------------------------------------------------------
Changes:
diff --git a/core/dss.cpp b/core/dss.cpp
index 0765203..3378dd4 100644
--- a/core/dss.cpp
+++ b/core/dss.cpp
@@ -94,11 +94,11 @@ const char* WebrootDirectory = "data/webroot";
m_pPropertySystem->createProperty("/system/uptime")->linkToProxy(
PropertyProxyMemberFunction<DSS,int>(*this, &DSS::getUptime));
m_pPropertySystem->createProperty("/config/datadirectory")->linkToProxy(
- PropertyProxyMemberFunction<DSS,string>(*this, &DSS::getDataDirectory, &DSS::setDataDirectory));
+ PropertyProxyMemberFunction<DSS,std::string>(*this, &DSS::getDataDirectory, &DSS::setDataDirectory));
m_pPropertySystem->createProperty("/config/configdirectory")->linkToProxy(
- PropertyProxyMemberFunction<DSS,string>(*this, &DSS::getConfigDirectory, &DSS::setConfigDirectory));
+ PropertyProxyMemberFunction<DSS,std::string>(*this, &DSS::getConfigDirectory, &DSS::setConfigDirectory));
m_pPropertySystem->createProperty("/config/webrootdirectory")->linkToProxy(
- PropertyProxyMemberFunction<DSS,string>(*this, &DSS::getWebrootDirectory, &DSS::setWebrootDirectory));
+ PropertyProxyMemberFunction<DSS,std::string>(*this, &DSS::getWebrootDirectory, &DSS::setWebrootDirectory));
} // ctor
DSS::~DSS() {
@@ -128,7 +128,7 @@ const char* WebrootDirectory = "data/webroot";
return (int)difftime( time( NULL ), m_TimeStarted );
} // getUptime
- void DSS::setDataDirectory(const string& _value) {
+ void DSS::setDataDirectory(const std::string& _value) {
if(!_value.empty() && (_value.at(_value.length() - 1) != '/')) {
m_dataDirectory = _value + "/";
} else {
@@ -136,7 +136,7 @@ const char* WebrootDirectory = "data/webroot";
}
} // setDataDirectory
- void DSS::setConfigDirectory(const string& _value) {
+ void DSS::setConfigDirectory(const std::string& _value) {
if(!_value.empty() && (_value.at(_value.length() - 1) != '/')) {
m_configDirectory = _value + "/";
} else {
@@ -144,7 +144,7 @@ const char* WebrootDirectory = "data/webroot";
}
}
- void DSS::setWebrootDirectory(const string& _value) {
+ void DSS::setWebrootDirectory(const std::string& _value) {
if(!_value.empty() && (_value.at(_value.length() - 1) != '/')) {
m_webrootDirectory = _value + "/";
} else {
@@ -152,7 +152,7 @@ const char* WebrootDirectory = "data/webroot";
}
}
- bool DSS::initialize(const vector<string>& _properties) {
+ bool DSS::initialize(const vector<std::string>& _properties) {
m_State = ssCreatingSubsystems;
m_pDS485Interface = boost::shared_ptr<DS485Proxy>(new DS485Proxy(this));
@@ -184,14 +184,14 @@ const char* WebrootDirectory = "data/webroot";
m_pEventRunner = boost::shared_ptr<EventRunner>(new EventRunner);
m_pEventQueue = boost::shared_ptr<EventQueue>(new EventQueue);
- foreach(string propLine, _properties) {
- string::size_type pos = propLine.find("=");
- if(pos == string::npos) {
+ foreach(std::string propLine, _properties) {
+ std::string::size_type pos = propLine.find("=");
+ if(pos == std::string::npos) {
Logger::getInstance()->log("invalid property specified on commandline (format is name=value): '" + propLine + "'", lsError);
abort();
} else {
- string name = propLine.substr(0, pos);
- string value = propLine.substr(pos+1, string::npos);
+ std::string name = propLine.substr(0, pos);
+ std::string value = propLine.substr(pos+1, std::string::npos);
Logger::getInstance()->log("Setting property '" + name + "' to '" + value + "'", lsInfo);
try {
int val = strToInt(value);
diff --git a/core/event.cpp b/core/event.cpp
index d783cdb..3cf3ad3 100644
--- a/core/event.cpp
+++ b/core/event.cpp
@@ -42,7 +42,7 @@ namespace dss {
//================================================== Event
- Event::Event(const string& _name)
+ Event::Event(const std::string& _name)
: m_Name(_name),
m_RaiseLocation(erlApartment),
m_RaisedAtZone(NULL),
@@ -51,7 +51,7 @@ namespace dss {
reset();
} // ctor
- Event::Event(const string& _name, Zone* _zone)
+ Event::Event(const std::string& _name, Zone* _zone)
: m_Name(_name),
m_RaiseLocation(erlZone),
m_RaisedAtZone(_zone),
@@ -60,7 +60,7 @@ namespace dss {
reset();
} // ctor
- Event::Event(const string& _name, DeviceReference* _reference)
+ Event::Event(const std::string& _name, DeviceReference* _reference)
: m_Name(_name),
m_RaiseLocation(erlDevice),
m_RaisedAtZone(NULL),
@@ -87,7 +87,7 @@ namespace dss {
m_TimeSet = false;
} // reset
- const string& Event::getPropertyByName(const string& _name) const {
+ const std::string& Event::getPropertyByName(const std::string& _name) const {
if(_name == EventPropertyName) {
return m_Name;
} else if(_name == EventPropertyLocation) {
@@ -100,7 +100,7 @@ namespace dss {
return m_Properties.get(_name, "");
} // getPropertyByName
- bool Event::hasPropertySet(const string& _name) const {
+ bool Event::hasPropertySet(const std::string& _name) const {
if(_name == EventPropertyName) {
return true;
} else if(_name == EventPropertyLocation) {
@@ -113,7 +113,7 @@ namespace dss {
return m_Properties.has(_name);
} // hasPropertySet
- void Event::unsetProperty(const string& _name) {
+ void Event::unsetProperty(const std::string& _name) {
if(_name == EventPropertyLocation) {
m_LocationSet = false;
m_Location = "";
@@ -128,7 +128,7 @@ namespace dss {
}
} // unsetProperty
- bool Event::setProperty(const string& _name, const string& _value) {
+ bool Event::setProperty(const std::string& _name, const std::string& _value) {
if(!_name.empty()) {
if(_name == EventPropertyLocation) {
m_LocationSet = true;
@@ -211,7 +211,7 @@ namespace dss {
boost::shared_ptr<Event> toProcess = m_Queue->popEvent();
if(toProcess.get() != NULL) {
- Logger::getInstance()->log(string("EventInterpreter: Got event from queue: '") + toProcess->getName() + "'", lsInfo);
+ Logger::getInstance()->log(std::string("EventInterpreter: Got event from queue: '") + toProcess->getName() + "'", lsInfo);
for(HashMapConstStringString::const_iterator iParam = toProcess->getProperties().getContainer().begin(), e = toProcess->getProperties().getContainer().end();
iParam != e; ++iParam)
{
@@ -223,32 +223,32 @@ namespace dss {
{
if((*ipSubscription)->matches(*toProcess)) {
bool called = false;
- Logger::getInstance()->log(string("EventInterpreter: Subscription '") + (*ipSubscription)->getID() + "' matches event");
+ Logger::getInstance()->log(std::string("EventInterpreter: Subscription '") + (*ipSubscription)->getID() + "' matches event");
EventInterpreterPlugin* plugin = getPluginByName((*ipSubscription)->getHandlerName());
if(plugin != NULL) {
- Logger::getInstance()->log(string("EventInterpreter: Found handler '") + plugin->getName() + "' calling...");
+ Logger::getInstance()->log(std::string("EventInterpreter: Found handler '") + plugin->getName() + "' calling...");
plugin->handleEvent(*toProcess, **ipSubscription);
called = true;
Logger::getInstance()->log("EventInterpreter: called.");
}
if(!called) {
- Logger::getInstance()->log(string("EventInterpreter: Could not find handler '") + (*ipSubscription)->getHandlerName(), lsInfo);
+ Logger::getInstance()->log(std::string("EventInterpreter: Could not find handler '") + (*ipSubscription)->getHandlerName(), lsInfo);
}
} else {
- Logger::getInstance()->log(string("EventInterpreter: No match on subscription '") + (*ipSubscription)->getID() + "'");
+ Logger::getInstance()->log(std::string("EventInterpreter: No match on subscription '") + (*ipSubscription)->getID() + "'");
}
}
m_EventsProcessed++;
- Logger::getInstance()->log(string("EventInterpreter: Done processing event '") + toProcess->getName() + "'", lsInfo);
+ Logger::getInstance()->log(std::string("EventInterpreter: Done processing event '") + toProcess->getName() + "'", lsInfo);
}
}
}
} // execute
- EventInterpreterPlugin* EventInterpreter::getPluginByName(const string& _name) {
+ EventInterpreterPlugin* EventInterpreter::getPluginByName(const std::string& _name) {
for(vector<EventInterpreterPlugin*>::iterator ipPlugin = m_Plugins.begin(), e = m_Plugins.end();
ipPlugin != e; ++ipPlugin)
{
@@ -265,7 +265,7 @@ namespace dss {
m_Subscriptions.push_back(_subscription);
} // subscribe
- void EventInterpreter::unsubscribe(const string& _subscriptionID) {
+ void EventInterpreter::unsubscribe(const std::string& _subscriptionID) {
for(vector< boost::shared_ptr<EventSubscription> >::iterator ipSubscription = m_Subscriptions.begin(), e = m_Subscriptions.end();
ipSubscription != e; ++ipSubscription)
{
@@ -298,9 +298,9 @@ namespace dss {
return result;
} // uniqueSubscriptionID
- void EventInterpreter::loadFromXML(const string& _fileName) {
+ void EventInterpreter::loadFromXML(const std::string& _fileName) {
const int apartmentConfigVersion = 1;
- Logger::getInstance()->log(string("EventInterpreter: Loading subscriptions from '") + _fileName + "'");
+ Logger::getInstance()->log(std::string("EventInterpreter: Loading subscriptions from '") + _fileName + "'");
if(boost::filesystem::exists(_fileName)) {
XMLDocumentFileReader reader(_fileName);
@@ -310,7 +310,7 @@ namespace dss {
if(strToIntDef(rootNode.getAttributes()["version"], -1) == apartmentConfigVersion) {
XMLNodeList nodes = rootNode.getChildren();
for(XMLNodeList::iterator iNode = nodes.begin(); iNode != nodes.end(); ++iNode) {
- string nodeName = iNode->getName();
+ std::string nodeName = iNode->getName();
if(nodeName == "subscription") {
loadSubscription(*iNode);
}
@@ -321,7 +321,7 @@ namespace dss {
} // loadFromXML
void EventInterpreter::loadFilter(XMLNode& _node, EventSubscription& _subscription) {
- string matchType = _node.getAttributes()["match"];
+ std::string matchType = _node.getAttributes()["match"];
if(matchType == "all") {
_subscription.setFilterOption(EventSubscription::foMatchAll);
} else if(matchType == "none") {
@@ -329,15 +329,15 @@ namespace dss {
} else if(matchType == "one") {
_subscription.setFilterOption(EventSubscription::foMatchOne);
} else {
- Logger::getInstance()->log(string("EventInterpreter::loadFilter: Could not determine the match-type (\"") + matchType + "\", reverting to 'all'", lsError);
+ Logger::getInstance()->log(std::string("EventInterpreter::loadFilter: Could not determine the match-type (\"") + matchType + "\", reverting to 'all'", lsError);
}
XMLNodeList nodes = _node.getChildren();
for(XMLNodeList::iterator iNode = nodes.begin(); iNode != nodes.end(); ++iNode) {
- string nodeName = iNode->getName();
+ std::string nodeName = iNode->getName();
if(nodeName == "property-filter") {
EventPropertyFilter* filter = NULL;
- string filterType = iNode->getAttributes()["type"];
- string propertyName = iNode->getAttributes()["property"];
+ std::string filterType = iNode->getAttributes()["type"];
+ std::string propertyName = iNode->getAttributes()["property"];
if(filterType.empty() || propertyName.empty()) {
Logger::getInstance()->log("EventInterpreter::loadFilter: Missing type and/or property-name", lsFatal);
} else {
@@ -346,7 +346,7 @@ namespace dss {
} else if(filterType == "missing") {
filter = new EventPropertyMissingFilter(propertyName);
} else if(filterType == "matches") {
- string matchValue = iNode->getAttributes()["value"];
+ std::string matchValue = iNode->getAttributes()["value"];
filter = new EventPropertyMatchFilter(propertyName, matchValue);
} else {
Logger::getInstance()->log("Unknown property-filter type", lsError);
@@ -360,8 +360,8 @@ namespace dss {
} // loadFilter
void EventInterpreter::loadSubscription(XMLNode& _node) {
- string evtName = _node.getAttributes()["event-name"];
- string handlerName = _node.getAttributes()["handler-name"];
+ std::string evtName = _node.getAttributes()["event-name"];
+ std::string handlerName = _node.getAttributes()["handler-name"];
if(evtName.size() == 0) {
Logger::getInstance()->log("EventInterpreter::loadSubscription: empty event-name, skipping this subscription", lsWarning);
@@ -378,7 +378,7 @@ namespace dss {
EventInterpreterPlugin* plugin = getPluginByName(handlerName);
if(plugin == NULL) {
- Logger::getInstance()->log(string("EventInterpreter::loadSubscription: could not find plugin for handler-name '") + handlerName + "'", lsWarning);
+ Logger::getInstance()->log(std::string("EventInterpreter::loadSubscription: could not find plugin for handler-name '") + handlerName + "'", lsWarning);
Logger::getInstance()->log( "EventInterpreter::loadSubscription: Still generating a subscription but w/o inner parameter", lsWarning);
} else {
opts.reset(plugin->createOptionsFromXML(_node.getChildren()));
@@ -419,29 +419,29 @@ namespace dss {
if(_event->hasPropertySet(EventPropertyTime)) {
DateTime when;
bool validDate = false;
- string timeStr = _event->getPropertyByName(EventPropertyTime);
+ std::string timeStr = _event->getPropertyByName(EventPropertyTime);
if(timeStr.size() >= 2) {
// relative time
if(timeStr[0] == '+') {
- std::string timeOffset = timeStr.substr(1, string::npos);
+ std::string timeOffset = timeStr.substr(1, std::string::npos);
int offset = strToIntDef(timeOffset, -1);
if(offset >= 0) {
when = when.addSeconds(offset);
validDate = true;
} else {
- Logger::getInstance()->log(string("EventQueue::scheduleFromEvent: Could not parse offset or offset is below zero: '") + timeOffset + "'", lsError);
+ Logger::getInstance()->log(std::string("EventQueue::scheduleFromEvent: Could not parse offset or offset is below zero: '") + timeOffset + "'", lsError);
}
} else {
try {
when = DateTime::fromISO(timeStr);
validDate = true;
} catch(std::runtime_error& e) {
- Logger::getInstance()->log(string("EventQueue::scheduleFromEvent: Invalid time specified '") + timeStr + "' error: " + e.what(), lsError);
+ Logger::getInstance()->log(std::string("EventQueue::scheduleFromEvent: Invalid time specified '") + timeStr + "' error: " + e.what(), lsError);
}
}
}
if(validDate) {
- Logger::getInstance()->log(string("EventQueue::scheduleFromEvent: Event has a valid time, rescheduling at ") + (string)when, lsInfo);
+ Logger::getInstance()->log(std::string("EventQueue::scheduleFromEvent: Event has a valid time, rescheduling at ") + (std::string)when, lsInfo);
result.reset(new StaticSchedule(when));
} else {
Logger::getInstance()->log("EventQueue::scheduleFromEvent: Dropping event with invalid time", lsError);
@@ -449,14 +449,14 @@ namespace dss {
} else if(_event->hasPropertySet(EventPropertyICalStartTime) && _event->hasPropertySet(EventPropertyICalRRule)) {
std::string timeStr = _event->getPropertyByName(EventPropertyICalStartTime);
std::string rRuleStr = _event->getPropertyByName(EventPropertyICalRRule);
- Logger::getInstance()->log(string("EventQueue::schedleFromEvent: Event has a ICalRule rescheduling at ") + timeStr + " with Rule " + rRuleStr, lsInfo);
+ Logger::getInstance()->log(std::string("EventQueue::schedleFromEvent: Event has a ICalRule rescheduling at ") + timeStr + " with Rule " + rRuleStr, lsInfo);
result.reset(new ICalSchedule(rRuleStr, timeStr));
}
return result;
} // scheduleFromEvent
void EventQueue::pushEvent(boost::shared_ptr<Event> _event) {
- Logger::getInstance()->log(string("EventQueue: New event '") + _event->getName() + "' in queue...", lsInfo);
+ Logger::getInstance()->log(std::string("EventQueue: New event '") + _event->getName() + "' in queue...", lsInfo);
boost::shared_ptr<Schedule> schedule = scheduleFromEvent(_event);
if(schedule != NULL) {
ScheduledEvent* scheduledEvent = new ScheduledEvent(_event, schedule);
@@ -537,8 +537,8 @@ namespace dss {
{
DateTime next = ipSchedEvt->getSchedule().getNextOccurence(now);
if(DebugEventRunner) {
- Logger::getInstance()->log(string("next: ") + (string)next);
- Logger::getInstance()->log(string("result: ") + (string)result);
+ Logger::getInstance()->log(std::string("next: ") + (std::string)next);
+ Logger::getInstance()->log(std::string("result: ") + (std::string)result);
}
if(next == DateTime::NullDate) {
Logger::getInstance()->log("EventRunner: Removing event");
@@ -547,7 +547,7 @@ namespace dss {
}
result = std::min(result, next);
if(DebugEventRunner) {
- Logger::getInstance()->log(string("chosen: ") + (string)result);
+ Logger::getInstance()->log(std::string("chosen: ") + (std::string)result);
}
++ipSchedEvt;
}
@@ -625,7 +625,7 @@ namespace dss {
//================================================== EventSubscription
- EventSubscription::EventSubscription(const string& _eventName, const string& _handlerName, EventInterpreter& _interpreter, boost::shared_ptr<SubscriptionOptions> _options)
+ EventSubscription::EventSubscription(const std::string& _eventName, const std::string& _handlerName, EventInterpreter& _interpreter, boost::shared_ptr<SubscriptionOptions> _options)
: m_EventName(_eventName),
m_HandlerName(_handlerName),
m_SubscriptionOptions(_options)
@@ -672,25 +672,25 @@ namespace dss {
SubscriptionOptions::~SubscriptionOptions()
{ } // dtor
- const string& SubscriptionOptions::getParameter(const string& _name) const {
+ const std::string& SubscriptionOptions::getParameter(const std::string& _name) const {
return m_Parameters.get(_name);
} // getParameter
- bool SubscriptionOptions::hasParameter(const string& _name) const {
+ bool SubscriptionOptions::hasParameter(const std::string& _name) const {
return m_Parameters.has(_name);
} // hasParameter
- void SubscriptionOptions::setParameter(const string& _name, const string& _value) {
+ void SubscriptionOptions::setParameter(const std::string& _name, const std::string& _value) {
m_Parameters.set(_name, _value);
} // setParameter
void SubscriptionOptions::loadParameterFromXML(XMLNode& _node) {
XMLNodeList nodes = _node.getChildren();
for(XMLNodeList::iterator iNode = nodes.begin(); iNode != nodes.end(); ++iNode) {
- string nodeName = iNode->getName();
+ std::string nodeName = iNode->getName();
if(nodeName == "parameter") {
- string value;
- string name;
+ std::string value;
+ std::string name;
if(!iNode->getChildren().empty()) {
value = iNode->getChildren()[0].getContent();
}
@@ -705,7 +705,7 @@ namespace dss {
//================================================== EventInterpreterPlugin
- EventInterpreterPlugin::EventInterpreterPlugin(const string& _name, EventInterpreter* _interpreter)
+ EventInterpreterPlugin::EventInterpreterPlugin(const std::string& _name, EventInterpreter* _interpreter)
: m_Name(_name),
m_pInterpreter(_interpreter)
{ } // ctor
@@ -716,7 +716,7 @@ namespace dss {
//================================================== EventPropertyFilter
- EventPropertyFilter::EventPropertyFilter(const string& _propertyName)
+ EventPropertyFilter::EventPropertyFilter(const std::string& _propertyName)
: m_PropertyName(_propertyName)
{ } // ctor
@@ -733,7 +733,7 @@ namespace dss {
//================================================== EventPropertyExistsFilter
- EventPropertyExistsFilter::EventPropertyExistsFilter(const string& _propertyName)
+ EventPropertyExistsFilter::EventPropertyExistsFilter(const std::string& _propertyName)
: EventPropertyFilter(_propertyName)
{ } // ctor
@@ -744,7 +744,7 @@ namespace dss {
//================================================= EventPropertyMissingFilter
- EventPropertyMissingFilter::EventPropertyMissingFilter(const string& _propertyName)
+ EventPropertyMissingFilter::EventPropertyMissingFilter(const std::string& _propertyName)
: EventPropertyFilter(_propertyName)
{ } // ctor
diff --git a/core/event.h b/core/event.h
index b34308b..77825a1 100644
--- a/core/event.h
+++ b/core/event.h
@@ -35,9 +35,6 @@
#include <boost/shared_ptr.hpp>
#include <boost/ptr_container/ptr_vector.hpp>
-using std::string;
-using std::queue;
-
namespace dss {
//================================================== Forward declarations
@@ -58,12 +55,12 @@ namespace dss {
class Event {
private:
- string m_Name;
- string m_Location;
+ std::string m_Name;
+ std::string m_Location;
bool m_LocationSet;
- string m_Context;
+ std::string m_Context;
bool m_ContextSet;
- string m_Time;
+ std::string m_Time;
bool m_TimeSet;
EventRaiseLocation m_RaiseLocation;
Zone* m_RaisedAtZone;
@@ -73,23 +70,23 @@ namespace dss {
private:
void reset();
public:
- Event(const string& _name, Zone* _context);
- Event(const string& _name, DeviceReference* _ref);
- Event(const string& _name);
+ Event(const std::string& _name, Zone* _context);
+ Event(const std::string& _name, DeviceReference* _ref);
+ Event(const std::string& _name);
Event();
~Event();
- const string& getName() const { return m_Name; }
+ const std::string& getName() const { return m_Name; }
- const string& getPropertyByName(const string& _name) const;
- bool hasPropertySet(const string& _name) const;
- void unsetProperty(const string& _name);
- bool setProperty(const string& _name, const string& _value);
+ const std::string& getPropertyByName(const std::string& _name) const;
+ bool hasPropertySet(const std::string& _name) const;
+ void unsetProperty(const std::string& _name);
+ bool setProperty(const std::string& _name, const std::string& _value);
- void setLocation(const string& _value) { m_Location = _value; m_LocationSet = true; }
- void setContext(const string& _value) { m_Context = _value; m_ContextSet = true; }
- void setTime(const string& _value) { m_Time = _value; m_TimeSet = true; }
+ void setLocation(const std::string& _value) { m_Location = _value; m_LocationSet = true; }
+ void setContext(const std::string& _value) { m_Context = _value; m_ContextSet = true; }
+ void setTime(const std::string& _value) { m_Time = _value; m_TimeSet = true; }
const Zone& getRaisedAtZone() const;
const DeviceReference& getRaisedAtDevice() const { return *m_RaisedAtDevice; }
@@ -108,9 +105,9 @@ namespace dss {
SubscriptionOptions();
virtual ~SubscriptionOptions();
- const string& getParameter(const string& _name) const;
- void setParameter(const string& _name, const string& _value);
- bool hasParameter(const string& _name) const;
+ const std::string& getParameter(const std::string& _name) const;
+ void setParameter(const std::string& _name, const std::string& _value);
+ bool hasParameter(const std::string& _name) const;
void loadParameterFromXML(XMLNode& _node);
@@ -122,12 +119,12 @@ namespace dss {
class EventPropertyFilter {
private:
- string m_PropertyName;
+ std::string m_PropertyName;
public:
- EventPropertyFilter(const string& _propertyName);
+ EventPropertyFilter(const std::string& _propertyName);
virtual ~EventPropertyFilter() {}
- const string& getPropertyName() const { return m_PropertyName; }
+ const std::string& getPropertyName() const { return m_PropertyName; }
virtual bool matches(const Event& _event) = 0;
}; // EventPropertyFilter
@@ -137,9 +134,9 @@ namespace dss {
class EventPropertyMatchFilter : public EventPropertyFilter {
private:
- string m_Value;
+ std::string m_Value;
public:
- EventPropertyMatchFilter(const string& _propertyName, const string& _value)
+ EventPropertyMatchFilter(const std::string& _propertyName, const std::string& _value)
: EventPropertyFilter(_propertyName), m_Value(_value) {}
virtual ~EventPropertyMatchFilter() {}
@@ -152,7 +149,7 @@ namespace dss {
class EventPropertyExistsFilter : public EventPropertyFilter {
public:
- EventPropertyExistsFilter(const string& _propertyName);
+ EventPropertyExistsFilter(const std::string& _propertyName);
virtual ~EventPropertyExistsFilter() {};
virtual bool matches(const Event& _event);
@@ -163,7 +160,7 @@ namespace dss {
class EventPropertyMissingFilter : public EventPropertyFilter {
public:
- EventPropertyMissingFilter(const string& _propertyName);
+ EventPropertyMissingFilter(const std::string& _propertyName);
virtual ~EventPropertyMissingFilter() {};
virtual bool matches(const Event& _event);
@@ -180,24 +177,24 @@ namespace dss {
foMatchOne
} EventPropertyFilterOption;
private:
- string m_EventName;
- string m_HandlerName;
- string m_ID;
+ std::string m_EventName;
+ std::string m_HandlerName;
+ std::string m_ID;
boost::shared_ptr<SubscriptionOptions> m_SubscriptionOptions;
boost::ptr_vector<EventPropertyFilter> m_Filter;
EventPropertyFilterOption m_FilterOption;
protected:
void initialize();
public:
- EventSubscription(const string& _eventName, const string& _handlerName, EventInterpreter& _interpreter, boost::shared_ptr<SubscriptionOptions> _options);
+ EventSubscription(const std::string& _eventName, const std::string& _handlerName, EventInterpreter& _interpreter, boost::shared_ptr<SubscriptionOptions> _options);
~EventSubscription();
- void setEventName(const string& _value) { m_EventName = _value; }
- const string& getEventName() const { return m_EventName; }
- void setHandlerName(const string& _value) { m_HandlerName = _value; }
- const string& getHandlerName() const { return m_HandlerName; }
- const string& getID() const { return m_ID; }
+ void setEventName(const std::string& _value) { m_EventName = _value; }
+ const std::string& getEventName() const { return m_EventName; }
+ void setHandlerName(const std::string& _value) { m_HandlerName = _value; }
+ const std::string& getHandlerName() const { return m_HandlerName; }
+ const std::string& getID() const { return m_ID; }
SubscriptionOptions& getOptions() { return *m_SubscriptionOptions.get(); }
const SubscriptionOptions& getOptions() const { return *m_SubscriptionOptions.get(); }
@@ -213,15 +210,15 @@ namespace dss {
class EventInterpreterPlugin {
private:
- string m_Name;
+ std::string m_Name;
EventInterpreter* const m_pInterpreter;
protected:
EventInterpreter& getEventInterpreter() { return *m_pInterpreter; }
public:
- EventInterpreterPlugin(const string& _name, EventInterpreter* _interpreter);
+ EventInterpreterPlugin(const std::string& _name, EventInterpreter* _interpreter);
virtual ~EventInterpreterPlugin() {}
- const string& getName() const { return m_Name; }
+ const std::string& getName() const { return m_Name; }
virtual void handleEvent(Event& _event, const EventSubscription& _subscription) = 0;
virtual SubscriptionOptions* createOptionsFromXML(XMLNodeList& _nodes);
@@ -232,7 +229,7 @@ namespace dss {
class EventQueue {
private:
- queue< boost::shared_ptr<Event> > m_EventQueue;
+ std::queue< boost::shared_ptr<Event> > m_EventQueue;
SyncEvent m_EntryInQueueEvt;
Mutex m_QueueMutex;
@@ -307,9 +304,9 @@ namespace dss {
EventInterpreterPlugin* getPluginByName(const std::string& _name);
void subscribe(boost::shared_ptr<EventSubscription> _subscription);
- void unsubscribe(const string& _subscriptionID);
+ void unsubscribe(const std::string& _subscriptionID);
- void loadFromXML(const string& _fileName);
+ void loadFromXML(const std::string& _fileName);
std::string uniqueSubscriptionID(const std::string& _proposal);
int getEventsProcessed() const { return m_EventsProcessed; }
@@ -330,7 +327,7 @@ namespace dss {
private:
boost::shared_ptr<Event> m_Event;
boost::shared_ptr<Schedule> m_Schedule;
- string m_Name;
+ std::string m_Name;
public:
ScheduledEvent(boost::shared_ptr<Event> _pEvt, boost::shared_ptr<Schedule> _pSchedule)
: m_Event(_pEvt), m_Schedule(_pSchedule) {};
@@ -340,9 +337,9 @@ namespace dss {
/** Returns the associated Schedule */
Schedule& getSchedule() const { return *m_Schedule; }
/** Returns the name of this ScheduledEvent */
- const string& getName() const { return m_Name; }
+ const std::string& getName() const { return m_Name; }
/** Sets the name of this ScheduledEvent */
- void setName(const string& _value) { m_Name = _value; }
+ void setName(const std::string& _value) { m_Name = _value; }
}; // ScheduledEvent
diff --git a/core/eventinterpreterplugins.cpp b/core/eventinterpreterplugins.cpp
index c6d1773..b7f83f7 100644
--- a/core/eventinterpreterplugins.cpp
+++ b/core/eventinterpreterplugins.cpp
@@ -51,7 +51,7 @@ namespace dss {
void EventInterpreterPluginRaiseEvent::handleEvent(Event& _event, const EventSubscription& _subscription) {
boost::shared_ptr<Event> newEvent(new Event(_subscription.getOptions().getParameter("event_name")));
if(_subscription.getOptions().hasParameter("time")) {
- string timeParam = _subscription.getOptions().getParameter("time");
+ std::string timeParam = _subscription.getOptions().getParameter("time");
if(!timeParam.empty()) {
Logger::getInstance()->log("RaiseEvent: Event has time");
newEvent->setTime(timeParam);
@@ -59,7 +59,7 @@ namespace dss {
}
applyOptionsWithSuffix(_subscription.getOptions(), "_default", newEvent);
if(_subscription.getOptions().hasParameter(EventPropertyLocation)) {
- string location = _subscription.getOptions().getParameter(EventPropertyLocation);
+ std::string location = _subscription.getOptions().getParameter(EventPropertyLocation);
if(!location.empty()) {
Logger::getInstance()->log("RaiseEvent: Event has location");
newEvent->setLocation(location);
@@ -72,7 +72,7 @@ namespace dss {
void EventInterpreterPluginRaiseEvent::applyOptionsWithSuffix(const SubscriptionOptions& _options, const std::string& _suffix, boost::shared_ptr<Event> _event) {
const HashMapConstStringString sourceMap = _options.getParameters().getContainer();
- typedef const std::pair<const std::string, string> tItem;
+ typedef const std::pair<const std::string, std::string> tItem;
foreach(tItem kv, sourceMap) {
if(endsWith(kv.first, _suffix)) {
std::string propName = kv.first.substr(0, kv.first.length() - _suffix.length());
@@ -90,7 +90,7 @@ namespace dss {
void EventInterpreterPluginJavascript::handleEvent(Event& _event, const EventSubscription& _subscription) {
if(_subscription.getOptions().hasParameter("filename")) {
- string scriptName = _subscription.getOptions().getParameter("filename");
+ std::string scriptName = _subscription.getOptions().getParameter("filename");
if(boost::filesystem::exists(scriptName)) {
if(!m_Environment.isInitialized()) {
@@ -133,11 +133,11 @@ namespace dss {
Logger::getInstance()->log("EventInterpreterPluginJavascript::handleEvent: keeping script " + scriptName + " in memory", lsInfo);
}
} catch(ScriptException& e) {
- Logger::getInstance()->log(string("EventInterpreterPluginJavascript::handleEvent: Caught event while running/parsing script '")
+ Logger::getInstance()->log(std::string("EventInterpreterPluginJavascript::handleEvent: Caught event while running/parsing script '")
+ scriptName + "'. Message: " + e.what(), lsError);
}
} else {
- Logger::getInstance()->log(string("EventInterpreterPluginJavascript::handleEvent: Could not find script: '") + scriptName + "'", lsError);
+ Logger::getInstance()->log(std::string("EventInterpreterPluginJavascript::handleEvent: Could not find script: '") + scriptName + "'", lsError);
}
} else {
throw std::runtime_error("EventInterpreteRPluginJavascript::handleEvent: missing argument filename");
@@ -158,8 +158,8 @@ namespace dss {
DS485Command m_Command;
int m_ParameterIndex;
int m_SceneIndex;
- string m_To;
- string m_Context;
+ std::string m_To;
+ std::string m_Context;
public:
SubscriptionOptionsDS485()
: m_ParameterIndex(-1), m_SceneIndex(-1)
@@ -171,17 +171,17 @@ namespace dss {
void setParameterIndex(const int _value) { m_ParameterIndex = _value; }
int getParameterIndex() const { return m_ParameterIndex; }
- void setTo(const string& _value) { m_To = _value; }
- const string& GetTo() const { return m_To; }
+ void setTo(const std::string& _value) { m_To = _value; }
+ const std::string& GetTo() const { return m_To; }
- void setContext(const string& _value) { m_Context = _value; }
- const string& getContext() const { return m_Context; }
+ void setContext(const std::string& _value) { m_Context = _value; }
+ const std::string& getContext() const { return m_Context; }
void setSceneIndex(const int _value) { m_SceneIndex = _value; }
int getSceneIndex() const { return m_SceneIndex; }
};
- string EventInterpreterPluginDS485::getParameter(XMLNodeList& _nodes, const string& _parameterName) {
+ std::string EventInterpreterPluginDS485::getParameter(XMLNodeList& _nodes, const std::string& _parameterName) {
for(XMLNodeList::iterator iNode = _nodes.begin(), e = _nodes.end();
iNode != e; ++iNode)
{
@@ -203,8 +203,8 @@ namespace dss {
iNode != e; ++iNode)
{
if(iNode->getName() == "send") {
- string typeName = iNode->getAttributes()["type"];
- string paramName = "";
+ std::string typeName = iNode->getAttributes()["type"];
+ std::string paramName = "";
bool needParam = false;
if(typeName == "turnOn") {
result->setCommand(cmdTurnOn);
@@ -245,15 +245,15 @@ namespace dss {
result->setCommand(cmdDecreaseParam);
paramName = "parameter";
} else {
- Logger::getInstance()->log(string("unknown command: ") + typeName);
+ Logger::getInstance()->log(std::string("unknown command: ") + typeName);
delete result;
return NULL;
}
if(!paramName.empty()) {
- string paramValue = getParameter(iNode->getChildren(), paramName);
+ std::string paramValue = getParameter(iNode->getChildren(), paramName);
if(paramValue.size() == 0 && needParam) {
- Logger::getInstance()->log(string("bus_handler: Needed parameter '") + paramName + "' not found in subscription for type '" + typeName + "'", lsError);
+ Logger::getInstance()->log(std::string("bus_handler: Needed parameter '") + paramName + "' not found in subscription for type '" + typeName + "'", lsError);
}
if(paramName == "parameter") {
diff --git a/core/eventinterpreterplugins.h b/core/eventinterpreterplugins.h
index 99c9088..c31c9b1 100644
--- a/core/eventinterpreterplugins.h
+++ b/core/eventinterpreterplugins.h
@@ -56,7 +56,7 @@ namespace dss {
private:
DS485Interface* m_pInterface;
Apartment& m_Apartment;
- string getParameter(XMLNodeList& _nodes, const string& _parameterName);
+ std::string getParameter(XMLNodeList& _nodes, const std::string& _parameterName);
public:
EventInterpreterPluginDS485(Apartment& _apartment, DS485Interface* _pInterface, EventInterpreter* _pInterpreter);
diff --git a/core/model.cpp b/core/model.cpp
index 4f3f442..0bc3a00 100644
--- a/core/model.cpp
+++ b/core/model.cpp
@@ -82,7 +82,7 @@ namespace dss {
if(m_pApartment->getPropertyNode() != NULL) {
m_pPropertyNode = m_pApartment->getPropertyNode()->createProperty("zones/zone0/" + m_DSID.toString());
// m_pPropertyNode->createProperty("name")->linkToProxy(PropertyProxyMemberFunction<Device, std::string>(*this, &Device::getName, &Device::setName));
- m_pPropertyNode->createProperty("name")->linkToProxy(PropertyProxyReference<string>(m_Name));
+ m_pPropertyNode->createProperty("name")->linkToProxy(PropertyProxyReference<std::string>(m_Name));
m_pPropertyNode->createProperty("ModulatorID")->linkToProxy(PropertyProxyReference<int>(m_ModulatorID, false));
m_pPropertyNode->createProperty("ZoneID")->linkToProxy(PropertyProxyReference<int>(m_ZoneID, false));
if(m_pPropertyNode->getProperty("interrupt/mode") == NULL) {
@@ -577,7 +577,7 @@ namespace dss {
DeviceReference Set::getByBusID(const devid_t _id) const {
Set resultSet = getSubset(ByIDSelector(_id));
if(resultSet.length() == 0) {
- throw ItemNotFoundException(string("with busid ") + intToString(_id));
+ throw ItemNotFoundException(std::string("with busid ") + intToString(_id));
}
return resultSet.m_ContainedDevices.front();
} // getByBusID
@@ -848,7 +848,7 @@ namespace dss {
std::vector<int> groupIdperDevices = interface.getGroupsOfDevice(modulatorID, devID);
vector<int> groupIDsPerDevice = interface.getGroupsOfDevice(modulatorID,devID);
foreach(int groupID, groupIDsPerDevice) {
- log(string("scanModulator: adding device ") + intToString(devID) + " to group " + intToString(groupID));
+ log(std::string("scanModulator: adding device ") + intToString(devID) + " to group " + intToString(groupID));
dev.addToGroup(groupID);
}
@@ -901,7 +901,7 @@ namespace dss {
onGroupCallScene(zoneID, groupID, lastCalledScene);
}
} catch(DS485ApiError& error) {
- log(string("scanModulator: Error getting last called scene '") + error.what() + "'", lsError);
+ log(std::string("scanModulator: Error getting last called scene '") + error.what() + "'", lsError);
return false;
}
}
@@ -1101,7 +1101,7 @@ namespace dss {
// load devices/modulators/etc. from a config-file
std::string configFileName = DSS::getInstance()->getPropertySystem().getStringValue(getConfigPropertyBasePath() + "configfile");
if(!boost::filesystem::exists(configFileName)) {
- log(string("Apartment::execute: Could not open config-file for apartment: '") + configFileName + "'", lsWarning);
+ log(std::string("Apartment::execute: Could not open config-file for apartment: '") + configFileName + "'", lsWarning);
} else {
readConfigurationFromXML(configFileName);
}
@@ -1722,12 +1722,12 @@ namespace dss {
if(modeNode == NULL) {
return;
}
- string mode = modeNode->getStringValue();
+ std::string mode = modeNode->getStringValue();
if(mode == "ignore") {
log("ignoring interrupt");
} else if(mode == "raise_event") {
log("raising interrupt as event");
- string eventName = "dslink_interrupt";
+ std::string eventName = "dslink_interrupt";
PropertyNodePtr eventNameNode = deviceNode->getProperty("interrupt/event/name");
if(eventNameNode == NULL) {
log("no node called 'interrupt/event' found, assuming name is 'dslink_interrupt'");
@@ -1739,7 +1739,7 @@ namespace dss {
DeviceReference devRef(device, *this);
boost::shared_ptr<Event> evt(new Event(eventName, &devRef));
evt->setProperty("device", device.getDSID().toString());
- string priorityString = "unknown";
+ std::string priorityString = "unknown";
if(_priority == 0) {
priorityString = "normal";
} else if(_priority == 1) {
diff --git a/core/setbuilder.cpp b/core/setbuilder.cpp
index fb4f09d..713d050 100644
--- a/core/setbuilder.cpp
+++ b/core/setbuilder.cpp
@@ -75,7 +75,7 @@ namespace dss {
throw std::runtime_error("String should be enclosed by \"'\"");
} // readString
- Set SetBuilder::restrictByFunction(const string& _functionName, unsigned int& _index, const Set& _set, const Zone& _zone) {
+ Set SetBuilder::restrictByFunction(const std::string& _functionName, unsigned int& _index, const Set& _set, const Zone& _zone) {
if(_index >= m_SetDescription.size()) {
throw std::range_error("_index is out of bounds");
}
@@ -186,7 +186,7 @@ namespace dss {
} else if(pos == m_SetDescription.size() - 1) {
end = true;
}
- string entry = m_SetDescription.substr(_index, pos + 1 - _index );
+ std::string entry = m_SetDescription.substr(_index, pos + 1 - _index );
if(entry == ".") {
_index = pos + 1;
Set newRoot = m_Apartment.getDevices();
diff --git a/core/setbuilder.h b/core/setbuilder.h
index 7996c82..b686705 100644
--- a/core/setbuilder.h
+++ b/core/setbuilder.h
@@ -27,8 +27,6 @@
#include <string>
-using std::string;
-
namespace dss {
class SetBuilder {
@@ -36,8 +34,8 @@ namespace dss {
std::string m_SetDescription;
Apartment& m_Apartment;
protected:
- Set restrictBy(const string& _identifier, const Set& _set, const Zone& _zone);
- Set restrictByFunction(const string& _functionName, unsigned int& _index, const Set& _set, const Zone& _zone);
+ Set restrictBy(const std::string& _identifier, const Set& _set, const Zone& _zone);
+ Set restrictByFunction(const std::string& _functionName, unsigned int& _index, const Set& _set, const Zone& _zone);
void skipWhitespace(unsigned int& _index);
std::string readParameter(unsigned int& _index);
int readInt(unsigned int& _index);
@@ -47,7 +45,7 @@ namespace dss {
public:
SetBuilder(Apartment& _apartment);
- Set buildSet(const string& _setDescription, const Zone* _context);
+ Set buildSet(const std::string& _setDescription, const Zone* _context);
}; // SetBuilder
} // namespace dss
diff --git a/core/sim/dsid_js.cpp b/core/sim/dsid_js.cpp
index 309b8fa..b003f23 100644
--- a/core/sim/dsid_js.cpp
+++ b/core/sim/dsid_js.cpp
@@ -213,7 +213,7 @@ namespace dss {
return 0;
} // getFunctionID
- virtual void setConfigParameter(const string& _name, const string& _value) {
+ virtual void setConfigParameter(const std::string& _name, const std::string& _value) {
if(m_pSelf != NULL) {
try {
ScriptFunctionParameterList param(*m_pContext);
@@ -226,7 +226,7 @@ namespace dss {
}
} // setConfigParameter
- virtual string getConfigParameter(const string& _name) const {
+ virtual std::string getConfigParameter(const std::string& _name) const {
if(m_pSelf != NULL) {
try {
ScriptFunctionParameterList param(*m_pContext);
diff --git a/core/webserver.cpp b/core/webserver.cpp
index 5324c5e..d60a973 100644
--- a/core/webserver.cpp
+++ b/core/webserver.cpp
@@ -94,7 +94,7 @@ namespace dss {
} catch(std::runtime_error& e) {
delete plugin;
plugin = NULL;
- log(string("Caught exception while loading: ") + e.what(), lsError);
+ log(std::string("Caught exception while loading: ") + e.what(), lsError);
return;
}
m_Plugins.push_back(plugin);
@@ -326,14 +326,14 @@ namespace dss {
RestfulClass& clsProp = api.addClass("property")
.withInstanceParameter("path", "string", true);
clsProp.addMethod("getString")
- .withDocumentation("Returns the string value of the property", "This will fail if the property is not of type 'string'.");
+ .withDocumentation("Returns the std::string value of the property", "This will fail if the property is not of type 'string'.");
clsProp.addMethod("getInteger")
.withDocumentation("Returns the integer value of the property", "This will fail if the property is not of type 'integer'.");
clsProp.addMethod("getBoolean")
.withDocumentation("Returns the boolean value of the property", "This will fail if the property is not of type 'boolean'.");
clsProp.addMethod("setString")
.withParameter("value", "string", true)
- .withDocumentation("Sets the string value of the property", "This will fail if the property is not of type 'string'.");
+ .withDocumentation("Sets the std::string value of the property", "This will fail if the property is not of type 'string'.");
clsProp.addMethod("setInteger")
.withParameter("value", "integer", true)
.withDocumentation("Sets the integer value of the property", "This will fail if the property is not of type 'integer'.");
@@ -357,7 +357,7 @@ namespace dss {
RestfulClass& clsSystem = api.addClass("system");
clsSystem.addMethod("version")
.withDocumentation("Returns the dss version",
- "This method returns the version string of the dss");
+ "This method returns the version std::string of the dss");
RestfulClass& clsSet = api.addClass("set")
.withInstanceParameter("self", "string", false);
@@ -416,11 +416,11 @@ namespace dss {
} // setupAPI
void WebServer::doStart() {
- string ports = DSS::getInstance()->getPropertySystem().getStringValue(getConfigPropertyBasePath() + "ports");
+ std::string ports = DSS::getInstance()->getPropertySystem().getStringValue(getConfigPropertyBasePath() + "ports");
log("Webserver: Listening on port(s) " + ports);
mg_set_option(m_mgContext, "ports", ports.c_str());
- string aliases = string("/=") + DSS::getInstance()->getPropertySystem().getStringValue(getConfigPropertyBasePath() + "webroot");
+ std::string aliases = std::string("/=") + DSS::getInstance()->getPropertySystem().getStringValue(getConfigPropertyBasePath() + "webroot");
log("Webserver: Configured aliases: " + aliases);
mg_set_option(m_mgContext, "aliases", aliases.c_str());
@@ -451,16 +451,16 @@ namespace dss {
std::ostringstream sstream;
sstream << "HTTP/1.1 " << _code << ' ' << httpCodeToMessage(_code) << "\r\n";
sstream << "Content-Type: " << _contentType << "; charset=utf-8\r\n\r\n";
- string tmp = sstream.str();
+ std::string tmp = sstream.str();
mg_write(_connection, tmp.c_str(), tmp.length());
} // emitHTTPHeader
HashMapConstStringString parseParameter(const char* _params) {
HashMapConstStringString result;
if(_params != NULL) {
- vector<string> paramList = splitString(_params, '&');
- for(vector<string>::iterator iParam = paramList.begin(); iParam != paramList.end(); ++iParam) {
- vector<string> nameValue = splitString(*iParam, '=');
+ vector<std::string> paramList = splitString(_params, '&');
+ for(vector<std::string>::iterator iParam = paramList.begin(); iParam != paramList.end(); ++iParam) {
+ vector<std::string> nameValue = splitString(*iParam, '=');
if(nameValue.size() != 2) {
result[*iParam] = "";
} else {
@@ -471,15 +471,15 @@ namespace dss {
return result;
} // parseParameter
- string ToJSONValue(const int& _value) {
+ std::string ToJSONValue(const int& _value) {
return intToString(_value);
} // toJSONValue(int)
- string ToJSONValue(const double& _value) {
+ std::string ToJSONValue(const double& _value) {
return doubleToString(_value);
} // toJSONValue(double)
- string ToJSONValue(const bool& _value) {
+ std::string ToJSONValue(const bool& _value) {
if(_value) {
return "true";
} else {
@@ -487,15 +487,15 @@ namespace dss {
}
} // toJSONValue(bool)
- string ToJSONValue(const string& _value) {
- return string("\"") + _value + '"';
- } // toJSONValue(const string&)
+ std::string ToJSONValue(const std::string& _value) {
+ return std::string("\"") + _value + '"';
+ } // toJSONValue(const std::string&)
- string ToJSONValue(const char* _value) {
- return ToJSONValue(string(_value));
+ std::string ToJSONValue(const char* _value) {
+ return ToJSONValue(std::string(_value));
} // toJSONValue(const char*)
- string WebServer::ResultToJSON(const bool _ok, const string& _message) {
+ std::string WebServer::ResultToJSON(const bool _ok, const std::string& _message) {
std::ostringstream sstream;
sstream << "{ " << ToJSONValue("ok") << ":" << ToJSONValue(_ok);
if(!_message.empty()) {
@@ -508,7 +508,7 @@ namespace dss {
return sstream.str();
} // resultToJSON
- string JSONOk(const string& _innerResult = "") {
+ std::string JSONOk(const std::string& _innerResult = "") {
std::ostringstream sstream;
sstream << "{ " << ToJSONValue("ok") << ":" << ToJSONValue(true);
if(!_innerResult.empty()) {
@@ -518,7 +518,7 @@ namespace dss {
return sstream.str();
}
- string ToJSONValue(const DeviceReference& _device) {
+ std::string ToJSONValue(const DeviceReference& _device) {
std::ostringstream sstream;
sstream << "{ \"id\": \"" << _device.getDSID().toString() << "\""
<< ", \"isSwitch\": " << ToJSONValue(_device.hasSwitch())
@@ -533,7 +533,7 @@ namespace dss {
return sstream.str();
} // toJSONValue(DeviceReference)
- string ToJSONValue(const Set& _set, const string& _arrayName) {
+ std::string ToJSONValue(const Set& _set, const std::string& _arrayName) {
std::ostringstream sstream;
sstream << ToJSONValue(_arrayName) << ":[";
bool firstDevice = true;
@@ -550,7 +550,7 @@ namespace dss {
return sstream.str();
} // toJSONValue(Set,Name)
- string ToJSONValue(const Group& _group) {
+ std::string ToJSONValue(const Group& _group) {
std::ostringstream sstream;
sstream << "{ " << ToJSONValue("id") << ": " << ToJSONValue(_group.getID()) << ",";
sstream << ToJSONValue("name") << ": " << ToJSONValue(_group.getName()) << ", ";
@@ -570,12 +570,12 @@ namespace dss {
return sstream.str();
} // toJSONValue(Group)
- string ToJSONValue(Zone& _zone, bool _includeDevices = true) {
+ std::string ToJSONValue(Zone& _zone, bool _includeDevices = true) {
std::ostringstream sstream;
sstream << "{ \"id\": " << _zone.getID() << ",";
- string name = _zone.getName();
+ std::string name = _zone.getName();
if(name.size() == 0) {
- name = string("Zone ") + intToString(_zone.getID());
+ name = std::string("Zone ") + intToString(_zone.getID());
}
sstream << ToJSONValue("name") << ": " << ToJSONValue(name) << ", ";
sstream << ToJSONValue("isPresent") << ": " << ToJSONValue(_zone.isPresent());
@@ -604,7 +604,7 @@ namespace dss {
return sstream.str();
} // toJSONValue(Zone)
- string ToJSONValue(Apartment& _apartment) {
+ std::string ToJSONValue(Apartment& _apartment) {
std::ostringstream sstream;
sstream << "{ \"apartment\": { \"zones\": [";
vector<Zone*>& zones = _apartment.getZones();
@@ -645,10 +645,10 @@ namespace dss {
} // getUnassignedDevices
template<class t>
- string ToJSONArray(const vector<t>& _v);
+ std::string ToJSONArray(const vector<t>& _v);
template<>
- string ToJSONArray(const vector<int>& _v) {
+ std::string ToJSONArray(const vector<int>& _v) {
std::ostringstream arr;
arr << "[";
bool first = true;
@@ -667,9 +667,9 @@ namespace dss {
return arr.str();
} // toJSONArray<int>
- string WebServer::callDeviceInterface(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, IDeviceInterface* _interface, Session* _session) {
+ std::string WebServer::callDeviceInterface(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, IDeviceInterface* _interface, Session* _session) {
bool ok = true;
- string errorString;
+ std::string errorString;
assert(_interface != NULL);
if(endsWith(_method, "/turnOn")) {
_interface->turnOn();
@@ -684,7 +684,7 @@ namespace dss {
} else if(endsWith(_method, "/disable")) {
_interface->disable();
} else if(endsWith(_method, "/startDim")) {
- string direction = _parameter["direction"];
+ std::string direction = _parameter["direction"];
if(direction == "up") {
_interface->startDim(true);
} else {
@@ -701,7 +701,7 @@ namespace dss {
_interface->setValue(value);
}
} else if(endsWith(_method, "/callScene")) {
- string sceneStr = _parameter["sceneNr"];
+ std::string sceneStr = _parameter["sceneNr"];
int sceneID = strToIntDef(sceneStr, -1);
if(sceneID != -1) {
_interface->callScene(sceneID);
@@ -710,7 +710,7 @@ namespace dss {
ok = false;
}
} else if(endsWith(_method, "/saveScene")) {
- string sceneStr = _parameter["sceneNr"];
+ std::string sceneStr = _parameter["sceneNr"];
int sceneID = strToIntDef(sceneStr, -1);
if(sceneID != -1) {
_interface->saveScene(sceneID);
@@ -719,7 +719,7 @@ namespace dss {
ok = false;
}
} else if(endsWith(_method, "/undoScene")) {
- string sceneStr = _parameter["sceneNr"];
+ std::string sceneStr = _parameter["sceneNr"];
int sceneID = strToIntDef(sceneStr, -1);
if(sceneID != -1) {
_interface->undoScene(sceneID);
@@ -749,9 +749,9 @@ namespace dss {
|| endsWith(_method, "/getConsumption");
} // isDeviceInterfaceCall
- string WebServer::handleApartmentCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleApartmentCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
bool ok = true;
- string errorMessage;
+ std::string errorMessage;
_handled = true;
if(endsWith(_method, "/getConsumption")) {
int accumulatedConsumption = 0;
@@ -761,8 +761,8 @@ namespace dss {
return "{ " + ToJSONValue("consumption") + ": " + uintToString(accumulatedConsumption) +"}";
} else if(isDeviceInterfaceCall(_method)) {
IDeviceInterface* interface = NULL;
- string groupName = _parameter["groupName"];
- string groupIDString = _parameter["groupID"];
+ std::string groupName = _parameter["groupName"];
+ std::string groupIDString = _parameter["groupID"];
if(!groupName.empty()) {
try {
Group& grp = getDSS().getApartment().getGroup(groupName);
@@ -797,7 +797,7 @@ namespace dss {
return sstream.str();
}
} else {
- string result;
+ std::string result;
if(endsWith(_method, "/getStructure")) {
result = ToJSONValue(getDSS().getApartment());
} else if(endsWith(_method, "/getDevices")) {
@@ -855,12 +855,12 @@ namespace dss {
}
} // handleApartmentCall
- string WebServer::handleZoneCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleZoneCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
bool ok = true;
- string errorMessage;
+ std::string errorMessage;
_handled = true;
- string zoneName = _parameter["name"];
- string zoneIDString = _parameter["id"];
+ std::string zoneName = _parameter["name"];
+ std::string zoneIDString = _parameter["id"];
Zone* pZone = NULL;
if(!zoneIDString.empty()) {
int zoneID = strToIntDef(zoneIDString, -1);
@@ -890,8 +890,8 @@ namespace dss {
}
if(ok) {
Group* pGroup = NULL;
- string groupName = _parameter["groupName"];
- string groupIDString = _parameter["groupID"];
+ std::string groupName = _parameter["groupName"];
+ std::string groupIDString = _parameter["groupID"];
if(!groupName.empty()) {
try {
pGroup = pZone->getGroup(groupName);
@@ -966,12 +966,12 @@ namespace dss {
}
} // handleZoneCall
- string WebServer::handleDeviceCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleDeviceCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
bool ok = true;
- string errorMessage;
+ std::string errorMessage;
_handled = true;
- string deviceName = _parameter["name"];
- string deviceDSIDString = _parameter["dsid"];
+ std::string deviceName = _parameter["name"];
+ std::string deviceDSIDString = _parameter["dsid"];
Device* pDevice = NULL;
if(!deviceDSIDString.empty()) {
dsid_t deviceDSID = dsid_t::fromString(deviceDSIDString);
@@ -1061,9 +1061,9 @@ namespace dss {
}
} // handleDeviceCall
- string WebServer::handleCircuitCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleCircuitCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
_handled = true;
- string idString = _parameter["id"];
+ std::string idString = _parameter["id"];
if(idString.empty()) {
return ResultToJSON(false, "missing parameter id");
}
@@ -1105,7 +1105,7 @@ namespace dss {
} // handleCircuitCall
- string WebServer::handleSetCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleSetCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
_handled = true;
if(endsWith(_method, "/fromApartment")) {
_handled = true;
@@ -1206,9 +1206,9 @@ namespace dss {
return "";
} // handleSetCall
- string WebServer::handlePropertyCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handlePropertyCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
_handled = true;
- string propName = _parameter["path"];
+ std::string propName = _parameter["path"];
if(propName.empty()) {
return ResultToJSON(false, "Need parameter \'path\' for property operations");
}
@@ -1223,7 +1223,7 @@ namespace dss {
sstream << "{ " << ToJSONValue("value") << ": " << ToJSONValue(node->getStringValue()) << "}";
return JSONOk(sstream.str());
} catch(PropertyTypeMismatch& ex) {
- return ResultToJSON(false, string("Error getting property: '") + ex.what() + "'");
+ return ResultToJSON(false, std::string("Error getting property: '") + ex.what() + "'");
}
} else if(endsWith(_method, "/getInteger")) {
if(node == NULL) {
@@ -1234,7 +1234,7 @@ namespace dss {
sstream << "{ " << ToJSONValue("value") << ": " << ToJSONValue(node->getIntegerValue()) << "}";
return JSONOk(sstream.str());
} catch(PropertyTypeMismatch& ex) {
- return ResultToJSON(false, string("Error getting property: '") + ex.what() + "'");
+ return ResultToJSON(false, std::string("Error getting property: '") + ex.what() + "'");
}
} else if(endsWith(_method, "/getBoolean")) {
if(node == NULL) {
@@ -1245,21 +1245,21 @@ namespace dss {
sstream << "{ " << ToJSONValue("value") << ": " << ToJSONValue(node->getBoolValue()) << "}";
return JSONOk(sstream.str());
} catch(PropertyTypeMismatch& ex) {
- return ResultToJSON(false, string("Error getting property: '") + ex.what() + "'");
+ return ResultToJSON(false, std::string("Error getting property: '") + ex.what() + "'");
}
} else if(endsWith(_method, "/setString")) {
- string value = _parameter["value"];
+ std::string value = _parameter["value"];
if(node == NULL) {
node = getDSS().getPropertySystem().createProperty(propName);
}
try {
node->setStringValue(value);
} catch(PropertyTypeMismatch& ex) {
- return ResultToJSON(false, string("Error setting property: '") + ex.what() + "'");
+ return ResultToJSON(false, std::string("Error setting property: '") + ex.what() + "'");
}
return JSONOk();
} else if(endsWith(_method, "/setBoolean")) {
- string strValue = _parameter["value"];
+ std::string strValue = _parameter["value"];
bool value;
if(strValue == "true") {
value = true;
@@ -1274,16 +1274,16 @@ namespace dss {
try {
node->setBooleanValue(value);
} catch(PropertyTypeMismatch& ex) {
- return ResultToJSON(false, string("Error setting property: '") + ex.what() + "'");
+ return ResultToJSON(false, std::string("Error setting property: '") + ex.what() + "'");
}
return JSONOk();
} else if(endsWith(_method, "/setInteger")) {
- string strValue = _parameter["value"];
+ std::string strValue = _parameter["value"];
int value;
try {
value = strToInt(strValue);
} catch(...) {
- return ResultToJSON(false, "Could not convert parameter 'value' to string. Got: '" + strValue + "'");
+ return ResultToJSON(false, "Could not convert parameter 'value' to std::string. Got: '" + strValue + "'");
}
if(node == NULL) {
node = getDSS().getPropertySystem().createProperty(propName);
@@ -1291,7 +1291,7 @@ namespace dss {
try {
node->setIntegerValue(value);
} catch(PropertyTypeMismatch& ex) {
- return ResultToJSON(false, string("Error setting property: '") + ex.what() + "'");
+ return ResultToJSON(false, std::string("Error setting property: '") + ex.what() + "'");
}
return JSONOk();
} else if(endsWith(_method, "/getChildren")) {
@@ -1326,14 +1326,14 @@ namespace dss {
return "";
} // handlePropertyCall
- string WebServer::handleEventCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleEventCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
_handled = true;
- string result;
+ std::string result;
if(endsWith(_method, "/raise")) {
- string name = _parameter["name"];
- string location = _parameter["location"];
- string context = _parameter["context"];
- string parameter = _parameter["parameter"];
+ std::string name = _parameter["name"];
+ std::string location = _parameter["location"];
+ std::string context = _parameter["context"];
+ std::string parameter = _parameter["parameter"];
boost::shared_ptr<Event> evt(new Event(name));
if(!context.empty()) {
@@ -1351,7 +1351,7 @@ namespace dss {
dss::Logger::getInstance()->log("WebServer::handleEventCall: Got parameter '" + nameValue[0] + "'='" + nameValue[1] + "'");
evt->setProperty(nameValue[0], nameValue[1]);
} else {
- dss::Logger::getInstance()->log(string("Invalid parameter found WebServer::handleEventCall: ") + *iParam );
+ dss::Logger::getInstance()->log(std::string("Invalid parameter found WebServer::handleEventCall: ") + *iParam );
}
}
@@ -1363,7 +1363,7 @@ namespace dss {
return result;
} // handleEventCall
- string WebServer::handleSystemCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleSystemCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
_handled = true;
if(endsWith(_method, "/version")) {
return ResultToJSON(true, DSS::getInstance()->versionString());
@@ -1373,7 +1373,7 @@ namespace dss {
}
} // handleEventCall
- string WebServer::handleStructureCall(const std::string& _method,
+ std::string WebServer::handleStructureCall(const std::string& _method,
HashMapConstStringString& _parameter,
struct mg_connection* _connection,
bool& _handled,
@@ -1381,7 +1381,7 @@ namespace dss {
_handled = true;
StructureManipulator manipulator(getDSS().getDS485Interface(), getDSS().getApartment());
if(endsWith(_method, "structure/zoneAddDevice")) {
- string devidStr = _parameter["devid"];
+ std::string devidStr = _parameter["devid"];
if(!devidStr.empty()) {
dsid_t devid = dsid::fromString(devidStr);
@@ -1390,7 +1390,7 @@ namespace dss {
return ResultToJSON(false, "cannot add nonexisting device to a zone");
}
- string zoneIDStr = _parameter["zone"];
+ std::string zoneIDStr = _parameter["zone"];
if(!zoneIDStr.empty()) {
try {
int zoneID = strToInt(zoneIDStr);
@@ -1412,7 +1412,7 @@ namespace dss {
} else if(endsWith(_method, "structure/addZone")) {
int zoneID = -1;
- string zoneIDStr = _parameter["zoneID"];
+ std::string zoneIDStr = _parameter["zoneID"];
if(!zoneIDStr.empty()) {
zoneID = strToIntDef(zoneIDStr, -1);
}
@@ -1425,7 +1425,7 @@ namespace dss {
} else if(endsWith(_method, "structure/removeZone")) {
int zoneID = -1;
- string zoneIDStr = _parameter["zoneID"];
+ std::string zoneIDStr = _parameter["zoneID"];
if(!zoneIDStr.empty()) {
zoneID = strToIntDef(zoneIDStr, -1);
}
@@ -1453,7 +1453,7 @@ namespace dss {
}
} // handleStructureCall
- string WebServer::handleSimCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleSimCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
_handled = true;
if(beginsWith(_method, "sim/switch")) {
if(endsWith(_method, "/switch/pressed")) {
@@ -1525,8 +1525,8 @@ namespace dss {
return "";
}
} else if(beginsWith(_method, "sim/addDevice")) {
- string type = _parameter["type"];
- string dsidStr = _parameter["dsid"];
+ std::string type = _parameter["type"];
+ std::string dsidStr = _parameter["dsid"];
// TODO: not finished yet ;)
} else {
_handled = false;
@@ -1534,7 +1534,7 @@ namespace dss {
return "";
} // handleSimCall
- string WebServer::handleDebugCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleDebugCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
_handled = true;
if(endsWith(_method, "/sendFrame")) {
int destination = strToIntDef(_parameter["destination"],0) & 0x3F;
@@ -1557,7 +1557,7 @@ namespace dss {
frame->getHeader().setCounter(counter);
frame->setCommand(command);
for(int iByte = 0; iByte < length; iByte++) {
- uint8_t byte = strToIntDef(_parameter[string("payload_") + intToString(iByte+1)], 0xFF);
+ uint8_t byte = strToIntDef(_parameter[std::string("payload_") + intToString(iByte+1)], 0xFF);
std::cout << "b" << std::dec << iByte << ": " << std::hex << (int)byte << "\n";
frame->getPayload().add<uint8_t>(byte);
}
@@ -1571,7 +1571,7 @@ namespace dss {
}
return ResultToJSON(true);
} else if(endsWith(_method, "debug/dSLinkSend")) {
- string deviceDSIDString = _parameter["dsid"];
+ std::string deviceDSIDString = _parameter["dsid"];
Device* pDevice = NULL;
if(!deviceDSIDString.empty()) {
dsid_t deviceDSID = dsid_t::fromString(deviceDSIDString);
@@ -1618,7 +1618,7 @@ namespace dss {
return JSONOk(sstream.str());
}
} else if(endsWith(_method, "debug/pingDevice")) {
- string deviceDSIDString = _parameter["dsid"];
+ std::string deviceDSIDString = _parameter["dsid"];
if(deviceDSIDString.empty()) {
return ResultToJSON(false, "Missing parameter 'dsid'");
}
@@ -1692,7 +1692,7 @@ namespace dss {
}
} // handleDebugCall
- string WebServer::handleMeteringCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
+ std::string WebServer::handleMeteringCall(const std::string& _method, HashMapConstStringString& _parameter, struct mg_connection* _connection, bool& _handled, Session* _session) {
if(endsWith(_method, "/getResolutions")) {
_handled = true;
std::vector<boost::shared_ptr<MeteringConfigChain> > meteringConfig = getDSS().getMetering().getConfig();
@@ -1831,7 +1831,7 @@ namespace dss {
WebServerPlugin* plugin = static_cast<WebServerPlugin*>(_userData);
WebServer& self = DSS::getInstance()->getWebServer();
- string uri = _info->uri;
+ std::string uri = _info->uri;
self.log("Plugin: Processing call to " + uri);
self.pluginCalled(_connection, _info, *plugin, uri);
@@ -1844,7 +1844,7 @@ namespace dss {
const std::string& _uri) {
HashMapConstStringString paramMap = parseParameter(_info->query_string);
- string result;
+ std::string result;
if(plugin.handleRequest(_uri, paramMap, getDSS(), result)) {
emitHTTPHeader(200, _connection, "text/plain");
mg_write(_connection, result.c_str(), result.length());
@@ -1857,18 +1857,18 @@ namespace dss {
void WebServer::jsonHandler(struct mg_connection* _connection,
const struct mg_request_info* _info,
void* _userData) {
- const string urlid = "/json/";
- string uri = _info->uri;
+ const std::string urlid = "/json/";
+ std::string uri = _info->uri;
HashMapConstStringString paramMap = parseParameter(_info->query_string);
- string method = uri.substr(uri.find(urlid) + urlid.size());
+ std::string method = uri.substr(uri.find(urlid) + urlid.size());
WebServer& self = DSS::getInstance()->getWebServer();
self.log("Processing call to " + method);
Session* session = NULL;
- string tokenStr = paramMap["token"];
+ std::string tokenStr = paramMap["token"];
if(!tokenStr.empty()) {
int token = strToIntDef(tokenStr, -1);
if(token != -1) {
@@ -1882,7 +1882,7 @@ namespace dss {
}
}
- string result;
+ std::string result;
bool handled = false;
if(beginsWith(method, "apartment/")) {
result = self.handleApartmentCall(method, paramMap, _connection, handled, session);
@@ -1962,11 +1962,11 @@ namespace dss {
void* _userData) {
emitHTTPHeader(200, _connection);
- const string urlid = "/browse";
- string uri = _info->uri;
+ const std::string urlid = "/browse";
+ std::string uri = _info->uri;
HashMapConstStringString paramMap = parseParameter(_info->query_string);
- string path = uri.substr(uri.find(urlid) + urlid.size());
+ std::string path = uri.substr(uri.find(urlid) + urlid.size());
if(path.empty()) {
path = "/";
}
@@ -2007,7 +2007,7 @@ namespace dss {
}
stream << "</ul></body></html>";
- string tmp = stream.str();
+ std::string tmp = stream.str();
mg_write(_connection, tmp.c_str(), tmp.length());
} // httpBrowseProperties
diff --git a/tests/eventtests.cpp b/tests/eventtests.cpp
index 1e3ad8b..52eb49e 100644
--- a/tests/eventtests.cpp
+++ b/tests/eventtests.cpp
@@ -195,11 +195,11 @@ BOOST_AUTO_TEST_CASE(testSetBuilder) {
res = setBuilder.buildSet("dev1", &apt.getZone(0));
BOOST_CHECK_EQUAL(res.length(), 1);
- BOOST_CHECK_EQUAL(res.get(0).getDevice().getName(), string("dev1"));
+ BOOST_CHECK_EQUAL(res.get(0).getDevice().getName(), std::string("dev1"));
res = setBuilder.buildSet("dev2", &apt.getZone(0));
BOOST_CHECK_EQUAL(res.length(), 1);
- BOOST_CHECK_EQUAL(res.get(0).getDevice().getName(), string("dev2"));
+ BOOST_CHECK_EQUAL(res.get(0).getDevice().getName(), std::string("dev2"));
} // testSetBuilder
BOOST_AUTO_TEST_CASE(testDS485Events) {
diff --git a/unix/ds485proxy.cpp b/unix/ds485proxy.cpp
index c05e15e..4499532 100644
--- a/unix/ds485proxy.cpp
+++ b/unix/ds485proxy.cpp
@@ -82,7 +82,7 @@ namespace dss {
if(_zone.getDevices().length() == _set.length()) {
- Logger::getInstance()->log(string("Optimization: Set contains all devices of zone ") + intToString(_zone.getID()));
+ Logger::getInstance()->log(std::string("Optimization: Set contains all devices of zone ") + intToString(_zone.getID()));
std::bitset<63> possibleGroups;
possibleGroups.set();
for(int iDevice = 0; iDevice < _set.length(); iDevice++) {
@@ -593,13 +593,13 @@ namespace dss {
} else if(devID == 1) {
log("Found dSM");
} else {
- log(string("Found unknown device (") + intToString(devID, true) + ")");
+ log(std::string("Found unknown device (") + intToString(devID, true) + ")");
}
uint16_t hwVersion = (pd.get<uint8_t>() << 8) | pd.get<uint8_t>();
uint16_t swVersion = (pd.get<uint8_t>() << 8) | pd.get<uint8_t>();
- log(string(" HW-Version: ") + intToString(hwVersion >> 8) + "." + intToString(hwVersion & 0x00FF));
- log(string(" SW-Version: ") + intToString(swVersion >> 8) + "." + intToString(swVersion & 0x00FF));
+ log(std::string(" HW-Version: ") + intToString(hwVersion >> 8) + "." + intToString(hwVersion & 0x00FF));
+ log(std::string(" SW-Version: ") + intToString(swVersion >> 8) + "." + intToString(swVersion & 0x00FF));
std::string name;
for(int i = 0; i < 6; i++) {
@@ -608,7 +608,7 @@ namespace dss {
name += c;
}
}
- log(string(" Name: \"") + name + "\"");
+ log(std::string(" Name: \"") + name + "\"");
// bus-id, sw-version, hw-version, name, device-id
ModulatorSpec_t spec(source, swVersion, hwVersion, name, devID);
@@ -636,7 +636,7 @@ namespace dss {
}
int source = recFrame->getFrame()->getHeader().getSource();
if(resultFrom[source]) {
- log(string("already received result from ") + intToString(source));
+ log(std::string("already received result from ") + intToString(source));
continue;
}
ModulatorSpec_t spec = modulatorSpecFromFrame(recFrame->getFrame());
@@ -689,7 +689,7 @@ namespace dss {
std::vector<int> result;
int numGroups = getGroupCount(_modulatorID, _zoneID);
- log(string("Modulator has ") + intToString(numGroups) + " groups");
+ log(std::string("Modulator has ") + intToString(numGroups) + " groups");
for(int iGroup = 0; iGroup < numGroups; iGroup++) {
DS485CommandFrame cmdFrame;
cmdFrame.getHeader().setDestination(_modulatorID);
@@ -796,7 +796,7 @@ namespace dss {
std::vector<int> result;
int numZones = getZoneCount(_modulatorID);
- log(string("Modulator has ") + intToString(numZones) + " zones");
+ log(std::string("Modulator has ") + intToString(numZones) + " zones");
for(int iZone = 0; iZone < numZones; iZone++) {
DS485CommandFrame cmdFrame;
cmdFrame.getHeader().setDestination(_modulatorID);
@@ -854,7 +854,7 @@ namespace dss {
std::vector<int> result;
int numDevices = getDevicesCountInZone(_modulatorID, _zoneID);
- log(string("Found ") + intToString(numDevices) + " in zone.");
+ log(std::string("Found ") + intToString(numDevices) + " in zone.");
for(int iDevice = 0; iDevice < numDevices; iDevice++) {
DS485CommandFrame cmdFrame;
cmdFrame.getHeader().setDestination(_modulatorID);
@@ -929,7 +929,7 @@ namespace dss {
cmdFrame.getHeader().setDestination(_modulatorID);
cmdFrame.setCommand(CommandRequest);
cmdFrame.getPayload().add<uint8_t>(FunctionModulatorGetDSID);
- log(string("Proxy: GetDSIDOfModulator ") + intToString(_modulatorID));
+ log(std::string("Proxy: GetDSIDOfModulator ") + intToString(_modulatorID));
boost::shared_ptr<ReceivedFrame> recFrame = receiveSingleFrame(cmdFrame, FunctionModulatorGetDSID);
if(recFrame == NULL) {
@@ -947,7 +947,7 @@ namespace dss {
cmdFrame.getHeader().setDestination(_modulatorID);
cmdFrame.setCommand(CommandRequest);
cmdFrame.getPayload().add<uint8_t>(FunctionGroupGetLastCalledScene);
- log(string("Proxy: GetLastCalledScene ") + intToString(_modulatorID));
+ log(std::string("Proxy: GetLastCalledScene ") + intToString(_modulatorID));
cmdFrame.getPayload().add<uint16_t>(_zoneID);
cmdFrame.getPayload().add<uint16_t>(_groupID);
@@ -964,7 +964,7 @@ namespace dss {
cmdFrame.getHeader().setDestination(_modulatorID);
cmdFrame.setCommand(CommandRequest);
cmdFrame.getPayload().add<uint8_t>(FunctionModulatorGetPowerConsumption);
- log(string("Proxy: GetPowerConsumption ") + intToString(_modulatorID));
+ log(std::string("Proxy: GetPowerConsumption ") + intToString(_modulatorID));
boost::shared_ptr<ReceivedFrame> recFrame = receiveSingleFrame(cmdFrame, FunctionModulatorGetPowerConsumption);
if(recFrame == NULL) {
@@ -984,7 +984,7 @@ namespace dss {
cmdFrame.getHeader().setDestination(_modulatorID);
cmdFrame.setCommand(CommandRequest);
cmdFrame.getPayload().add<uint8_t>(FunctionModulatorGetEnergyMeterValue);
- log(string("Proxy: GetEnergyMeterValue ") + intToString(_modulatorID));
+ log(std::string("Proxy: GetEnergyMeterValue ") + intToString(_modulatorID));
boost::shared_ptr<ReceivedFrame> recFrame = receiveSingleFrame(cmdFrame, FunctionModulatorGetEnergyMeterValue);
if(recFrame == NULL) {
@@ -1033,7 +1033,7 @@ namespace dss {
bucket->waitForFrame(2000);
boost::shared_ptr<ReceivedFrame> recFrame;
if(bucket->isEmpty()) {
- log(string("received no ack for request getSensorValue"));
+ log(std::string("received no ack for request getSensorValue"));
throw DS485ApiError("no Ack for sensorValue");
} else if(bucket->getFrameCount() == 1) {
// first frame received, wait for the next frame
@@ -1061,7 +1061,7 @@ namespace dss {
pd.get<uint16_t>();
checkResultCode((int)pd.get<uint16_t>()); // check sensorvalue
int result = int(pd.get<uint16_t>());
- log(string("result ") + intToString(result));
+ log(std::string("result ") + intToString(result));
return result;
} else {
throw std::runtime_error("received frame is NULL but bucket->isEmpty() returns false");
@@ -1126,10 +1126,10 @@ namespace dss {
bucket->waitForFrame(1000);
if(bucket->isEmpty()) {
- log(string("received no results for request (") + FunctionIDToString(_functionID) + ")");
+ log(std::string("received no results for request (") + FunctionIDToString(_functionID) + ")");
return boost::shared_ptr<ReceivedFrame>();
} else if(bucket->getFrameCount() > 1) {
- log(string("received multiple results (") + intToString(bucket->getFrameCount()) + ") for request (" + FunctionIDToString(_functionID) + ")");
+ log(std::string("received multiple results (") + intToString(bucket->getFrameCount()) + ") for request (" + FunctionIDToString(_functionID) + ")");
// TODO: check
return bucket->popFrame();
}
@@ -1195,7 +1195,7 @@ namespace dss {
m_DS485Controller.setDSID(dsid_t::fromString(getDSS().getPropertySystem().getStringValue(getConfigPropertyBasePath() + "dsid")));
m_DS485Controller.run();
} catch (const std::runtime_error& _ex) {
- log(string("Caught exception while starting DS485Controller: ") + _ex.what(), lsFatal);
+ log(std::string("Caught exception while starting DS485Controller: ") + _ex.what(), lsFatal);
}
// call Thread::run()
run();
@@ -1521,7 +1521,7 @@ namespace dss {
sstream << " from " << int(frame->getHeader().getSource());
log(sstream.str());
- log(string("Response for: ") + FunctionIDToString(functionID));
+ log(std::string("Response for: ") + FunctionIDToString(functionID));
boost::shared_ptr<ReceivedFrame> rf(new ReceivedFrame(m_DS485Controller.getTokenCount(), frame));
PayloadDissector pd2(frame->getPayload());
@@ -1582,7 +1582,7 @@ namespace dss {
uint8_t commandID = _frame->getCommand();
if(commandID != CommandResponse && commandID != CommandRequest && commandID != CommandEvent) {
log("discarded non response/request/command frame", lsInfo);
- log(string("frame type ") + commandToString(commandID));
+ log(std::string("frame type ") + commandToString(commandID));
} else {
m_IncomingFramesGuard.lock();
m_IncomingFrames.push_back(_frame);
diff --git a/webservices/model_soap.cpp b/webservices/model_soap.cpp
index 7047a43..daf8ff8 100644
--- a/webservices/model_soap.cpp
+++ b/webservices/model_soap.cpp
@@ -27,9 +27,9 @@ int NotAuthorized(struct soap *soap) {
bool IsAuthorized(struct soap *soap, const int _token) {
bool result = dss::DSS::getInstance()->getWebServices().isAuthorized(soap, _token);
if(result) {
- dss::Logger::getInstance()->log(string("User with token '") + dss::intToString(_token) + "' is authorized");
+ dss::Logger::getInstance()->log(std::string("User with token '") + dss::intToString(_token) + "' is authorized");
} else {
- dss::Logger::getInstance()->log(string("User with token '") + dss::intToString(_token) + "' is *not* authorized", lsWarning);
+ dss::Logger::getInstance()->log(std::string("User with token '") + dss::intToString(_token) + "' is *not* authorized", lsWarning);
}
return result;
} // isAuthorized
@@ -209,7 +209,7 @@ int dss__ApartmentGetDeviceIDByName(struct soap *soap, int _token, char* _devic
dss::Apartment& apt = dss::DSS::getInstance()->getApartment();
try {
dss::dsid_t dsid = apt.getDevices().getByName(_deviceName).getDSID();
- string asString = dsid.toString();
+ std::string asString = dsid.toString();
deviceID = soap_strdup(soap, asString.c_str());
} catch(dss::ItemNotFoundException& _ex) {
return soap_receiver_fault(soap, "Could not find device", NULL);
@@ -1009,9 +1009,9 @@ int dss__SwitchSimulateKeypress(struct soap *soap, int _token, char* _deviceID,
dss::DSIDSimSwitch* sw = NULL;
if(simDev != NULL && (sw = dynamic_cast<dss::DSIDSimSwitch*>(simDev)) != NULL) {
dss::ButtonPressKind kind = dss::Click;
- if(string(_kind) == "touch") {
+ if(std::string(_kind) == "touch") {
kind = dss::Touch;
- } else if(string(_kind) == "touchend") {
+ } else if(std::string(_kind) == "touchend") {
kind = dss::TouchEnd;
}
dss::DSS::getInstance()->getSimulation().processButtonPress(*sw, _buttonNr, kind);
@@ -1132,16 +1132,16 @@ int dss__EventRaise(struct soap *soap, int _token, char* _eventName, char* _cont
evt->setContext(_context);
}
if(_parameter != NULL && strlen(_parameter) > 0) {
- vector<string> params = dss::splitString(_parameter, ';');
- for(vector<string>::iterator iParam = params.begin(), e = params.end();
+ vector<std::string> params = dss::splitString(_parameter, ';');
+ for(vector<std::string>::iterator iParam = params.begin(), e = params.end();
iParam != e; ++iParam)
{
- vector<string> nameValue = dss::splitString(*iParam, '=');
+ vector<std::string> nameValue = dss::splitString(*iParam, '=');
if(nameValue.size() == 2) {
dss::Logger::getInstance()->log("SOAP::eventRaise: Got parameter '" + nameValue[0] + "'='" + nameValue[1] + "'");
evt->setProperty(nameValue[0], nameValue[1]);
} else {
- dss::Logger::getInstance()->log(string("Invalid parameter found SOAP::eventRaise: ") + *iParam );
+ dss::Logger::getInstance()->log(std::string("Invalid parameter found SOAP::eventRaise: ") + *iParam );
}
}
}
diff --git a/webservices/webservices.cpp b/webservices/webservices.cpp
index 9c3a87a..bbded58 100644
--- a/webservices/webservices.cpp
+++ b/webservices/webservices.cpp
@@ -273,7 +273,7 @@ namespace dss {
try {
soap_serve(req);
} catch(std::runtime_error& err) {
- Logger::getInstance()->log(string("WebserviceWorker::Execute: Caught exception:")
+ Logger::getInstance()->log(std::string("WebserviceWorker::Execute: Caught exception:")
+ err.what());
}
soap_destroy(req);
hooks/post-receive
--
digitalSTROM Server
More information about the dss-commits
mailing list