diff options
Diffstat (limited to 'dnssd/servicebase.cpp')
| -rw-r--r-- | dnssd/servicebase.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/dnssd/servicebase.cpp b/dnssd/servicebase.cpp index d15b6c0d2..52d18cca3 100644 --- a/dnssd/servicebase.cpp +++ b/dnssd/servicebase.cpp @@ -34,7 +34,7 @@ ServiceBase::~ServiceBase() TQString ServiceBase::encode() { - return m_serviceName.tqreplace(".","\\.").tqreplace("\\","\\\\") + TQString(".") + m_type + + return m_serviceName.replace(".","\\.").replace("\\","\\\\") + TQString(".") + m_type + TQString(".") + m_domain; } @@ -50,15 +50,15 @@ void ServiceBase::decode(const TQString& name) rest=name; } else { // normal service or domain TQString decoded_name=name; - decoded_name=decoded_name.tqreplace("\\\\","\\"); - int i = decoded_name.tqfind(TQRegExp("[^\\\\]\\.")); - if (i==-1) return; // first tqfind service name + decoded_name=decoded_name.replace("\\\\","\\"); + int i = decoded_name.find(TQRegExp("[^\\\\]\\.")); + if (i==-1) return; // first find service name rest = decoded_name.mid(i+2); - m_serviceName=decoded_name.left(i+1).tqreplace("\\.","."); + m_serviceName=decoded_name.left(i+1).replace("\\.","."); } m_type = rest.section('.',0,1); // does it really have a type? - if (m_type[0]=='_' && m_type[m_type.tqfind('.')+1]=='_') + if (m_type[0]=='_' && m_type[m_type.find('.')+1]=='_') m_domain = rest.section('.',2,-1,TQString::SectionIncludeTrailingSep); else { m_type=""; @@ -100,13 +100,13 @@ void ServiceBase::virtual_hook(int, void*) TQDataStream & operator<< (TQDataStream & s, const ServiceBase & a) { - s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << TQ_INT16(a.m_port) << a.m_textData; + s << a.m_serviceName << a.m_type << a.m_domain << a.m_hostName << Q_INT16(a.m_port) << a.m_textData; return s; } TQDataStream & operator>> (TQDataStream & s, ServiceBase & a) { - TQ_INT16 port; + Q_INT16 port; s >> a.m_serviceName >> a.m_type >> a.m_domain >> a.m_hostName >> port >> a.m_textData; a.m_port = port; return s; |