Revision: 40654
http://brlcad.svn.sourceforge.net/brlcad/?rev=40654&view=rev
Author: davidloman
Date: 2010-09-22 19:41:41 +0000 (Wed, 22 Sep 2010)
Log Message:
-----------
Convert NetMsg, subclasses and NetMsgFactory over to use reference to orogin
Portal objects rather than a string
Modified Paths:
--------------
rt^3/trunk/include/FailureMsg.h
rt^3/trunk/include/GenericFourBytesMsg.h
rt^3/trunk/include/GenericMultiByteMsg.h
rt^3/trunk/include/GenericOneByteMsg.h
rt^3/trunk/include/GenericOneStringMsg.h
rt^3/trunk/include/GenericTwoBytesMsg.h
rt^3/trunk/include/GeometryChunkMsg.h
rt^3/trunk/include/GeometryManifestMsg.h
rt^3/trunk/include/GeometryReqMsg.h
rt^3/trunk/include/NetMsg.h
rt^3/trunk/include/NetMsgFactory.h
rt^3/trunk/include/NewHostOnNetMsg.h
rt^3/trunk/include/NewSessionReqMsg.h
rt^3/trunk/include/RemoteGSHostnameSetMsg.h
rt^3/trunk/include/SessionInfoMsg.h
rt^3/trunk/include/SuccessMsg.h
rt^3/trunk/include/TypeOnlyMsg.h
rt^3/trunk/src/libNet/NetMsgFactory.cxx
rt^3/trunk/src/libNet/Portal.cxx
rt^3/trunk/src/libNet/netMsg/FailureMsg.cxx
rt^3/trunk/src/libNet/netMsg/GenericFourBytesMsg.cxx
rt^3/trunk/src/libNet/netMsg/GenericMultiByteMsg.cxx
rt^3/trunk/src/libNet/netMsg/GenericOneByteMsg.cxx
rt^3/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx
rt^3/trunk/src/libNet/netMsg/GenericTwoBytesMsg.cxx
rt^3/trunk/src/libNet/netMsg/GeometryChunkMsg.cxx
rt^3/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx
rt^3/trunk/src/libNet/netMsg/GeometryReqMsg.cxx
rt^3/trunk/src/libNet/netMsg/NetMsg.cxx
rt^3/trunk/src/libNet/netMsg/NewHostOnNetMsg.cxx
rt^3/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx
rt^3/trunk/src/libNet/netMsg/RemoteGSHostnameSetMsg.cxx
rt^3/trunk/src/libNet/netMsg/SessionInfoMsg.cxx
rt^3/trunk/src/libNet/netMsg/SuccessMsg.cxx
rt^3/trunk/src/libNet/netMsg/TypeOnlyMsg.cxx
Modified: rt^3/trunk/include/FailureMsg.h
===================================================================
--- rt^3/trunk/include/FailureMsg.h 2010-09-22 19:26:53 UTC (rev 40653)
+++ rt^3/trunk/include/FailureMsg.h 2010-09-22 19:41:41 UTC (rev 40654)
@@ -39,7 +39,7 @@
FailureMsg(NetMsg* msg, quint8 failureCode);
/* Deserializing Constructor */
- FailureMsg(QDataStream* ds, QString origin);
+ FailureMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~FailureMsg();
Modified: rt^3/trunk/include/GenericFourBytesMsg.h
===================================================================
--- rt^3/trunk/include/GenericFourBytesMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/GenericFourBytesMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -39,7 +39,7 @@
GenericFourBytesMsg(quint32 type, NetMsg* msg, quint32 b);
/* Deserializing Constructor */
- GenericFourBytesMsg(QDataStream* ds, QString origin);
+ GenericFourBytesMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~GenericFourBytesMsg();
Modified: rt^3/trunk/include/GenericMultiByteMsg.h
===================================================================
--- rt^3/trunk/include/GenericMultiByteMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/GenericMultiByteMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -40,7 +40,7 @@
GenericMultiByteMsg(quint32 type, NetMsg* msg, char* dataIn, quint32
dataInLen);
/* Deserializing Constructor */
- GenericMultiByteMsg(QDataStream* ds, QString origin);
+ GenericMultiByteMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~GenericMultiByteMsg();
Modified: rt^3/trunk/include/GenericOneByteMsg.h
===================================================================
--- rt^3/trunk/include/GenericOneByteMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/GenericOneByteMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -40,7 +40,7 @@
GenericOneByteMsg(quint32 type, NetMsg* msg, quint8 b);
/* Deserializing Constructor */
- GenericOneByteMsg(QDataStream* ds, QString origin);
+ GenericOneByteMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~GenericOneByteMsg();
Modified: rt^3/trunk/include/GenericOneStringMsg.h
===================================================================
--- rt^3/trunk/include/GenericOneStringMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/GenericOneStringMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -40,7 +40,7 @@
GenericOneStringMsg(quint32 type, NetMsg* msg, QString s);
/* Deserializing Constructor */
- GenericOneStringMsg(QDataStream* ds, QString origin);
+ GenericOneStringMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~GenericOneStringMsg();
Modified: rt^3/trunk/include/GenericTwoBytesMsg.h
===================================================================
--- rt^3/trunk/include/GenericTwoBytesMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/GenericTwoBytesMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -39,7 +39,7 @@
GenericTwoBytesMsg(quint32 type, NetMsg* msg, quint16 b);
/* Deserializing Constructor */
- GenericTwoBytesMsg(QDataStream* ds, QString origin);
+ GenericTwoBytesMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~GenericTwoBytesMsg();
Modified: rt^3/trunk/include/GeometryChunkMsg.h
===================================================================
--- rt^3/trunk/include/GeometryChunkMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/GeometryChunkMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -39,7 +39,7 @@
GeometryChunkMsg(NetMsg* msg, char* dataIn, quint32 dataInLen);
/* Deserializing Constructor */
- GeometryChunkMsg(QDataStream* ds, QString origin);
+ GeometryChunkMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~GeometryChunkMsg();
Modified: rt^3/trunk/include/GeometryManifestMsg.h
===================================================================
--- rt^3/trunk/include/GeometryManifestMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/GeometryManifestMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -42,7 +42,7 @@
GeometryManifestMsg(NetMsg* msg, QList<QString>& items);
//Deserializing Constructor
- GeometryManifestMsg(QDataStream* ds, QString origin);
+ GeometryManifestMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~GeometryManifestMsg();
Modified: rt^3/trunk/include/GeometryReqMsg.h
===================================================================
--- rt^3/trunk/include/GeometryReqMsg.h 2010-09-22 19:26:53 UTC (rev 40653)
+++ rt^3/trunk/include/GeometryReqMsg.h 2010-09-22 19:41:41 UTC (rev 40654)
@@ -40,7 +40,7 @@
GeometryReqMsg(NetMsg* msg, quint8 requestType, QString data);
/* Deserializing Constructor */
- GeometryReqMsg(QDataStream* ds, QString origin);
+ GeometryReqMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~GeometryReqMsg();
Modified: rt^3/trunk/include/NetMsg.h
===================================================================
--- rt^3/trunk/include/NetMsg.h 2010-09-22 19:26:53 UTC (rev 40653)
+++ rt^3/trunk/include/NetMsg.h 2010-09-22 19:41:41 UTC (rev 40654)
@@ -27,23 +27,27 @@
#define __NETMSG_H__
#include "libutility.h"
+
#include <QDataStream>
#include <QByteArray>
#include <QUuid>
+
#include <sstream>
+class Portal;
+
class NetMsg
{
public:
/* Normal Constructor */
- NetMsg(quint32 mType);
+ NetMsg(quint16 mType);
/* Reply Constructor */
- NetMsg(quint32 mType, NetMsg* msg);
+ NetMsg(quint16 mType, NetMsg* msg);
/* Deserializing Constructor */
- NetMsg(QDataStream* ds, QString origin);
+ NetMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~NetMsg();
@@ -55,7 +59,7 @@
/*
*Getters n Setters
*/
- quint32 getMsgType() const;
+ quint16 getMsgType() const;
QUuid getMsgUUID() const;
bool msgHasReUUID() const;
QUuid getReUUID() const;
@@ -75,7 +79,7 @@
QUuid msgUUID;
bool hasReUUID;
QUuid reUUID;
- QString origin;
+ Portal* origin;
virtual bool _serialize(QDataStream* ds) = 0;
virtual bool _equals(const NetMsg& msg) = 0;
Modified: rt^3/trunk/include/NetMsgFactory.h
===================================================================
--- rt^3/trunk/include/NetMsgFactory.h 2010-09-22 19:26:53 UTC (rev 40653)
+++ rt^3/trunk/include/NetMsgFactory.h 2010-09-22 19:41:41 UTC (rev 40654)
@@ -40,7 +40,7 @@
public:
static NetMsgFactory* getInstance();
virtual ~NetMsgFactory();
- NetMsg* deserializeNetMsg(QByteArray& data, QString origin);
+ NetMsg* deserializeNetMsg(QByteArray& data, Portal* origin);
private:
NetMsgFactory();
Modified: rt^3/trunk/include/NewHostOnNetMsg.h
===================================================================
--- rt^3/trunk/include/NewHostOnNetMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/NewHostOnNetMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -39,7 +39,7 @@
NewHostOnNetMsg(NetMsg* msg, QString gsHostname);
/* Deserializing Constructor */
- NewHostOnNetMsg(QDataStream* ds, QString origin);
+ NewHostOnNetMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~NewHostOnNetMsg();
Modified: rt^3/trunk/include/NewSessionReqMsg.h
===================================================================
--- rt^3/trunk/include/NewSessionReqMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/NewSessionReqMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -40,7 +40,7 @@
NewSessionReqMsg(NetMsg* msg, QString uname, QString passwd);
/* Deserializing Constructor */
- NewSessionReqMsg(QDataStream* ds, QString origin);
+ NewSessionReqMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~NewSessionReqMsg();
Modified: rt^3/trunk/include/RemoteGSHostnameSetMsg.h
===================================================================
--- rt^3/trunk/include/RemoteGSHostnameSetMsg.h 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/include/RemoteGSHostnameSetMsg.h 2010-09-22 19:41:41 UTC (rev
40654)
@@ -40,7 +40,7 @@
RemoteGSHostnameSetMsg(NetMsg* msg, QString gsHostname);
/* Deserializing Constructor */
- RemoteGSHostnameSetMsg(QDataStream* ds, QString origin);
+ RemoteGSHostnameSetMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~RemoteGSHostnameSetMsg();
Modified: rt^3/trunk/include/SessionInfoMsg.h
===================================================================
--- rt^3/trunk/include/SessionInfoMsg.h 2010-09-22 19:26:53 UTC (rev 40653)
+++ rt^3/trunk/include/SessionInfoMsg.h 2010-09-22 19:41:41 UTC (rev 40654)
@@ -40,7 +40,7 @@
SessionInfoMsg(NetMsg* msg, QUuid sessionID);
/* Deserializing Constructor */
- SessionInfoMsg(QDataStream* ds, QString origin);
+ SessionInfoMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~SessionInfoMsg();
Modified: rt^3/trunk/include/SuccessMsg.h
===================================================================
--- rt^3/trunk/include/SuccessMsg.h 2010-09-22 19:26:53 UTC (rev 40653)
+++ rt^3/trunk/include/SuccessMsg.h 2010-09-22 19:41:41 UTC (rev 40654)
@@ -40,7 +40,7 @@
SuccessMsg(NetMsg* msg, quint8 successCode);
/* Deserializing Constructor */
- SuccessMsg(QDataStream* ds, QString origin);
+ SuccessMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~SuccessMsg();
Modified: rt^3/trunk/include/TypeOnlyMsg.h
===================================================================
--- rt^3/trunk/include/TypeOnlyMsg.h 2010-09-22 19:26:53 UTC (rev 40653)
+++ rt^3/trunk/include/TypeOnlyMsg.h 2010-09-22 19:41:41 UTC (rev 40654)
@@ -39,7 +39,7 @@
TypeOnlyMsg(quint32 msgType, NetMsg* msg);
/* Deserializing Constructors */
- TypeOnlyMsg(QDataStream* ds, QString origin);
+ TypeOnlyMsg(QDataStream* ds, Portal* origin);
/* Destructor */
virtual ~TypeOnlyMsg();
Modified: rt^3/trunk/src/libNet/NetMsgFactory.cxx
===================================================================
--- rt^3/trunk/src/libNet/NetMsgFactory.cxx 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/src/libNet/NetMsgFactory.cxx 2010-09-22 19:41:41 UTC (rev
40654)
@@ -58,7 +58,7 @@
}
NetMsg*
-NetMsgFactory::deserializeNetMsg(QByteArray& data, QString origin)
+NetMsgFactory::deserializeNetMsg(QByteArray& data, Portal* origin)
{
QDataStream* qds = new QDataStream(data);
Modified: rt^3/trunk/src/libNet/Portal.cxx
===================================================================
--- rt^3/trunk/src/libNet/Portal.cxx 2010-09-22 19:26:53 UTC (rev 40653)
+++ rt^3/trunk/src/libNet/Portal.cxx 2010-09-22 19:41:41 UTC (rev 40654)
@@ -105,11 +105,8 @@
}
Portal* p = (Portal*)conn->pkc_user_data;
- /* Construct String */
- QString origin(p->getRemoteNodeName());
-
/* Build a NetMsg */
- NetMsg* msg = NetMsgFactory::getInstance()->deserializeNetMsg(ba, origin);
+ NetMsg* msg = NetMsgFactory::getInstance()->deserializeNetMsg(ba, p);
/* check to see if we deserialized the msg properly */
if (msg == 0) {
Modified: rt^3/trunk/src/libNet/netMsg/FailureMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/FailureMsg.cxx 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/src/libNet/netMsg/FailureMsg.cxx 2010-09-22 19:41:41 UTC (rev
40654)
@@ -40,7 +40,7 @@
}
/* Deserializing Constructor */
-FailureMsg::FailureMsg(QDataStream* ds, QString origin):
+FailureMsg::FailureMsg(QDataStream* ds, Portal* origin):
GenericOneByteMsg(ds, origin)
{
}
Modified: rt^3/trunk/src/libNet/netMsg/GenericFourBytesMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GenericFourBytesMsg.cxx 2010-09-22
19:26:53 UTC (rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/GenericFourBytesMsg.cxx 2010-09-22
19:41:41 UTC (rev 40654)
@@ -39,7 +39,7 @@
}
/* Deserializing Constructor */
-GenericFourBytesMsg::GenericFourBytesMsg(QDataStream* ds, QString origin) :
+GenericFourBytesMsg::GenericFourBytesMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
*ds >> this->data;
Modified: rt^3/trunk/src/libNet/netMsg/GenericMultiByteMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GenericMultiByteMsg.cxx 2010-09-22
19:26:53 UTC (rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/GenericMultiByteMsg.cxx 2010-09-22
19:41:41 UTC (rev 40654)
@@ -53,7 +53,7 @@
}
/* Deserializing Constructor */
-GenericMultiByteMsg::GenericMultiByteMsg(QDataStream* ds, QString origin) :
+GenericMultiByteMsg::GenericMultiByteMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
*ds >> this->dataLen;
Modified: rt^3/trunk/src/libNet/netMsg/GenericOneByteMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GenericOneByteMsg.cxx 2010-09-22 19:26:53 UTC
(rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/GenericOneByteMsg.cxx 2010-09-22 19:41:41 UTC
(rev 40654)
@@ -39,7 +39,7 @@
}
/* Deserializing Constructor */
-GenericOneByteMsg::GenericOneByteMsg(QDataStream* ds, QString origin) :
+GenericOneByteMsg::GenericOneByteMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
*ds >> this->data;
Modified: rt^3/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx 2010-09-22
19:26:53 UTC (rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx 2010-09-22
19:41:41 UTC (rev 40654)
@@ -39,7 +39,7 @@
}
/* Deserializing Constructor */
-GenericOneStringMsg::GenericOneStringMsg(QDataStream* ds, QString origin) :
+GenericOneStringMsg::GenericOneStringMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
this->strData = *Utils::getString(ds);
Modified: rt^3/trunk/src/libNet/netMsg/GenericTwoBytesMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GenericTwoBytesMsg.cxx 2010-09-22 19:26:53 UTC
(rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/GenericTwoBytesMsg.cxx 2010-09-22 19:41:41 UTC
(rev 40654)
@@ -39,7 +39,7 @@
}
/* Deserializing Constructor */
-GenericTwoBytesMsg::GenericTwoBytesMsg(QDataStream* ds, QString origin) :
+GenericTwoBytesMsg::GenericTwoBytesMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
*ds >> this->data;
Modified: rt^3/trunk/src/libNet/netMsg/GeometryChunkMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GeometryChunkMsg.cxx 2010-09-22 19:26:53 UTC
(rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/GeometryChunkMsg.cxx 2010-09-22 19:41:41 UTC
(rev 40654)
@@ -40,7 +40,7 @@
}
//Deserializing Constructor
-GeometryChunkMsg::GeometryChunkMsg(QDataStream* ds, QString origin) :
+GeometryChunkMsg::GeometryChunkMsg(QDataStream* ds, Portal* origin) :
GenericMultiByteMsg(ds, origin)
{
}
Modified: rt^3/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx 2010-09-22
19:26:53 UTC (rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx 2010-09-22
19:41:41 UTC (rev 40654)
@@ -43,7 +43,7 @@
}
/* Deserializing Constructor */
-GeometryManifestMsg::GeometryManifestMsg(QDataStream* ds, QString origin) :
+GeometryManifestMsg::GeometryManifestMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
this->itemData = new QList<QString> ();
Modified: rt^3/trunk/src/libNet/netMsg/GeometryReqMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GeometryReqMsg.cxx 2010-09-22 19:26:53 UTC
(rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/GeometryReqMsg.cxx 2010-09-22 19:41:41 UTC
(rev 40654)
@@ -39,7 +39,7 @@
}
/* Deserializing Constructor */
-GeometryReqMsg::GeometryReqMsg(QDataStream* ds, QString origin) :
+GeometryReqMsg::GeometryReqMsg(QDataStream* ds, Portal* origin) :
GenericOneStringMsg(ds, origin)
{
*ds >> this->reqType;
Modified: rt^3/trunk/src/libNet/netMsg/NetMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/NetMsg.cxx 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/src/libNet/netMsg/NetMsg.cxx 2010-09-22 19:41:41 UTC (rev
40654)
@@ -24,17 +24,18 @@
*/
#include "NetMsg.h"
+#include "Portal.h"
#include <sstream>
/* Normal Constructor */
-NetMsg::NetMsg(quint32 mType) :
+NetMsg::NetMsg(quint16 mType) :
msgType(mType), hasReUUID(false), reUUID(NULL)
{
msgUUID = QUuid::createUuid();
}
/* Reply Constructor */
-NetMsg::NetMsg(quint32 mType, NetMsg* msg) :
+NetMsg::NetMsg(quint16 mType, NetMsg* msg) :
msgType(mType)
{
if (msg->getMsgUUID() != NULL)
@@ -53,7 +54,7 @@
}
/* Deserializing Constructor */
-NetMsg::NetMsg(QDataStream* ds, QString origin)
+NetMsg::NetMsg(QDataStream* ds, Portal* origin)
{
this->origin = origin;
*ds >> this->msgType;
@@ -108,7 +109,7 @@
/*
*Getters n Setters
*/
-quint32
+quint16
NetMsg::getMsgType() const
{
return this->msgType;
Modified: rt^3/trunk/src/libNet/netMsg/NewHostOnNetMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/NewHostOnNetMsg.cxx 2010-09-22 19:26:53 UTC
(rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/NewHostOnNetMsg.cxx 2010-09-22 19:41:41 UTC
(rev 40654)
@@ -40,7 +40,7 @@
}
/* Deserializing Constructor */
-NewHostOnNetMsg::NewHostOnNetMsg(QDataStream* ds, QString origin) :
+NewHostOnNetMsg::NewHostOnNetMsg(QDataStream* ds, Portal* origin) :
GenericOneStringMsg(ds, origin)
{
}
Modified: rt^3/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx 2010-09-22 19:26:53 UTC
(rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx 2010-09-22 19:41:41 UTC
(rev 40654)
@@ -40,7 +40,7 @@
}
/* Deserializing Constructor */
-NewSessionReqMsg::NewSessionReqMsg(QDataStream* ds, QString origin) :
+NewSessionReqMsg::NewSessionReqMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
this->uname = *Utils::getString(ds);
Modified: rt^3/trunk/src/libNet/netMsg/RemoteGSHostnameSetMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/RemoteGSHostnameSetMsg.cxx 2010-09-22
19:26:53 UTC (rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/RemoteGSHostnameSetMsg.cxx 2010-09-22
19:41:41 UTC (rev 40654)
@@ -40,7 +40,7 @@
}
/* Deserializing Constructor */
-RemoteGSHostnameSetMsg::RemoteGSHostnameSetMsg(QDataStream* ds, QString
origin) :
+RemoteGSHostnameSetMsg::RemoteGSHostnameSetMsg(QDataStream* ds, Portal*
origin) :
GenericOneStringMsg(ds, origin)
{
}
Modified: rt^3/trunk/src/libNet/netMsg/SessionInfoMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/SessionInfoMsg.cxx 2010-09-22 19:26:53 UTC
(rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/SessionInfoMsg.cxx 2010-09-22 19:41:41 UTC
(rev 40654)
@@ -40,7 +40,7 @@
}
/* Deserializing Constructor */
-SessionInfoMsg::SessionInfoMsg(QDataStream* ds, QString origin) :
+SessionInfoMsg::SessionInfoMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
this->sessionID = *Utils::getQUuid(ds);
Modified: rt^3/trunk/src/libNet/netMsg/SuccessMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/SuccessMsg.cxx 2010-09-22 19:26:53 UTC (rev
40653)
+++ rt^3/trunk/src/libNet/netMsg/SuccessMsg.cxx 2010-09-22 19:41:41 UTC (rev
40654)
@@ -40,7 +40,7 @@
}
/* Deserializing Constructor */
-SuccessMsg::SuccessMsg(QDataStream* ds, QString origin) :
+SuccessMsg::SuccessMsg(QDataStream* ds, Portal* origin) :
GenericOneByteMsg(ds, origin)
{
}
Modified: rt^3/trunk/src/libNet/netMsg/TypeOnlyMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/TypeOnlyMsg.cxx 2010-09-22 19:26:53 UTC
(rev 40653)
+++ rt^3/trunk/src/libNet/netMsg/TypeOnlyMsg.cxx 2010-09-22 19:41:41 UTC
(rev 40654)
@@ -40,7 +40,7 @@
}
/* Deserializing Constructor */
-TypeOnlyMsg::TypeOnlyMsg(QDataStream* ds, QString origin) :
+TypeOnlyMsg::TypeOnlyMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
