Revision: 40892
http://brlcad.svn.sourceforge.net/brlcad/?rev=40892&view=rev
Author: davidloman
Date: 2010-10-01 17:15:46 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
WS, Formatting, include organization, double newline removal, etc.
Modified Paths:
--------------
rt^3/trunk/include/AbstractJob.h
rt^3/trunk/include/Account.h
rt^3/trunk/include/AccountManager.h
rt^3/trunk/include/AppLauncher.h
rt^3/trunk/include/BaseApp.h
rt^3/trunk/include/Config.h
rt^3/trunk/include/ControlledThread.h
rt^3/trunk/include/DataManager.h
rt^3/trunk/include/DataStreamUtils.h
rt^3/trunk/include/DbObject.h
rt^3/trunk/include/EventManager.h
rt^3/trunk/include/EventPublisher.h
rt^3/trunk/include/EventSubscriber.h
rt^3/trunk/include/FailureMsg.h
rt^3/trunk/include/FileDataSource.h
rt^3/trunk/include/GSException.h
rt^3/trunk/include/GSThread.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/GeometryService.h
rt^3/trunk/include/JobManager.h
rt^3/trunk/include/JobScheduler.h
rt^3/trunk/include/Logger.h
rt^3/trunk/include/NetMsg.h
rt^3/trunk/include/NetMsgFactory.h
rt^3/trunk/include/NetMsgRouter.h
rt^3/trunk/include/NetMsgTypes.h
rt^3/trunk/include/NewNodeOnNetMsg.h
rt^3/trunk/include/NewSessionReqMsg.h
rt^3/trunk/include/PkgClient.h
rt^3/trunk/include/PkgServer.h
rt^3/trunk/include/PkgTcpServer.h
rt^3/trunk/include/PkgUdpServer.h
rt^3/trunk/include/Portal.h
rt^3/trunk/include/PortalManager.h
rt^3/trunk/include/RemoteNodenameSetMsg.h
rt^3/trunk/include/Session.h
rt^3/trunk/include/SessionInfoMsg.h
rt^3/trunk/include/SessionManager.h
rt^3/trunk/include/SuccessMsg.h
rt^3/trunk/include/TypeOnlyMsg.h
Modified: rt^3/trunk/include/AbstractJob.h
===================================================================
--- rt^3/trunk/include/AbstractJob.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/AbstractJob.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -39,9 +39,7 @@
class AbstractJob
{
-
public:
-
AbstractJob();
virtual ~AbstractJob();
@@ -56,10 +54,9 @@
quint32 jobID;
JobStatus status;
-
};
-#endif
+#endif /* __ABSTRACTJOB_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/Account.h
===================================================================
--- rt^3/trunk/include/Account.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/Account.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -27,12 +27,13 @@
#define __ACCOUNT_H__
#include "Portal.h"
-#include <QtCore/QString>
+
#include <ctime>
+#include <QtCore/QString>
+
class Account
{
-
public:
Account(QString uname, Portal* portal, quint32 id);
virtual ~Account();
Modified: rt^3/trunk/include/AccountManager.h
===================================================================
--- rt^3/trunk/include/AccountManager.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/AccountManager.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -36,7 +36,6 @@
class AccountManager
{
-
public:
virtual ~AccountManager();
static AccountManager* getInstance();
@@ -54,7 +53,7 @@
Account* newAccount(QString uname, Portal* p, quint32 id);
};
-#endif
+#endif /* __ACCOUNTMANAGER_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/AppLauncher.h
===================================================================
--- rt^3/trunk/include/AppLauncher.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/AppLauncher.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -32,9 +32,8 @@
#include <QtCore/QString>
#include <QtCore/QUuid>
-class AppLauncher: public QCoreApplication
+class AppLauncher : public QCoreApplication
{
-
public:
AppLauncher(int& argc, char** argv, BaseApp* app);
virtual ~AppLauncher();
Modified: rt^3/trunk/include/BaseApp.h
===================================================================
--- rt^3/trunk/include/BaseApp.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/BaseApp.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -26,10 +26,11 @@
#ifndef __BASEAPP_H__
#define __BASEAPP_H__
-#include <QtCore/QThread>
#include "libutility.h"
-class BaseApp: public QThread
+#include <QtCore/QThread>
+
+class BaseApp : public QThread
{
public:
BaseApp();
Modified: rt^3/trunk/include/Config.h
===================================================================
--- rt^3/trunk/include/Config.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/Config.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -27,13 +27,13 @@
#define __CONFIG_H__
#include "Logger.h"
+
#include <QtCore/QMap>
#include <QtCore/QString>
#include <QtCore/QMutex>
class Config
{
-
public:
~Config();
static Config* getInstance();
@@ -57,10 +57,9 @@
QMap<QString, QString>* configMap;
static Config* pInstance;
-
};
-#endif
+#endif /* __CONFIG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/ControlledThread.h
===================================================================
--- rt^3/trunk/include/ControlledThread.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/ControlledThread.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -24,10 +24,12 @@
#ifndef __CONTROLLEDTHREAD_H__
#define __CONTROLLEDTHREAD_H__
-#include <QtCore/QString>
#include "GSThread.h"
-class ControlledThread: public GSThread {
+#include <QtCore/QString>
+
+class ControlledThread : public GSThread
+{
public:
ControlledThread(QString threadname = "");
virtual ~ControlledThread();
Modified: rt^3/trunk/include/DataManager.h
===================================================================
--- rt^3/trunk/include/DataManager.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/DataManager.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -39,7 +39,6 @@
class DataManager : public INetMsgHandler
{
-
public:
static DataManager* getInstance();
virtual ~DataManager();
Modified: rt^3/trunk/include/DataStreamUtils.h
===================================================================
--- rt^3/trunk/include/DataStreamUtils.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/DataStreamUtils.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -40,10 +40,8 @@
static void putQUuid(QDataStream* ds, QUuid str);
static void printQByteArray(QByteArray* ba);
-
private:
Utils(){}
-
};
#endif /* __DATASTREAMUTILS_H__ */
Modified: rt^3/trunk/include/DbObject.h
===================================================================
--- rt^3/trunk/include/DbObject.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/DbObject.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -24,14 +24,15 @@
* Author: dloman
*/
-#ifndef DBOBJECT_H_
-#define DBOBJECT_H_
+#ifndef __DBOBJECT_H__
+#define __DBOBJECT_H__
#include <QtCore/QString>
#include <QtCore/QUuid>
#include <QtCore/QByteArray>
-class DbObject {
+class DbObject
+{
public:
DbObject(QString path, QByteArray* data);
DbObject(QUuid id, QByteArray* data);
@@ -47,7 +48,7 @@
QByteArray* data;
};
-#endif /* DBOBJECT_H_ */
+#endif /* __DBOBJECT_H__ */
/*
* Local Variables:
Modified: rt^3/trunk/include/EventManager.h
===================================================================
--- rt^3/trunk/include/EventManager.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/EventManager.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -62,7 +62,6 @@
QMutex* subscriptionsLock;
QList<EventSubscription*>* subscriptions;
-
};
#endif /* __EVENTMANAGER_H__ */
Modified: rt^3/trunk/include/EventPublisher.h
===================================================================
--- rt^3/trunk/include/EventPublisher.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/EventPublisher.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -32,7 +32,6 @@
{
public:
void generateEvent(quint32 type, QString message = "");
-
};
#endif /* __EVENTPUBLISHER_H__ */
Modified: rt^3/trunk/include/EventSubscriber.h
===================================================================
--- rt^3/trunk/include/EventSubscriber.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/EventSubscriber.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -28,6 +28,7 @@
#include "Event.h"
#include "EventManager.h"
+
#include <QtCore/QString>
class EventPublisher;
Modified: rt^3/trunk/include/FailureMsg.h
===================================================================
--- rt^3/trunk/include/FailureMsg.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/FailureMsg.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -28,9 +28,8 @@
#include "GenericOneByteMsg.h"
-class FailureMsg: public GenericOneByteMsg
+class FailureMsg : public GenericOneByteMsg
{
-
public:
/* Normal Constructor */
FailureMsg(quint8 failureCode);
@@ -48,10 +47,9 @@
*Getters n Setters
*/
quint8 getFailureCode();
-
};
-#endif
+#endif /* __FAILUREMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/FileDataSource.h
===================================================================
--- rt^3/trunk/include/FileDataSource.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/FileDataSource.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -30,7 +30,8 @@
#include <QtCore/QMutex>
-class FileDataSource: public IDataSource {
+class FileDataSource : public IDataSource
+{
public:
FileDataSource(QString repoPath);
virtual ~FileDataSource();
@@ -51,7 +52,6 @@
bool hasPathLock(QString path);
void setPathLock(QString path);
void remPathLock(QString path);
-
};
#endif /* __FILEDATASOURCE_H__ */
Modified: rt^3/trunk/include/GSException.h
===================================================================
--- rt^3/trunk/include/GSException.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/GSException.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -25,10 +25,11 @@
#ifndef __GSEXCEPTION_H__
#define __GSEXCEPTION_H__
-#include <exception>
#include <QtCore/QString>
-class GSException: public std::exception
+#include <exception>
+
+class GSException : public std::exception
{
public:
GSException(QString reason);
Modified: rt^3/trunk/include/GSThread.h
===================================================================
--- rt^3/trunk/include/GSThread.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/GSThread.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -45,7 +45,6 @@
static QList<GSThread*> threads;
static void addThread(GSThread* thread);
static void remThread(GSThread* thread);
-
};
#endif /* __GSTHREAD_H__ */
Modified: rt^3/trunk/include/GenericFourBytesMsg.h
===================================================================
--- rt^3/trunk/include/GenericFourBytesMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/GenericFourBytesMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -28,9 +28,8 @@
#include "NetMsg.h"
-class GenericFourBytesMsg: public NetMsg
+class GenericFourBytesMsg : public NetMsg
{
-
public:
/* Normal Constructor */
GenericFourBytesMsg(quint32 type, quint32 b);
@@ -57,7 +56,7 @@
virtual bool _equals(const NetMsg& msg);
};
-#endif
+#endif /* __GENERICFOURBYTESMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/GenericMultiByteMsg.h
===================================================================
--- rt^3/trunk/include/GenericMultiByteMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/GenericMultiByteMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -29,11 +29,9 @@
#include "NetMsg.h"
#include <QtCore/QByteArray>
-class GenericMultiByteMsg: public NetMsg
+class GenericMultiByteMsg : public NetMsg
{
-
public:
-
/* Normal Constructor */
GenericMultiByteMsg(quint32 type, char* dataIn, quint32 dataInLen);
@@ -63,7 +61,7 @@
virtual bool _equals(const NetMsg& msg);
};
-#endif
+#endif /* __GENERICMULTIBYTEMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/GenericOneByteMsg.h
===================================================================
--- rt^3/trunk/include/GenericOneByteMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/GenericOneByteMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -28,11 +28,9 @@
#include "NetMsg.h"
-class GenericOneByteMsg: public NetMsg
+class GenericOneByteMsg : public NetMsg
{
-
public:
-
/* Normal Constructor */
GenericOneByteMsg(quint32 type, quint8 b);
@@ -58,7 +56,7 @@
virtual bool _equals(const NetMsg& msg);
};
-#endif
+#endif /* __GENERICONEBYTEMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/GenericOneStringMsg.h
===================================================================
--- rt^3/trunk/include/GenericOneStringMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/GenericOneStringMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -28,11 +28,9 @@
#include "NetMsg.h"
-class GenericOneStringMsg: public NetMsg
+class GenericOneStringMsg : public NetMsg
{
-
public:
-
/* Normal Constructor */
GenericOneStringMsg(quint32 type, QString s);
@@ -58,7 +56,7 @@
virtual bool _equals(const NetMsg& msg);
};
-#endif
+#endif /* __GENERICONESTRINGMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/GenericTwoBytesMsg.h
===================================================================
--- rt^3/trunk/include/GenericTwoBytesMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/GenericTwoBytesMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -28,9 +28,8 @@
#include "NetMsg.h"
-class GenericTwoBytesMsg: public NetMsg
+class GenericTwoBytesMsg : public NetMsg
{
-
public:
/* Normal Constructor */
GenericTwoBytesMsg(quint32 type, quint16 b);
@@ -57,7 +56,7 @@
virtual bool _equals(const NetMsg& msg);
};
-#endif
+#endif /* __GENERICTWOBYTESMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/GeometryChunkMsg.h
===================================================================
--- rt^3/trunk/include/GeometryChunkMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/GeometryChunkMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -28,9 +28,8 @@
#include "GenericMultiByteMsg.h"
-class GeometryChunkMsg: public GenericMultiByteMsg
+class GeometryChunkMsg : public GenericMultiByteMsg
{
-
public:
/* Normal Constructor */
GeometryChunkMsg(char* dataIn, quint32 dataInLen);
@@ -43,7 +42,6 @@
/* Destructor */
virtual ~GeometryChunkMsg();
-
};
#endif /* __GEOMETRYCHUNKMSG_H__ */
Modified: rt^3/trunk/include/GeometryManifestMsg.h
===================================================================
--- rt^3/trunk/include/GeometryManifestMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/GeometryManifestMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -26,13 +26,12 @@
#ifndef __GEOMETRYMANIFESTMSG_H__
#define __GEOMETRYMANIFESTMSG_H__
-#include <vector>
-
#include "NetMsg.h"
-class GeometryManifestMsg: public NetMsg
-{
+#include <vector>
+class GeometryManifestMsg : public NetMsg
+{
public:
/* Normal Constructor */
@@ -41,7 +40,7 @@
/* Reply Constructor */
GeometryManifestMsg(NetMsg* msg, QList<QString>& items);
- //Deserializing Constructor
+ /* Deserializing Constructor */
GeometryManifestMsg(QDataStream* ds, Portal* origin);
/* Destructor */
@@ -60,10 +59,9 @@
bool _serialize(QDataStream* ds);
bool _equals(const NetMsg& msg);
-
};
-#endif
+#endif /* __GEOMETRYMANIFESTMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/GeometryReqMsg.h
===================================================================
--- rt^3/trunk/include/GeometryReqMsg.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/GeometryReqMsg.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -28,12 +28,11 @@
#include "GenericOneStringMsg.h"
-class GeometryReqMsg: public GenericOneStringMsg
+class GeometryReqMsg : public GenericOneStringMsg
{
-
public:
- //Only Constructor
+ /* Only Constructor */
GeometryReqMsg(quint8 requestType, QString data);
/* Reply Constructor */
@@ -61,7 +60,7 @@
bool _equals(const NetMsg& msg);
};
-#endif
+#endif /* __GEOMETRYREQMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/GeometryService.h
===================================================================
--- rt^3/trunk/include/GeometryService.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/GeometryService.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -34,7 +34,6 @@
class GeometryService : public ControlledThread, public INetMsgHandler
{
-
public:
GeometryService(const QString localNodeName, const quint16 listenPort);
virtual ~GeometryService();
@@ -55,10 +54,9 @@
DataManager* dm;
void registerMsgRoutes();
-
};
-#endif
+#endif /* __GEOMETRYSERVICE_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/JobManager.h
===================================================================
--- rt^3/trunk/include/JobManager.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/JobManager.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -28,6 +28,7 @@
#include "AbstractJob.h"
#include "libutility.h"
+
#include <QtCore/QList>
#include <QtCore/QMutex>
@@ -36,11 +37,10 @@
class JobManager
{
-
public:
-/**
- * Provides controlled access to the singleton JobManager object.
- */
+ /**
+ * Provides controlled access to the singleton JobManager object.
+ */
static JobManager* getInstance();
virtual ~JobManager();
@@ -95,7 +95,7 @@
bool acceptJobs;
};
-#endif
+#endif /* __JOBMANAGER_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/JobScheduler.h
===================================================================
--- rt^3/trunk/include/JobScheduler.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/JobScheduler.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -31,10 +31,8 @@
class JobScheduler
{
-
public:
static JobScheduler* getInstance();
-
virtual ~JobScheduler();
private:
@@ -44,10 +42,9 @@
//Disable copy cstr and =operator
JobScheduler(JobScheduler const&){};
JobScheduler& operator=(JobScheduler const&){};
-
};
-#endif //__JOBSCHEDULER_H__ //
+#endif /*__JOBSCHEDULER_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/Logger.h
===================================================================
--- rt^3/trunk/include/Logger.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/Logger.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -26,16 +26,15 @@
#ifndef __LOGGER_H__
#define __LOGGER_H__
+#include <iostream>
+
#include <QtCore/QThread>
#include <QtCore/QString>
#include <QtCore/QMutex>
#include <QtCore/QMutexLocker>
-#include <iostream>
-
class Logger
{
-
public:
static Logger* getInstance();
virtual ~Logger(){};
@@ -90,11 +89,10 @@
Logger(const Logger& logger){};
Logger& operator=(const Logger& log){};
-
void log(quint32 logLevel, QString origin, QString string);
};
-#endif
+#endif /* __LOGGER_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/NetMsg.h
===================================================================
--- rt^3/trunk/include/NetMsg.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/NetMsg.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -28,17 +28,16 @@
#include "libutility.h"
+#include <sstream>
+
#include <QtCore/QDataStream>
#include <QtCore/QByteArray>
#include <QtCore/QUuid>
-#include <sstream>
-
class Portal;
class NetMsg
{
-
public:
/* Normal Constructor */
NetMsg(quint16 mType);
@@ -90,7 +89,7 @@
NetMsg(){};
};
-#endif
+#endif /* __NETMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/NetMsgFactory.h
===================================================================
--- rt^3/trunk/include/NetMsgFactory.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/NetMsgFactory.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -26,10 +26,10 @@
#ifndef __NETMSGFACTORY_H__
#define __NETMSGFACTORY_H__
-#include "brlcad/pkg.h"
#include "libutility.h"
#include "NetMsg.h"
+#include "brlcad/pkg.h"
#include <QtCore/QByteArray>
#include <QtCore/QString>
@@ -47,7 +47,7 @@
static NetMsgFactory* pInstance;
};
-#endif
+#endif /* __NETMSGFACTORY_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/NetMsgRouter.h
===================================================================
--- rt^3/trunk/include/NetMsgRouter.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/NetMsgRouter.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -23,7 +23,6 @@
*
*/
-
#ifndef __NETMSGROUTER_H__
#define __NETMSGROUTER_H__
@@ -35,7 +34,8 @@
#include <QtCore/QList>
#include <QtCore/QMutex>
-class NetMsgRouter {
+class NetMsgRouter
+{
public:
static NetMsgRouter* getInstance();
virtual ~NetMsgRouter();
@@ -54,11 +54,8 @@
*/
QList<INetMsgHandler*>* getListOfHandlers(quint16 type);
-
QMutex mapLock;
QMap<quint16,QList<INetMsgHandler*>*>* routingTable;
-
-
};
#endif /* __NETMSGROUTER_H__ */
Modified: rt^3/trunk/include/NetMsgTypes.h
===================================================================
--- rt^3/trunk/include/NetMsgTypes.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/NetMsgTypes.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -34,32 +34,32 @@
#define TEST_GENERIC_MULTIBYTE_MSG 0x0023
#define TEST_GENERIC_1STRING_MSG 0x0024
-#define RUALIVE 0x0042
-#define IMALIVE 0x0043
+#define RUALIVE 0x0042
+#define IMALIVE 0x0043
-#define FAILURE 0x0050
-#define SUCCESS 0x0051
+#define FAILURE 0x0050
+#define SUCCESS 0x0051
#define GS_REMOTE_NODENAME_SET 0x0100
-#define DISCONNECTREQ 0x0150
+#define DISCONNECTREQ 0x0150
-#define NEWNODEONNET 0x0200
+#define NEWNODEONNET 0x0200
-#define FULLNODELISTREQ 0x0250
-#define FULL_NODE_LIST 0x0255
+#define FULLNODELISTREQ 0x0250
+#define FULL_NODE_LIST 0x0255
-#define NEWSESSIONREQ 0x0300
-#define SESSIONINFO 0x0305
+#define NEWSESSIONREQ 0x0300
+#define SESSIONINFO 0x0305
-#define GEOMETRYREQ 0x0400
-#define REQ_BY_UUID 0x00
-#define REQ_BY_PATH 0x01
-#define GEOMETRYMANIFEST 0x0405
-#define GEOMETRYCHUNK 0x0410
+#define GEOMETRYREQ 0x0400
+#define REQ_BY_UUID 0x00
+#define REQ_BY_PATH 0x01
+#define GEOMETRYMANIFEST 0x0405
+#define GEOMETRYCHUNK 0x0410
//Admin commands
-#define CMD_SHUTDOWN 0x9000
+#define CMD_SHUTDOWN 0x9000
/* Failure Codes */
const char UNHANDLED_MSG_TYPE = 0x01;
@@ -69,7 +69,6 @@
const char ACCOUNT_VALIDATION_FAIL = 0x05;
-
#endif /* __NETMSGTYPES_H__ */
/*
Modified: rt^3/trunk/include/NewNodeOnNetMsg.h
===================================================================
--- rt^3/trunk/include/NewNodeOnNetMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/NewNodeOnNetMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -28,9 +28,8 @@
#include "GenericOneStringMsg.h"
-class NewNodeOnNetMsg: public GenericOneStringMsg
+class NewNodeOnNetMsg : public GenericOneStringMsg
{
-
public:
/* Normal Constructor */
NewNodeOnNetMsg(QString s);
@@ -47,7 +46,7 @@
QString getNewNodename();
};
-#endif
+#endif /* __NEWNODEONNETMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/NewSessionReqMsg.h
===================================================================
--- rt^3/trunk/include/NewSessionReqMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/NewSessionReqMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -28,11 +28,9 @@
#include "NetMsg.h"
-class NewSessionReqMsg: public NetMsg
+class NewSessionReqMsg : public NetMsg
{
-
public:
-
/* Normal Constructor */
NewSessionReqMsg(QString uname, QString passwd);
@@ -60,7 +58,8 @@
virtual bool _equals(const NetMsg& msg);
};
-#endif //__NEWSESSIONREQMSG_H__
+#endif /* __NEWSESSIONREQMSG_H__ */
+
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/include/PkgClient.h
===================================================================
--- rt^3/trunk/include/PkgClient.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/PkgClient.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -25,8 +25,10 @@
#ifndef __PKGCLIENT_H__
#define __PKGCLIENT_H__
+#include "pkgcppcommon.h"
+
#include "brlcad/pkg.h"
-#include "pkgcppcommon.h"
+
#include <stdio.h>
#include <iostream>
@@ -83,7 +85,6 @@
private:
std::string proto;
pkg_conn* conn;
-
};
#endif /* __PKGCLIENT_H__ */
Modified: rt^3/trunk/include/PkgServer.h
===================================================================
--- rt^3/trunk/include/PkgServer.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/PkgServer.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -50,7 +50,6 @@
virtual PkgClient*
getNewClient(pkg_conn* conn) = 0;
-
};
#endif /* __PKGSERVER_H__ */
Modified: rt^3/trunk/include/PkgTcpServer.h
===================================================================
--- rt^3/trunk/include/PkgTcpServer.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/PkgTcpServer.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -40,7 +40,6 @@
private:
PkgClient*
getNewClient(pkg_conn* conn);
-
};
#endif /* __PKGTCPSERVER_H__ */
Modified: rt^3/trunk/include/PkgUdpServer.h
===================================================================
--- rt^3/trunk/include/PkgUdpServer.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/PkgUdpServer.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -40,7 +40,6 @@
private:
PkgClient*
getNewClient(pkg_conn* conn);
-
};
#endif /* __PKGUDPSERVER_H__ */
Modified: rt^3/trunk/include/Portal.h
===================================================================
--- rt^3/trunk/include/Portal.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/Portal.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -31,6 +31,7 @@
#include "INetMsgHandler.h"
#include "PkgTcpClient.h"
#include "NetMsg.h"
+
#include "brlcad/pkg.h"
#include <QtCore/QString>
@@ -61,7 +62,6 @@
*/
int read();
-
private:
PortalManager* pm;
struct pkg_switch* callbackTable;
@@ -73,7 +73,7 @@
static void callbackSpringboard(struct pkg_conn* conn, char* buf);
};
-#endif
+#endif /* __PORTAL_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/PortalManager.h
===================================================================
--- rt^3/trunk/include/PortalManager.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/PortalManager.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -71,7 +71,7 @@
void handleDisconnectReqMsg(TypeOnlyMsg* msg);
};
-#endif
+#endif /* __PORTALMANAGER_H__ */
/*
* Local Variables:
Modified: rt^3/trunk/include/RemoteNodenameSetMsg.h
===================================================================
--- rt^3/trunk/include/RemoteNodenameSetMsg.h 2010-10-01 16:47:51 UTC (rev
40891)
+++ rt^3/trunk/include/RemoteNodenameSetMsg.h 2010-10-01 17:15:46 UTC (rev
40892)
@@ -28,11 +28,9 @@
#include "GenericOneStringMsg.h"
-class RemoteNodenameSetMsg: public GenericOneStringMsg
+class RemoteNodenameSetMsg : public GenericOneStringMsg
{
-
public:
-
/* Normal Constructor */
RemoteNodenameSetMsg(QString s);
@@ -46,10 +44,9 @@
virtual ~RemoteNodenameSetMsg();
QString getRemoteNodename();
-
};
-#endif //__REMOTENODENAMESETMSG_H__
+#endif /* __REMOTENODENAMESETMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/Session.h
===================================================================
--- rt^3/trunk/include/Session.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/Session.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -59,7 +59,7 @@
time_t lastAccess;
};
-#endif
+#endif /* __SESSION_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/SessionInfoMsg.h
===================================================================
--- rt^3/trunk/include/SessionInfoMsg.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/SessionInfoMsg.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -28,11 +28,9 @@
#include "NetMsg.h"
-class SessionInfoMsg: public NetMsg
+class SessionInfoMsg : public NetMsg
{
-
public:
-
/* Normal Constructor */
SessionInfoMsg(QUuid sessionID);
@@ -56,10 +54,10 @@
bool _serialize(QDataStream* ds);
bool _equals(const NetMsg& msg);
-
};
-#endif //__SESSIONINFOMSG_H__
+#endif /* __SESSIONINFOMSG_H__ */
+
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/include/SessionManager.h
===================================================================
--- rt^3/trunk/include/SessionManager.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/SessionManager.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -35,7 +35,7 @@
#include <QtCore/QMap>
#include <QtCore/QMutex>
-class SessionManager: public INetMsgHandler
+class SessionManager : public INetMsgHandler
{
public:
static SessionManager* getInstance();
@@ -63,7 +63,7 @@
void handleDisconnectReqMsg(TypeOnlyMsg* msg);
};
-#endif
+#endif /* __SESSIONMANAGER_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/SuccessMsg.h
===================================================================
--- rt^3/trunk/include/SuccessMsg.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/SuccessMsg.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -28,11 +28,9 @@
#include "GenericOneByteMsg.h"
-class SuccessMsg: public GenericOneByteMsg
+class SuccessMsg : public GenericOneByteMsg
{
-
public:
-
/* Normal Constructor */
SuccessMsg(quint8 successCode);
@@ -49,10 +47,9 @@
*Getters n Setters
*/
quint8 getSuccessCode();
-
};
-#endif
+#endif /* __SUCCESSMSG_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/include/TypeOnlyMsg.h
===================================================================
--- rt^3/trunk/include/TypeOnlyMsg.h 2010-10-01 16:47:51 UTC (rev 40891)
+++ rt^3/trunk/include/TypeOnlyMsg.h 2010-10-01 17:15:46 UTC (rev 40892)
@@ -28,9 +28,8 @@
#include "NetMsg.h"
-class TypeOnlyMsg: public NetMsg
+class TypeOnlyMsg : public NetMsg
{
-
public:
/* Normal Constructor */
TypeOnlyMsg(quint32 msgType);
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
