Revision: 41444
http://brlcad.svn.sourceforge.net/brlcad/?rev=41444&view=rev
Author: davidloman
Date: 2010-11-23 16:47:35 +0000 (Tue, 23 Nov 2010)
Log Message:
-----------
Clay: WS, Formatting.
Modified Paths:
--------------
rt^3/trunk/src/libNet/netMsg/NetMsg.cxx
Modified: rt^3/trunk/src/libNet/netMsg/NetMsg.cxx
===================================================================
--- rt^3/trunk/src/libNet/netMsg/NetMsg.cxx 2010-11-23 16:40:15 UTC (rev
41443)
+++ rt^3/trunk/src/libNet/netMsg/NetMsg.cxx 2010-11-23 16:47:35 UTC (rev
41444)
@@ -61,9 +61,7 @@
this->msgUUID = *Utils::getQUuid(ds);
*ds >> this->hasReUUID;
if (this->hasReUUID)
- {
this->reUUID = *Utils::getQUuid(ds);
- }
}
/* Destructor */
@@ -75,9 +73,7 @@
NetMsg::serialize()
{
QByteArray* ba = new QByteArray();
-
this->serialize(ba);
-
return ba;
}
@@ -145,57 +141,40 @@
return this->equals(other);
}
-bool
-NetMsg::equals(const NetMsg& other)
-{
- if (this->getMsgType() != other.getMsgType())
- {
- return false;
- }
+bool NetMsg::equals(const NetMsg& other) {
+ if (this->getMsgType() != other.getMsgType())
+ return false;
- if (this->getMsgUUID() != other.getMsgUUID())
- {
- return false;
- }
+ if (this->getMsgUUID() != other.getMsgUUID())
+ return false;
- if (this->msgHasReUUID() != other.msgHasReUUID())
- {
- return false;
- }
+ if (this->msgHasReUUID() != other.msgHasReUUID())
+ return false;
- if (this->msgHasReUUID())
- {
- if (this->getReUUID() != other.getReUUID())
- {
- return false;
- }
- }
+ if (this->msgHasReUUID())
+ if (this->getReUUID() != other.getReUUID())
+ return false;
- return this->_equals(other);
+ return this->_equals(other);
}
-QString
-NetMsg::toString()
+QString NetMsg::toString()
{
- QString out;
+ QString out;
- out += "msgType: '" + QString::number(this->msgType);
+ out += "msgType: '" + QString::number(this->msgType);
- if (this->msgUUID != NULL)
- {
- out += "'\t msgUUID: '" + this->msgUUID.toString();
- }
+ if (this->msgUUID != NULL)
+ out += "'\t msgUUID: '" + this->msgUUID.toString();
- out += "'\t hasReUUID: '" + QString::number(this->hasReUUID);
+ out += "'\t hasReUUID: '" + QString::number(this->hasReUUID);
- if (this->reUUID != NULL)
- {
- out += "'\t reUUID: '" + this->reUUID.toString();
- }
+ if (this->reUUID != NULL)
+ out += "'\t reUUID: '" + this->reUUID.toString();
- out += "'";
+ out += "'";
- return out;
+ return out;
}
std::string
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits