Revision: 41589
http://brlcad.svn.sourceforge.net/brlcad/?rev=41589&view=rev
Author: davidloman
Date: 2010-12-14 13:23:24 +0000 (Tue, 14 Dec 2010)
Log Message:
-----------
Utils class should have been named DataStreamUtils
Modified Paths:
--------------
rt^3/trunk/include/DataStreamUtils.h
rt^3/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx
rt^3/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx
rt^3/trunk/src/libNet/netMsg/NetMsg.cxx
rt^3/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx
rt^3/trunk/src/libNet/netMsg/SessionInfoMsg.cxx
rt^3/trunk/src/utility/DataStreamUtils.cxx
Modified: rt^3/trunk/include/DataStreamUtils.h
===================================================================
--- rt^3/trunk/include/DataStreamUtils.h 2010-12-14 13:14:12 UTC (rev
41588)
+++ rt^3/trunk/include/DataStreamUtils.h 2010-12-14 13:23:24 UTC (rev
41589)
@@ -31,7 +31,7 @@
#include <QtCore/QUuid>
#include <iostream>
-class Utils
+class DataStreamUtils
{
public:
static QString* getString(QDataStream* ds);
@@ -41,11 +41,11 @@
static void printQByteArray(QByteArray* ba);
private:
- Utils(){};
+ DataStreamUtils(){};
/* Disable copy cstr and =operator */
- Utils(Utils const&){};
- Utils& operator=(Utils const&){};
+ DataStreamUtils(DataStreamUtils const&){};
+ DataStreamUtils& operator=(DataStreamUtils const&){};
};
#endif /* __DATASTREAMUTILS_H__ */
Modified: rt^3/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx 2010-12-14
13:14:12 UTC (rev 41588)
+++ rt^3/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx 2010-12-14
13:23:24 UTC (rev 41589)
@@ -40,7 +40,7 @@
GenericOneStringMsg::GenericOneStringMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
- this->strData = *Utils::getString(ds);
+ this->strData = *DataStreamUtils::getString(ds);
}
/* Destructor */
@@ -49,7 +49,7 @@
bool GenericOneStringMsg::_serialize(QDataStream* ds)
{
- Utils::putString(ds, this->strData);
+ DataStreamUtils::putString(ds, this->strData);
return true;
}
Modified: rt^3/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx 2010-12-14
13:14:12 UTC (rev 41588)
+++ rt^3/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx 2010-12-14
13:23:24 UTC (rev 41589)
@@ -52,7 +52,7 @@
*ds >> numOfItems;
for (quint32 i = 0; i < numOfItems; ++i) {
- QString* tString = Utils::getString(ds);
+ QString* tString = DataStreamUtils::getString(ds);
QString newStr;
newStr.append(*tString);
this->itemData->push_back(newStr);
@@ -70,7 +70,7 @@
*ds << this->itemData->size();
for (quint32 i = 0; i < this->itemData->size(); ++i) {
- Utils::putString(ds, this->itemData->at(i));
+ DataStreamUtils::putString(ds, this->itemData->at(i));
}
return true;
Modified: rt^3/trunk/src/libNet/netMsg/NetMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/NetMsg.cxx 2010-12-14 13:14:12 UTC (rev
41588)
+++ rt^3/trunk/src/libNet/netMsg/NetMsg.cxx 2010-12-14 13:23:24 UTC (rev
41589)
@@ -58,10 +58,10 @@
{
this->origin = origin;
*ds >> this->msgType;
- this->msgUUID = *Utils::getQUuid(ds);
+ this->msgUUID = *DataStreamUtils::getQUuid(ds);
*ds >> this->hasReUUID;
if (this->hasReUUID)
- this->reUUID = *Utils::getQUuid(ds);
+ this->reUUID = *DataStreamUtils::getQUuid(ds);
}
/* Destructor */
@@ -85,12 +85,12 @@
/* Serialize Header */
subDS << this->msgType;
- Utils::putQUuid(&subDS, this->msgUUID);
+ DataStreamUtils::putQUuid(&subDS, this->msgUUID);
subDS << this->hasReUUID;
if (this->hasReUUID)
{
- Utils::putQUuid(&subDS, this->reUUID);
+ DataStreamUtils::putQUuid(&subDS, this->reUUID);
}
/* Call subclass serialize */
Modified: rt^3/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx 2010-12-14 13:14:12 UTC
(rev 41588)
+++ rt^3/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx 2010-12-14 13:23:24 UTC
(rev 41589)
@@ -41,8 +41,8 @@
NewSessionReqMsg::NewSessionReqMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
- this->uname = *Utils::getString(ds);
- this->passwd = *Utils::getString(ds);
+ this->uname = *DataStreamUtils::getString(ds);
+ this->passwd = *DataStreamUtils::getString(ds);
}
/* Destructor */
@@ -51,8 +51,8 @@
bool NewSessionReqMsg::_serialize(QDataStream* ds)
{
- Utils::putString(ds, this->uname);
- Utils::putString(ds, this->passwd);
+ DataStreamUtils::putString(ds, this->uname);
+ DataStreamUtils::putString(ds, this->passwd);
return true;
}
Modified: rt^3/trunk/src/libNet/netMsg/SessionInfoMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/SessionInfoMsg.cxx 2010-12-14 13:14:12 UTC
(rev 41588)
+++ rt^3/trunk/src/libNet/netMsg/SessionInfoMsg.cxx 2010-12-14 13:23:24 UTC
(rev 41589)
@@ -41,7 +41,7 @@
SessionInfoMsg::SessionInfoMsg(QDataStream* ds, Portal* origin) :
NetMsg(ds, origin)
{
- this->sessionID = *Utils::getQUuid(ds);
+ this->sessionID = *DataStreamUtils::getQUuid(ds);
}
/* Destructor */
@@ -50,7 +50,7 @@
bool SessionInfoMsg::_serialize(QDataStream* ds)
{
- Utils::putQUuid(ds, this->sessionID);
+ DataStreamUtils::putQUuid(ds, this->sessionID);
return true;
}
Modified: rt^3/trunk/src/utility/DataStreamUtils.cxx
===================================================================
--- rt^3/trunk/src/utility/DataStreamUtils.cxx 2010-12-14 13:14:12 UTC (rev
41588)
+++ rt^3/trunk/src/utility/DataStreamUtils.cxx 2010-12-14 13:23:24 UTC (rev
41589)
@@ -26,9 +26,9 @@
#include "DataStreamUtils.h"
QUuid*
-Utils::getQUuid(QDataStream* ds)
+DataStreamUtils::getQUuid(QDataStream* ds)
{
- QString* strUUID = Utils::getString(ds);
+ QString* strUUID = DataStreamUtils::getString(ds);
//std::cout << strUUID->toStdString();
@@ -40,12 +40,12 @@
}
void
-Utils::putQUuid(QDataStream* ds, QUuid uuid)
+DataStreamUtils::putQUuid(QDataStream* ds, QUuid uuid)
{
- Utils::putString(ds, uuid.toString());
+ DataStreamUtils::putString(ds, uuid.toString());
}
-QString* Utils::getString(QDataStream* ds)
+QString* DataStreamUtils::getString(QDataStream* ds)
{
quint32 len;
@@ -76,7 +76,7 @@
}
-void Utils::putString(QDataStream* ds, QString str)
+void DataStreamUtils::putString(QDataStream* ds, QString str)
{
/*
std::cout << "\nputString:" << std::endl;
@@ -93,7 +93,7 @@
}
}
-void Utils::printQByteArray(QByteArray* ba)
+void DataStreamUtils::printQByteArray(QByteArray* ba)
{
std::cout << std::endl;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
