Commit d6a68b64 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

ZeroConf: Make compile with namespaced Qt.

Fix coding style issues along the way.

Change-Id: I73b3774264614d2fd3b5e32dc9921f921a1d818f
Reviewed-on: http://codereview.qt-project.org/6336


Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarChristian Kandeler <christian.kandeler@nokia.com>
parent 789179b4
......@@ -268,19 +268,26 @@ namespace ZeroConf {
\threadsafe
*/
Service::Service(const Service&o):
QObject(0), m_name(o.m_name), m_type(o.m_type), m_domain(o.m_domain), m_fullName(o.m_fullName), m_port(o.m_port), m_txtRecord(o.m_txtRecord),
m_host((o.m_host != 0)?(new QHostInfo(*o.m_host)):o.m_host), m_interfaceNr(o.m_interfaceNr), m_outdated(o.m_outdated)
Service::Service(const Service &o) :
QObject(0),
m_name(o.m_name),
m_type(o.m_type),
m_domain(o.m_domain),
m_fullName(o.m_fullName),
m_port(o.m_port),
m_txtRecord(o.m_txtRecord),
m_host(o.m_host ? new QHostInfo(*o.m_host) : 0),
m_interfaceNr(o.m_interfaceNr),
m_outdated(o.m_outdated)
{
}
Service::Service(QObject *parent):
QObject(parent), m_name(), m_type(), m_domain(), m_fullName(), m_port(), m_txtRecord(), m_host(0), m_interfaceNr(0), m_outdated(false)
Service::Service(QObject *parent) : QObject(parent), m_host(0), m_interfaceNr(0), m_outdated(false)
{ }
Service::~Service()
{
if (m_host) delete m_host;
delete m_host;
}
QDebug operator<<(QDebug dbg, const Service &service)
......
......@@ -39,7 +39,8 @@
#include <QtCore/QObject>
#include <QtCore/QSharedPointer>
#include <QtCore/QStringList>
class QHostInfo;
QT_FORWARD_DECLARE_CLASS(QHostInfo)
namespace ZeroConf {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment