[brlcad-commits] SF.net SVN: brlcad:[38816]

[<dav...@us...>]

Revision: 38816
          http://brlcad.svn.sourceforge.net/brlcad/?rev=38816&view=rev
Author:   davidloman
Date:     2010-04-27 17:44:55 +0000 (Tue, 27 Apr 2010)

Log Message:
-----------
Combined getNextMsg() and peekNextMsg() into getNextMsg(bool peek = false) to simplify code.

Modified Paths:
--------------
    rt^3/trunk/include/libNetwork/NetMsgFactory.h
    rt^3/trunk/include/libNetwork/NetPortal.h
    rt^3/trunk/src/libNetwork/NetMsgFactory.cxx
    rt^3/trunk/src/libNetwork/NetPortal.cxx

Modified: rt^3/trunk/include/libNetwork/NetMsgFactory.h
===================================================================
--- rt^3/trunk/include/libNetwork/NetMsgFactory.h	2010-04-27 17:28:45 UTC (rev 38815)
+++ rt^3/trunk/include/libNetwork/NetMsgFactory.h	2010-04-27 17:44:55 UTC (rev 38816)
@@ -46,8 +46,7 @@
 
     bool addData(QByteArray& data);
     bool hasMsgsAvailable();
-    NetMsg* getNextMsg();
-    NetMsg* peekNextMsg();
+    NetMsg* getNextMsg(bool peek = false);
     void attemptToMakeMsgs();
 
     bool attemptToMakeMsg();

Modified: rt^3/trunk/include/libNetwork/NetPortal.h
===================================================================
--- rt^3/trunk/include/libNetwork/NetPortal.h	2010-04-27 17:28:45 UTC (rev 38815)
+++ rt^3/trunk/include/libNetwork/NetPortal.h	2010-04-27 17:44:55 UTC (rev 38816)
@@ -52,7 +52,7 @@
 	void attemptToBuildMsg();
 
 	bool hasMsg();
-	NetMsg* getNextMsg();
+	NetMsg* getNextMsg(bool peek = false);
 
 	void send(NetMsg& msg);
 	void quickSend(quint32 opcode);

Modified: rt^3/trunk/src/libNetwork/NetMsgFactory.cxx
===================================================================
--- rt^3/trunk/src/libNetwork/NetMsgFactory.cxx	2010-04-27 17:28:45 UTC (rev 38815)
+++ rt^3/trunk/src/libNetwork/NetMsgFactory.cxx	2010-04-27 17:44:55 UTC (rev 38816)
@@ -238,27 +238,20 @@
 }
 
 NetMsg*
-NetMsgFactory::getNextMsg()
+NetMsgFactory::getNextMsg(bool peek)
 {
     if (this->inbox->isEmpty()) {
 	std::cout << "Factory.getNextMsg() is returning NULL\n";
 	return NULL;
     }
 
-    NetMsg* out = this->inbox->takeFirst();
+    NetMsg* out = 0;
 
-    return out;
-}
-NetMsg*
-NetMsgFactory::peekNextMsg()
-{
-    if (this->inbox->isEmpty()) {
-	std::cout << "Factory.peekNextMsg() is returning NULL\n";
-	return NULL;
+    if (peek) {
+	out = this->inbox->first();
+    } else {
+	out = this->inbox->takeFirst();
     }
-
-    NetMsg* out = this->inbox->first();
-
     return out;
 }
 

Modified: rt^3/trunk/src/libNetwork/NetPortal.cxx
===================================================================
--- rt^3/trunk/src/libNetwork/NetPortal.cxx	2010-04-27 17:28:45 UTC (rev 38815)
+++ rt^3/trunk/src/libNetwork/NetPortal.cxx	2010-04-27 17:44:55 UTC (rev 38816)
@@ -154,7 +154,7 @@
 		case (NetPortal::Ready):
 		{
 			//Check to see if the Msg received is Portal Control
-			NetMsg* msg = this->getNextMsg();
+			NetMsg* msg = this->getNextMsg(true);
 			if (msg != 0)
 			{
 				quint32 type = msg->getMsgType();
@@ -274,9 +274,9 @@
 	return this->factory->hasMsgsAvailable();
 }
 
-NetMsg* NetPortal::getNextMsg()
+NetMsg* NetPortal::getNextMsg(bool peek)
 {
-	return this->factory->getNextMsg();
+	return this->factory->getNextMsg(peek);
 }
 
 QString NetPortal::getRemoteGSHostname()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.