Revision: 40785
http://brlcad.svn.sourceforge.net/brlcad/?rev=40785&view=rev
Author: davidloman
Date: 2010-09-29 11:45:14 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Rename ControlledThread::startup to ::start and override the QThread
implementation.
Modified Paths:
--------------
rt^3/trunk/include/ControlledThread.h
rt^3/trunk/src/libNet/PortalManager.cxx
rt^3/trunk/src/utility/ControlledThread.cxx
rt^3/trunk/tests/libNet/libNetTest.cxx
Modified: rt^3/trunk/include/ControlledThread.h
===================================================================
--- rt^3/trunk/include/ControlledThread.h 2010-09-29 11:44:34 UTC (rev
40784)
+++ rt^3/trunk/include/ControlledThread.h 2010-09-29 11:45:14 UTC (rev
40785)
@@ -32,7 +32,7 @@
ControlledThread(QString threadname = "");
virtual ~ControlledThread();
- bool startup();
+ void start();
bool shutdown(bool block=true);
QString getThreadName();
Modified: rt^3/trunk/src/libNet/PortalManager.cxx
===================================================================
--- rt^3/trunk/src/libNet/PortalManager.cxx 2010-09-29 11:44:34 UTC (rev
40784)
+++ rt^3/trunk/src/libNet/PortalManager.cxx 2010-09-29 11:45:14 UTC (rev
40785)
@@ -56,7 +56,8 @@
}
}
-void PortalManager::_run() {
+void
+PortalManager::_run() {
this->log->logINFO("PortalManager", "Running");
struct timeval timeout;
fd_set readfds;
Modified: rt^3/trunk/src/utility/ControlledThread.cxx
===================================================================
--- rt^3/trunk/src/utility/ControlledThread.cxx 2010-09-29 11:44:34 UTC (rev
40784)
+++ rt^3/trunk/src/utility/ControlledThread.cxx 2010-09-29 11:45:14 UTC (rev
40785)
@@ -36,10 +36,10 @@
ControlledThread::~ControlledThread() {
}
-bool ControlledThread::startup() {
+void ControlledThread::start() {
bool preRetVal = this->preStartupHook();
this->runCmd = true;
- this->start();
+ QThread::start(); //call super class start
bool postRetVal = this->postStartupHook();
}
Modified: rt^3/trunk/tests/libNet/libNetTest.cxx
===================================================================
--- rt^3/trunk/tests/libNet/libNetTest.cxx 2010-09-29 11:44:34 UTC (rev
40784)
+++ rt^3/trunk/tests/libNet/libNetTest.cxx 2010-09-29 11:45:14 UTC (rev
40785)
@@ -120,7 +120,7 @@
if (isServer) {
PortalManager pm(port);
- pm.startup();
+ pm.start();
//listen for a loooong time.
GSThread::sleep(60 * 60); //1 hr
@@ -129,7 +129,7 @@
} else {
PortalManager pm;
- pm.startup();
+ pm.start();
GSThread::sleep(3);
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
