Revision: 40889
http://brlcad.svn.sourceforge.net/brlcad/?rev=40889&view=rev
Author: davidloman
Date: 2010-10-01 16:42:40 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
WS, Formatting, include organization, double newline removal, etc.
Modified Paths:
--------------
rt^3/trunk/src/GE/GED.cxx
rt^3/trunk/src/GE/GeometryEngine.cxx
rt^3/trunk/src/GE/libGeometry/CMakeLists.txt
rt^3/trunk/src/GE/libGeometry/NFFFileParser.cxx
rt^3/trunk/src/GE/libGeometry/RGB.cxx
rt^3/trunk/src/GE/libGeometry/Scene.cxx
rt^3/trunk/src/GE/libGeometry/SceneFactory.cxx
rt^3/trunk/src/GE/libGeometry/Vec.cxx
rt^3/trunk/src/GE/libGeometry/Vec.h
rt^3/trunk/src/GE/libImage/Pixel.cxx
rt^3/trunk/src/GE/libImage/PixelImage.cxx
rt^3/trunk/src/GE/libImage/PixelImage.h
rt^3/trunk/src/GE/libRaytrace/Ray.h
rt^3/trunk/src/GS/Account.cxx
rt^3/trunk/src/GS/AccountManager.cxx
rt^3/trunk/src/GS/CMakeLists.txt
rt^3/trunk/src/GS/DataManager.cxx
rt^3/trunk/src/GS/DbObject.cxx
rt^3/trunk/src/GS/DbObjectManifest.cxx
rt^3/trunk/src/GS/DbObjectManifest.h
rt^3/trunk/src/GS/FileDataSource.cxx
rt^3/trunk/src/GS/GeometryProcessor.cxx
rt^3/trunk/src/GS/GeometryService.cxx
rt^3/trunk/src/GS/Session.cxx
rt^3/trunk/src/GS/SessionManager.cxx
rt^3/trunk/src/GS/geoclient.cxx
rt^3/trunk/src/GS/geoserv.cxx
rt^3/trunk/src/adminpanel/ACPChatterBox.cxx
rt^3/trunk/src/adminpanel/ACPChatterBox.h
rt^3/trunk/src/adminpanel/AdminControlPanel.cxx
rt^3/trunk/src/adminpanel/AdminControlPanel.h
rt^3/trunk/src/adminpanel/CommandProcessor.cxx
rt^3/trunk/src/adminpanel/acpMain.cxx
rt^3/trunk/src/date/buildStamp.h
rt^3/trunk/src/g3d/CMakeLists.txt
rt^3/trunk/src/g3d/CameraMode.cxx
rt^3/trunk/src/g3d/CameraMode.h
rt^3/trunk/src/g3d/CameraModeBlender.cxx
rt^3/trunk/src/g3d/CameraModeBlender.h
rt^3/trunk/src/g3d/CameraModeMGED.cxx
rt^3/trunk/src/g3d/CameraModeMGED.h
rt^3/trunk/src/g3d/CameraModeOrbital.cxx
rt^3/trunk/src/g3d/CameraModeOrbital.h
rt^3/trunk/src/g3d/Command.cxx
rt^3/trunk/src/g3d/Command.h
rt^3/trunk/src/g3d/CommandInterpreter.cxx
rt^3/trunk/src/g3d/CommandInterpreter.h
rt^3/trunk/src/g3d/Commands.h
rt^3/trunk/src/g3d/Console.cxx
rt^3/trunk/src/g3d/GedCommand.cxx
rt^3/trunk/src/g3d/GedCommand.h
rt^3/trunk/src/g3d/GedCommands.h
rt^3/trunk/src/g3d/GedData.cxx
rt^3/trunk/src/g3d/GedData.h
rt^3/trunk/src/g3d/HistoryLineEdit.cxx
rt^3/trunk/src/g3d/Logger.cxx
rt^3/trunk/src/g3d/Logger.h
rt^3/trunk/src/g3d/MainWindow.cxx
rt^3/trunk/src/g3d/OgreGLWidget.cxx
rt^3/trunk/src/g3d/OgreGraphicsView.cxx
rt^3/trunk/src/g3d/SceneInputFilter.cxx
rt^3/trunk/src/g3d/main.cxx
Modified: rt^3/trunk/src/GE/GED.cxx
===================================================================
--- rt^3/trunk/src/GE/GED.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GE/GED.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -26,12 +26,10 @@
#include "GED.h"
GED::GED()
-{
-}
+{}
GED::~GED()
-{
-}
+{}
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/GeometryEngine.cxx
===================================================================
--- rt^3/trunk/src/GE/GeometryEngine.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GE/GeometryEngine.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -26,12 +26,10 @@
#include "GeometryEngine.h"
GeometryEngine::GeometryEngine()
-{
-}
+{}
GeometryEngine::~GeometryEngine()
-{
-}
+{}
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libGeometry/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/GE/libGeometry/CMakeLists.txt 2010-10-01 15:56:52 UTC
(rev 40888)
+++ rt^3/trunk/src/GE/libGeometry/CMakeLists.txt 2010-10-01 16:42:40 UTC
(rev 40889)
@@ -26,7 +26,6 @@
#
##########################################################################
-
PROJECT(LibGeometry)
#Add additional include dirs to INCLUDE_DIRS as needed
Modified: rt^3/trunk/src/GE/libGeometry/NFFFileParser.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/NFFFileParser.cxx 2010-10-01 15:56:52 UTC
(rev 40888)
+++ rt^3/trunk/src/GE/libGeometry/NFFFileParser.cxx 2010-10-01 16:42:40 UTC
(rev 40889)
@@ -294,7 +294,6 @@
}
void NFFFileParser::polygon_prim(Point &v1, Point &v2, Point &v3) {
-
int p_size;
double x_v, y_v, z_v;
@@ -338,7 +337,6 @@
}
void NFFFileParser::split(const std::string &str, std::vector<std::string>
&tokens) {
-
const std::string DELIMITERS = " ";
// Skip delimiters at beginning.
@@ -360,12 +358,10 @@
}
NFFFileParser::NFFFileParser(std::string filename)
-{
-}
+{}
NFFFileParser::~NFFFileParser()
-{
-}
+{}
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libGeometry/RGB.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/RGB.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GE/libGeometry/RGB.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -30,15 +30,12 @@
val[1]=0;
val[2]=0;
//// cout << " RGB::RGB()" << endl;
-
}
RGB:: RGB(double r, double g, double b){
-
val[0]=r;
val[1]=g;
val[2]=b;
//// cout << " RGB::RGB(r,g,b)" << endl;
-
}
double RGB::getBlue(){
//returns blue value
@@ -67,7 +64,6 @@
}
void RGB::add(RGB & p, RGB & q){
-
val[0]= p.val[0] + q.val[0];
val[1]= p.val[1] + q.val[1];
val[2]= p.val[2] + q.val[2];
Modified: rt^3/trunk/src/GE/libGeometry/Scene.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Scene.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GE/libGeometry/Scene.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -29,8 +29,7 @@
using namespace Geometry;
Scene::Scene()
-{
-}
+{}
Scene::~Scene()
{
Modified: rt^3/trunk/src/GE/libGeometry/SceneFactory.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/SceneFactory.cxx 2010-10-01 15:56:52 UTC
(rev 40888)
+++ rt^3/trunk/src/GE/libGeometry/SceneFactory.cxx 2010-10-01 16:42:40 UTC
(rev 40889)
@@ -53,7 +53,6 @@
bool SceneFactory::loadFromFile(std::string filename)
{
-
// filename should presently be at least X.EXT == size 5"
if (filename.size() <= 5) {
std::cerr << "filename is too short?" << std::endl;
@@ -64,12 +63,10 @@
// std::cout << "filename is " << filename << " and the extension is " <<
extension << std::endl;
if (std::equal(extension.begin(), extension.end(),
std::string(".dxf").begin(), SceneFactory::noCaseCompare)) {
-
Utility::FileParser<DXFFileParser, Scene> *dxfparser = new
Utility::FileParser<DXFFileParser, Scene>(filename);
_scene->add(dxfparser->getContainer());
} else if (std::equal(extension.begin(), extension.end(),
std::string(".nff").begin(), SceneFactory::noCaseCompare)) {
-
Utility::FileParser<NFFFileParser, Scene> *nffparser = new
Utility::FileParser<NFFFileParser, Scene>(filename);
_scene->add(nffparser->getContainer());
Modified: rt^3/trunk/src/GE/libGeometry/Vec.cxx
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Vec.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GE/libGeometry/Vec.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -81,7 +81,6 @@
Z+= v1.Z;
}
-
void Vec::sub(Vec v1) {
X-= v1.X;
Y-= v1.Y;
Modified: rt^3/trunk/src/GE/libGeometry/Vec.h
===================================================================
--- rt^3/trunk/src/GE/libGeometry/Vec.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GE/libGeometry/Vec.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -32,7 +32,6 @@
using std::cout;
using std::endl;
-
/**
* Stores 3D vector, makes components accessible, and has cross and dot
methods.
*/
@@ -40,7 +39,6 @@
friend std::ostream&
operator<<(std::ostream&, const Vec&);
-
public:
Vec();
Vec(double x, double y, double z);
@@ -102,7 +100,6 @@
#endif /* __VEC_H__ */
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GE/libImage/Pixel.cxx
===================================================================
--- rt^3/trunk/src/GE/libImage/Pixel.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GE/libImage/Pixel.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -23,19 +23,16 @@
*
*/
-
/* interface header */
#include "Image/Pixel.h"
using namespace Image;
Pixel::Pixel()
-{
-}
+{}
Pixel::~Pixel()
-{
-}
+{}
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GE/libImage/PixelImage.cxx
===================================================================
--- rt^3/trunk/src/GE/libImage/PixelImage.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GE/libImage/PixelImage.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -31,15 +31,11 @@
PixelImage::PixelImage(unsigned long int width, unsigned long int height) :
_width(width),
_height(height)
-{
-}
+{}
-
PixelImage::~PixelImage()
-{
-}
+{}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GE/libImage/PixelImage.h
===================================================================
--- rt^3/trunk/src/GE/libImage/PixelImage.h 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GE/libImage/PixelImage.h 2010-10-01 16:42:40 UTC (rev
40889)
@@ -30,7 +30,6 @@
namespace Image
{
-
class PixelImage
{
protected:
@@ -59,7 +58,6 @@
{
return _height;
}
-
}
#endif /* __PIXELIMAGE_H__ */
Modified: rt^3/trunk/src/GE/libRaytrace/Ray.h
===================================================================
--- rt^3/trunk/src/GE/libRaytrace/Ray.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GE/libRaytrace/Ray.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -54,7 +54,6 @@
}
}
-
#endif /* __RAY_H__ */
// Local Variables: ***
Modified: rt^3/trunk/src/GS/Account.cxx
===================================================================
--- rt^3/trunk/src/GS/Account.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GS/Account.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -30,16 +30,18 @@
this->stampLastAccess();
}
-Account::~Account() {
-}
+Account::~Account()
+{}
QString
-Account::getUname() {
+Account::getUname()
+{
return this->uname;
}
Portal*
-Account::getPortal() {
+Account::getPortal()
+{
return this->portal;
}
@@ -63,7 +65,6 @@
return now - this->lastAccess;
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/GS/AccountManager.cxx
===================================================================
--- rt^3/trunk/src/GS/AccountManager.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GS/AccountManager.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -41,7 +41,8 @@
delete this->accounts;
}
-AccountManager* AccountManager::getInstance()
+AccountManager*
+AccountManager::getInstance()
{
if (!AccountManager::pInstance) {
pInstance = new AccountManager();
@@ -52,7 +53,8 @@
/**
* returns 0 for bad login. Positive number is the accountID
*/
-quint32 AccountManager::validateLoginCreds(QString uname, QString passwd)
+quint32
+AccountManager::validateLoginCreds(QString uname, QString passwd)
{
//TODO put in REAL account validation here.
if (uname == "Guest" && passwd == "Guest") {
@@ -80,7 +82,8 @@
return -1;
}
-Account* AccountManager::login(QString uname, QString passwd, Portal* p)
+Account*
+AccountManager::login(QString uname, QString passwd, Portal* p)
{
quint32 id = this->validateLoginCreds(uname, passwd);
@@ -95,7 +98,6 @@
return acc;
}
-
Account*
AccountManager::newAccount(QString uname, Portal* p, quint32 id)
{
@@ -110,7 +112,6 @@
this->accountListLock.unlock();
if (a != NULL ) {
-
a->stampLastAccess();
} else {
//New
Modified: rt^3/trunk/src/GS/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/GS/CMakeLists.txt 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GS/CMakeLists.txt 2010-10-01 16:42:40 UTC (rev 40889)
@@ -37,7 +37,6 @@
#Set Libs
RT3_PROJECT_ADD_LIBS(
${QT_LIBRARIES}
- alf
net
utility
)
@@ -84,7 +83,6 @@
#Build the project
RT3_PROJECT_BUILD_LIB()
-
##############
##############
##############
Modified: rt^3/trunk/src/GS/DataManager.cxx
===================================================================
--- rt^3/trunk/src/GS/DataManager.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GS/DataManager.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -37,16 +37,13 @@
}
DataManager::~DataManager()
-{
-}
+{}
QString DataManager::getDbObjectByURL(QString url)
-{
-}
+{}
QString DataManager::getDbObjectByUUID(QUuid& uuid)
-{
-}
+{}
void
DataManager::addDataSource(IDataSource* source)
@@ -83,9 +80,6 @@
log->logERROR("DataManager", "handleGeometryChunkMsg(): NULL
Portal!");
return;
}
-
-
-
}
void
@@ -138,7 +132,6 @@
return;
}
-
} else if (reqType == REQ_BY_UUID) {
//Not implemented!!!
TypeOnlyMsg* tom = new TypeOnlyMsg(OPERATION_NOT_AVAILABLE,
msg);
@@ -152,7 +145,6 @@
}
}
-
DataManager* DataManager::getInstance()
{
if (!DataManager::pInstance)
Modified: rt^3/trunk/src/GS/DbObject.cxx
===================================================================
--- rt^3/trunk/src/GS/DbObject.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GS/DbObject.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -26,16 +26,16 @@
#include "DbObject.h"
-DbObject::DbObject(QString path, QByteArray* data) : path(path), id(NULL),
data(data)
-{
-}
+DbObject::DbObject(QString path, QByteArray* data) :
+ path(path), id(NULL), data(data)
+{}
-DbObject::DbObject(QUuid id, QByteArray* data) : path(""), id(id), data(data)
-{
-}
+DbObject::DbObject(QUuid id, QByteArray* data) :
+ path(""), id(id), data(data)
+{}
-DbObject::~DbObject() {
-}
+DbObject::~DbObject()
+{}
QString
DbObject::getPath()
Modified: rt^3/trunk/src/GS/DbObjectManifest.cxx
===================================================================
--- rt^3/trunk/src/GS/DbObjectManifest.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GS/DbObjectManifest.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -26,12 +26,10 @@
#include "DbObjectManifest.h"
DbObjectManifest::DbObjectManifest()
-{
-}
+{}
DbObjectManifest::~DbObjectManifest()
-{
-}
+{}
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GS/DbObjectManifest.h
===================================================================
--- rt^3/trunk/src/GS/DbObjectManifest.h 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GS/DbObjectManifest.h 2010-10-01 16:42:40 UTC (rev
40889)
@@ -29,11 +29,11 @@
#include <list>
#include <map>
#include <string>
+
#include <QtCore/QUuid>
class DbObjectManifest
{
-
public:
DbObjectManifest();
virtual ~DbObjectManifest();
@@ -41,10 +41,9 @@
private:
std::list<QUuid> DbObjectList;
std::map<QUuid, std::string > DbObjectMap;
-
};
-#endif
+#endif /* __DBOBJECTMANIFEST_H__ */
// Local Variables: ***
// mode: C++ ***
Modified: rt^3/trunk/src/GS/FileDataSource.cxx
===================================================================
--- rt^3/trunk/src/GS/FileDataSource.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GS/FileDataSource.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -29,23 +29,27 @@
#include <QtCore/QFile>
FileDataSource::FileDataSource(QString repoPath) :
- repoPath(repoPath) {
+ repoPath(repoPath)
+{}
-}
+FileDataSource::~FileDataSource()
+{}
-FileDataSource::~FileDataSource() {
-}
+bool
+FileDataSource::lock(DbObject* obj, Account* a)
+{}
-bool FileDataSource::lock(DbObject* obj, Account* a) {
-}
-bool FileDataSource::hasLock(DbObject* obj, Account* a) {
-}
-bool FileDataSource::unlock(DbObject* obj) {
-}
+bool
+FileDataSource::hasLock(DbObject* obj, Account* a)
+{}
+bool
+FileDataSource::unlock(DbObject* obj)
+{}
+
DbObject*
-FileDataSource::getByPath(QString path) {
-
+FileDataSource::getByPath(QString path)
+{
//See if there is a file lock on this path
bool hasLock = this->hasPathLock(path);
@@ -81,11 +85,14 @@
}
DbObject*
-FileDataSource::getByID(QUuid id) {
+FileDataSource::getByID(QUuid id)
+{
return NULL;
}
-bool FileDataSource::putObject(DbObject* obj) {
+bool
+FileDataSource::putObject(DbObject* obj)
+{
QString path = obj->getPath();
//See if there is a file lock on this path
@@ -111,19 +118,24 @@
return true;
}
-bool FileDataSource::hasPathLock(QString path) {
+bool
+FileDataSource::hasPathLock(QString path)
+{
QMutexLocker(&this->lockLock);
return this->pathLocks.contains(path);
}
-void FileDataSource::setPathLock(QString path) {
+void
+FileDataSource::setPathLock(QString path)
+{
QMutexLocker(&this->lockLock);
if (!this->pathLocks.contains(path)) {
this->pathLocks.append(path);
}
}
-void FileDataSource::remPathLock(QString path) {
+void
+FileDataSource::remPathLock(QString path) {
QMutexLocker(&this->lockLock);
this->pathLocks.append(path);
}
Modified: rt^3/trunk/src/GS/GeometryProcessor.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryProcessor.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GS/GeometryProcessor.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -30,13 +30,12 @@
GeometryProcessor* GeometryProcessor::pInstance = NULL;
-GeometryProcessor::GeometryProcessor() {
-}
+GeometryProcessor::GeometryProcessor() {}
-GeometryProcessor::~GeometryProcessor() {
-}
+GeometryProcessor::~GeometryProcessor() {}
-GeometryProcessor* GeometryProcessor::getInstance() {
+GeometryProcessor*
+GeometryProcessor::getInstance() {
if (!GeometryProcessor::pInstance) {
pInstance = new GeometryProcessor();
}
Modified: rt^3/trunk/src/GS/GeometryService.cxx
===================================================================
--- rt^3/trunk/src/GS/GeometryService.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GS/GeometryService.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -37,7 +37,6 @@
this->registerMsgRoutes();
this->dm = DataManager::getInstance();
-
}
GeometryService::~GeometryService()
@@ -51,7 +50,6 @@
return this->dm;
}
-
void
GeometryService::registerMsgRoutes()
{
@@ -97,7 +95,6 @@
return true;
}
-
bool
GeometryService::handleNetMsg(NetMsg* msg)
{
Modified: rt^3/trunk/src/GS/Session.cxx
===================================================================
--- rt^3/trunk/src/GS/Session.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GS/Session.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -33,8 +33,7 @@
}
Session::~Session()
-{
-}
+{}
QUuid Session::getSessionID()
{
@@ -46,7 +45,6 @@
return this->a;
}
-
void
Session::stampLastAccess()
{
Modified: rt^3/trunk/src/GS/SessionManager.cxx
===================================================================
--- rt^3/trunk/src/GS/SessionManager.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/GS/SessionManager.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -39,8 +39,7 @@
}
SessionManager::~SessionManager()
-{
-}
+{}
SessionManager* SessionManager::getInstance()
{
@@ -50,7 +49,6 @@
return SessionManager::pInstance;
}
-
Session*
SessionManager::newSession(Account* a)
{
@@ -178,7 +176,6 @@
//tell client about it.
SessionInfoMsg* info = s->generateSessionInfoMsg();
origin->send(info);
-
}
void
@@ -195,7 +192,6 @@
Session* s = this->getSession(origin);
this->remCache(s);
-
}
// Local Variables: ***
Modified: rt^3/trunk/src/GS/geoclient.cxx
===================================================================
--- rt^3/trunk/src/GS/geoclient.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GS/geoclient.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -24,7 +24,6 @@
*/
#include "GeometryService.h"
-
#include "libjob.h"
#include "libutility.h"
#include "libevent.h"
@@ -37,14 +36,18 @@
#include <QtCore/QString>
#include <QtCore/QStringList>
-
bool stayRun = true;
std::string prompt ="geoclient> ";
-void logInfo(QString s) {
+void
+logInfo(QString s)
+{
Logger::getInstance()->logINFO("geoclient", s);
}
-void logBanner(QString s) {
+
+void
+logBanner(QString s)
+{
Logger::getInstance()->logBANNER("geoclient", s);
}
@@ -52,7 +55,6 @@
* Prints the 'usage' statement to the console along with an optional message
*/
void printUsage(std::string customMsg) {
-
if (customMsg.length() > 0) {
customMsg += "\n";
QString s(customMsg.c_str());
@@ -83,7 +85,6 @@
return;
}
if(cmd == "sendshutdown") {
-
if (list.size() !=2 ) {
logInfo("useage: sendshutdown ip port");
return;
@@ -111,6 +112,7 @@
}
//Authenticate
+ //TODO Make session AUTH
//Send Shutdown
TypeOnlyMsg* tom = new TypeOnlyMsg(CMD_SHUTDOWN);
@@ -122,7 +124,6 @@
delete p;
return;
}
-
}
/*
@@ -133,7 +134,6 @@
* =====================
*/
-
int main(int argc, char* argv[])
{
Logger::getInstance();
@@ -155,3 +155,12 @@
logInfo("Exiting.");
return 0;
}
+
+// Local Variables:
+// tab-width: 8
+// mode: C++
+// c-basic-offset: 4
+// indent-tabs-mode: t
+// c-file-style: "stroustrup"
+// End:
+// ex: shiftwidth=4 tabstop=8
Modified: rt^3/trunk/src/GS/geoserv.cxx
===================================================================
--- rt^3/trunk/src/GS/geoserv.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/GS/geoserv.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -56,7 +56,6 @@
localNodename = "DefaultGSNodename";
}
-
log->logBANNER("geoserv", "Booting GeometryService: " + localNodename);
QString sport = c->getConfigValue("ListenPort");
@@ -76,12 +75,10 @@
return 1;
}
-
bool daemon = false;
GeometryService* gs = new GeometryService(localNodename, port);
-
//DataManager elements.
QString useFileRepo = c->getConfigValue("UseFileRepo").toLower();
if (useFileRepo == "yes" || useFileRepo == "true"){
@@ -97,15 +94,12 @@
gs->getDataManager()->addDataSource(fds);
}
-
-
if (daemon){
gs->start(); //will exit
} else {
gs->run(); //blocks
}
-
log->logINFO("geoserv", "Exiting...");
delete gs;
return 0;
Modified: rt^3/trunk/src/adminpanel/ACPChatterBox.cxx
===================================================================
--- rt^3/trunk/src/adminpanel/ACPChatterBox.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/adminpanel/ACPChatterBox.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -47,8 +47,7 @@
}
ACPChatterBox::~ACPChatterBox()
-{
-}
+{}
void ACPChatterBox::addC2S(QString type, QString data)
{
@@ -85,8 +84,8 @@
item.append(qsi03);
this->internalModel->insertRow(0, item);
-
}
+
// Local Variables:
// mode: C++
// tab-width: 8
Modified: rt^3/trunk/src/adminpanel/ACPChatterBox.h
===================================================================
--- rt^3/trunk/src/adminpanel/ACPChatterBox.h 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/adminpanel/ACPChatterBox.h 2010-10-01 16:42:40 UTC (rev
40889)
@@ -30,7 +30,7 @@
#include <QtCore/QString>
#include <QtGui/QStandardItemModel>
-class ACPChatterBox: public QTableView
+class ACPChatterBox : public QTableView
{
public:
ACPChatterBox();
Modified: rt^3/trunk/src/adminpanel/AdminControlPanel.cxx
===================================================================
--- rt^3/trunk/src/adminpanel/AdminControlPanel.cxx 2010-10-01 15:56:52 UTC
(rev 40888)
+++ rt^3/trunk/src/adminpanel/AdminControlPanel.cxx 2010-10-01 16:42:40 UTC
(rev 40889)
@@ -71,10 +71,8 @@
}
AdminControlPanel::~AdminControlPanel()
-{
+{}
-}
-
void AdminControlPanel::addNew()
{
QString str = this->cmdLineLineEdit->text();
Modified: rt^3/trunk/src/adminpanel/AdminControlPanel.h
===================================================================
--- rt^3/trunk/src/adminpanel/AdminControlPanel.h 2010-10-01 15:56:52 UTC
(rev 40888)
+++ rt^3/trunk/src/adminpanel/AdminControlPanel.h 2010-10-01 16:42:40 UTC
(rev 40889)
@@ -31,7 +31,7 @@
#include <QtGui/QLineEdit>
#include <QtGui/QWidget>
-class AdminControlPanel: public QObject
+class AdminControlPanel : public QObject
{
Q_OBJECT
@@ -48,7 +48,7 @@
ACPChatterBox *chatter;
};
-#endif
+#endif /* __ADMINCONTROLPANEL_H__ */
// Local Variables:
// mode: C++
Modified: rt^3/trunk/src/adminpanel/CommandProcessor.cxx
===================================================================
--- rt^3/trunk/src/adminpanel/CommandProcessor.cxx 2010-10-01 15:56:52 UTC
(rev 40888)
+++ rt^3/trunk/src/adminpanel/CommandProcessor.cxx 2010-10-01 16:42:40 UTC
(rev 40889)
@@ -39,11 +39,9 @@
QString cmd = cmdList[0];
if (cmd == "connect") {
-
} else {
//return new UnknownCommand(this->box, cmd);
}
-
}
// Local Variables:
Modified: rt^3/trunk/src/adminpanel/acpMain.cxx
===================================================================
--- rt^3/trunk/src/adminpanel/acpMain.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/adminpanel/acpMain.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -23,10 +23,10 @@
*
*/
+#include "AdminControlPanel.h"
+
#include <iostream>
-#include "AdminControlPanel.h"
-
#include <QtGui/QApplication>
int main(int argc, char* argv[])
@@ -37,6 +37,7 @@
return app.exec();
}
+
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/date/buildStamp.h
===================================================================
--- rt^3/trunk/src/date/buildStamp.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/date/buildStamp.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -5,7 +5,6 @@
extern const char *buildDate;
extern const char *buildTime;
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CMakeLists.txt
===================================================================
--- rt^3/trunk/src/g3d/CMakeLists.txt 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/CMakeLists.txt 2010-10-01 16:42:40 UTC (rev 40889)
@@ -93,7 +93,6 @@
INCLUDE_DIRECTORIES(${BRLCAD_INC_DIRS})
SET(LIBS ${LIBS} ${BRLCAD_LIBRARIES})
-
find_library(zzip_LIBRARY
NAMES zzip
)
Modified: rt^3/trunk/src/g3d/CameraMode.cxx
===================================================================
--- rt^3/trunk/src/g3d/CameraMode.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/CameraMode.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -35,7 +35,6 @@
#include "Logger.h"
-
/*******************************************************************************
* CameraMode
******************************************************************************/
@@ -262,7 +261,6 @@
return (degrees*M_PI)/180.0f;
}
-
void CameraMode::circularIncrement(float& var, float value, float limit)
{
var += value;
@@ -273,7 +271,6 @@
}
}
-
void CameraMode::multiplyVarWithLimit(float& var, float value, float limit)
{
var *= value;
@@ -301,7 +298,6 @@
}
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CameraMode.h
===================================================================
--- rt^3/trunk/src/g3d/CameraMode.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/CameraMode.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -37,12 +37,10 @@
#include <QtGui/QKeyEvent>
#include <QtGui/QMouseEvent>
-
namespace Ogre {
class Camera;
}
-
/** @brief Base class for camera mode
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -238,10 +236,8 @@
vect_t _center;
};
-
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CameraModeBlender.cxx
===================================================================
--- rt^3/trunk/src/g3d/CameraModeBlender.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/CameraModeBlender.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -33,7 +33,6 @@
#include "Logger.h"
-
/*******************************************************************************
* CameraModeBlender
******************************************************************************/
@@ -47,8 +46,7 @@
_dragModeOriginX(0), _dragModeOriginY(0),
_dragOriginalHorizontalRotation(0.0f), _dragOriginalVerticalRotation(0.0f),
_panModeEnabled(false)
-{
-}
+{}
bool CameraModeBlender::injectKeyPressed(QKeyEvent *e)
{
@@ -177,7 +175,6 @@
}
}
-
bool CameraModeBlender::injectMouseScrolled(Direction direction)
{
switch (direction) {
@@ -294,7 +291,6 @@
multiplyVarWithLimit(_radius, ZOOM_STEP, RADIUS_MAX_DISTANCE);
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CameraModeBlender.h
===================================================================
--- rt^3/trunk/src/g3d/CameraModeBlender.h 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/CameraModeBlender.h 2010-10-01 16:42:40 UTC (rev
40889)
@@ -30,10 +30,8 @@
#ifndef __G3D_CAMERAMODEBLENDER_H__
#define __G3D_CAMERAMODEBLENDER_H__
-
#include "CameraMode.h"
-
/** @brief Blender camera mode
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -111,7 +109,6 @@
/** Mode */
bool _panModeEnabled;
-
/** Common functionality for all places needing it */
void panUp();
/** Common functionality for all places needing it */
@@ -126,10 +123,8 @@
void doZoomOut();
};
-
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CameraModeMGED.cxx
===================================================================
--- rt^3/trunk/src/g3d/CameraModeMGED.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/CameraModeMGED.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -36,7 +36,6 @@
#include "Logger.h"
-
/*******************************************************************************
* CameraModeMGED
******************************************************************************/
@@ -407,7 +406,6 @@
pan(-(_camera->getOrthoWindowWidth()/PAN_FRACTION), 0);
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CameraModeMGED.h
===================================================================
--- rt^3/trunk/src/g3d/CameraModeMGED.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/CameraModeMGED.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -30,10 +30,8 @@
#ifndef __G3D_CAMERAMODEMGED_H__
#define __G3D_CAMERAMODEMGED_H__
-
#include "CameraMode.h"
-
/** @brief MGED camera mode
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -150,10 +148,8 @@
void panRight();
};
-
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CameraModeOrbital.cxx
===================================================================
--- rt^3/trunk/src/g3d/CameraModeOrbital.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/CameraModeOrbital.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -31,14 +31,12 @@
#include "Logger.h"
-
/*******************************************************************************
* CameraModeOrbital
******************************************************************************/
CameraModeOrbital::CameraModeOrbital() :
CameraMode("Orbital")
-{
-}
+{}
bool CameraModeOrbital::injectKeyPressed(QKeyEvent *e)
{
@@ -175,7 +173,6 @@
setResetToCenter(true);
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CameraModeOrbital.h
===================================================================
--- rt^3/trunk/src/g3d/CameraModeOrbital.h 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/CameraModeOrbital.h 2010-10-01 16:42:40 UTC (rev
40889)
@@ -30,10 +30,8 @@
#ifndef __G3D_CAMERAMODEORBITAL_H__
#define __G3D_CAMERAMODEORBITAL_H__
-
#include "CameraMode.h"
-
/** @brief Orbital camera mode
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -83,10 +81,8 @@
virtual void cameraControlCenterReleased();
};
-
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/Command.cxx
===================================================================
--- rt^3/trunk/src/g3d/Command.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/Command.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -30,7 +30,6 @@
#include "Command.h"
-
/*******************************************************************************
* CommandMessages
******************************************************************************/
@@ -38,7 +37,6 @@
const char* CommandMessages::ZERO_OR_ONE_ARGUMENTS = "This command needs
exactly zero or one argument";
const char* CommandMessages::ONE_ARGUMENT = "This command needs exactly one
argument";
-
/*******************************************************************************
* Command
******************************************************************************/
@@ -46,8 +44,7 @@
const QString& shortDescr,
const QString& extraDescr) :
_name(name), _shortDescription(shortDescr), _extraDescription(extraDescr)
-{
-}
+{}
const QString& Command::getName() const
{
@@ -78,7 +75,6 @@
return line;
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/Command.h
===================================================================
--- rt^3/trunk/src/g3d/Command.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/Command.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -29,10 +29,8 @@
#ifndef __G3D_COMMAND_H__
#define __G3D_COMMAND_H__
-
#include <QtCore/QStringList>
-
/**
* @brief Messages related with command processing
*
@@ -57,7 +55,6 @@
static const char* ONE_ARGUMENT;
};
-
/**
* @brief Command abstract class
*
@@ -106,7 +103,6 @@
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CommandInterpreter.cxx
===================================================================
--- rt^3/trunk/src/g3d/CommandInterpreter.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/CommandInterpreter.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -39,7 +39,6 @@
#include "GedCommand.h"
#include "GedCommands.h"
-
/*******************************************************************************
* CommandInterpreter
******************************************************************************/
@@ -233,7 +232,6 @@
return cL.trimmed().split(" ", QString::SkipEmptyParts);
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/CommandInterpreter.h
===================================================================
--- rt^3/trunk/src/g3d/CommandInterpreter.h 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/CommandInterpreter.h 2010-10-01 16:42:40 UTC (rev
40889)
@@ -37,11 +37,9 @@
#include "../utility/Singleton.h"
-
class Command;
class CommandOutput;
-
/**
* @brief Command Interpreter class
*
@@ -110,7 +108,6 @@
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/Commands.h
===================================================================
--- rt^3/trunk/src/g3d/Commands.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/Commands.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -29,7 +29,6 @@
#ifndef __G3D_COMMANDS_H__
#define __G3D_COMMANDS_H__
-
#include "Command.h"
#include <QtCore/QString>
@@ -57,7 +56,6 @@
};
#endif
-
/** @brief Set log message level.
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -77,7 +75,6 @@
if (args.length() != 1) {
return CommandMessages::ONE_ARGUMENT;
} else {
-
Logger::Level l = static_cast<Logger::Level>(0); // invalid level
const QChar firstChar = args[0][0];
if (firstChar == 'D') {
@@ -137,7 +134,6 @@
}
};
-
/** @brief Set Camera projection type.
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -169,7 +165,6 @@
}
};
-
/** @brief Cycle Camera mode.
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -195,7 +190,6 @@
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/Console.cxx
===================================================================
--- rt^3/trunk/src/g3d/Console.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/Console.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -63,7 +63,6 @@
entry->installEventFilter(this);
prompt->installEventFilter(this);
-
QObject::connect(entry, SIGNAL(returnPressed()),
this, SLOT(evalCmd()));
@@ -74,7 +73,6 @@
this, SLOT(homeOutput()));
}
-
bool Console::eventFilter(QObject *, QEvent *event)
{
switch(event->type())
@@ -104,7 +102,6 @@
entry->entryComplete();
}
-
void Console::pushOutput(const QString &str)
{
if(outputText.size()) {
Modified: rt^3/trunk/src/g3d/GedCommand.cxx
===================================================================
--- rt^3/trunk/src/g3d/GedCommand.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/GedCommand.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -32,7 +32,6 @@
#include "Logger.h"
-
/*******************************************************************************
* GedCommand
******************************************************************************/
@@ -41,10 +40,8 @@
const QString& shortDescr,
const QString& extraDescr) :
Command(name, shortDescr, extraDescr), _gedFunc(func)
-{
-}
+{}
-
QString GedCommand::execute(const QStringList& args)
{
const char **argv = new const char*[args.size()];
Modified: rt^3/trunk/src/g3d/GedCommand.h
===================================================================
--- rt^3/trunk/src/g3d/GedCommand.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/GedCommand.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -29,10 +29,8 @@
#ifndef __G3D_GEDCOMMAND_H__
#define __G3D_GEDCOMMAND_H__
-
#include "Command.h"
-
/**
* @brief Command for invoking libged functions
*
@@ -69,7 +67,6 @@
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/GedCommands.h
===================================================================
--- rt^3/trunk/src/g3d/GedCommands.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/GedCommands.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -29,14 +29,12 @@
#ifndef __G3D_GEDCOMMANDS_H__
#define __G3D_GEDCOMMANDS_H__
-
#include "GedCommand.h"
#include <QtCore/QString>
#include "GedData.h"
-
/** @brief Dump a full copy of the database
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -54,7 +52,6 @@
}
};
-
/** @brief Open a database for editing
*/
class CommandGedOpenDB : public GedCommand
@@ -70,7 +67,6 @@
}
};
-
/** @brief Solids on ray
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -87,7 +83,6 @@
}
};
-
/** @brief Get libged database file summary.
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -105,7 +100,6 @@
}
};
-
/** @brief Get/Set libged DB title.
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -123,7 +117,6 @@
}
};
-
/** @brief Get libged database file version.
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -140,7 +133,6 @@
}
};
-
/** @brief Erase all currently displayed geometry
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -159,7 +151,6 @@
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/GedData.cxx
===================================================================
--- rt^3/trunk/src/g3d/GedData.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/GedData.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -31,7 +31,6 @@
#include "Logger.h"
-
/*******************************************************************************
* GedData
******************************************************************************/
@@ -61,7 +60,6 @@
return _ged;
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/GedData.h
===================================================================
--- rt^3/trunk/src/g3d/GedData.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/GedData.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -30,18 +30,15 @@
#ifndef __G3D_GEDDATA_H__
#define __G3D_GEDDATA_H__
-
#include <brlcad/ged.h>
#include "../utility/Singleton.h"
-
struct db_i;
struct rt_wdb;
struct ged;
-
/** @brief Class containing libged-related data
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -67,15 +64,12 @@
/** GED context */
struct ged* _ged;
-
/** Default constructor */
GedData();
};
-
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/HistoryLineEdit.cxx
===================================================================
--- rt^3/trunk/src/g3d/HistoryLineEdit.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/HistoryLineEdit.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -32,8 +32,7 @@
HistoryLineEdit::HistoryLineEdit(QWidget *parent) : QLineEdit(parent),
history(1), historyIdx(0)
-{
-}
+{}
void HistoryLineEdit::keyPressEvent(QKeyEvent *event)
{
@@ -68,7 +67,6 @@
clear();
}
-
/*
* Local Variables:
* mode: C++
Modified: rt^3/trunk/src/g3d/Logger.cxx
===================================================================
--- rt^3/trunk/src/g3d/Logger.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/Logger.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -32,7 +32,6 @@
#include "Logger.h"
-
/// Max length for log messages
const int LOGSTR_LENGTH = 255;
/// Max length for timestamps (until Y10K, that is :) )
@@ -45,7 +44,6 @@
vsnprintf(formatBuffer, sizeof(formatBuffer), msg, arg);\
va_end(arg);
-
/*******************************************************************************
* Logger
******************************************************************************/
@@ -54,8 +52,7 @@
Logger::Level Logger::_levelFilter = Logger::DEBUG;
Logger::Logger()
-{
-}
+{}
void Logger::setLevelFilter(Level level)
{
@@ -137,7 +134,6 @@
}
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/Logger.h
===================================================================
--- rt^3/trunk/src/g3d/Logger.h 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/Logger.h 2010-10-01 16:42:40 UTC (rev 40889)
@@ -48,13 +48,11 @@
#ifndef __G3D_LOGGER_H__
#define __G3D_LOGGER_H__
-
/// If not using GCC, elide __attribute__
#ifndef __GNUC__
#define __attribute__(x) /* nothing */
#endif
-
#include <string>
#include <vector>
@@ -63,7 +61,6 @@
#include "../utility/Singleton.h"
-
/** @brief Class implementing logging facilities
*
* @author Manuel A. Fernandez Montecelo <[email protected]>
@@ -117,7 +114,6 @@
/** Attribute to save the logging level desired */
static Level _levelFilter;
-
/** Default constructor */
Logger();
@@ -127,7 +123,6 @@
#endif
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
Modified: rt^3/trunk/src/g3d/MainWindow.cxx
===================================================================
--- rt^3/trunk/src/g3d/MainWindow.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/MainWindow.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -94,7 +94,6 @@
delete ogreView;
}
-
void MainWindow::resizeEvent(QResizeEvent *event)
{
// Just large enough not to cause scrollbars to appear.
Modified: rt^3/trunk/src/g3d/OgreGLWidget.cxx
===================================================================
--- rt^3/trunk/src/g3d/OgreGLWidget.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/OgreGLWidget.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -90,13 +90,11 @@
Logger::logDEBUG("OGRE shutdown complete.");
}
-
CameraMode& OgreGLWidget::getCameraMode() const
{
return *_cameraCtl;
}
-
void OgreGLWidget::initializeGL()
{
Ogre::NameValuePairList params;
@@ -227,7 +225,6 @@
makeCurrent();
}
-
void OgreGLWidget::setProjection(int type)
{
if(_camera) {
Modified: rt^3/trunk/src/g3d/OgreGraphicsView.cxx
===================================================================
--- rt^3/trunk/src/g3d/OgreGraphicsView.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/OgreGraphicsView.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -34,7 +34,6 @@
{
static_cast<OgreGLWidget *>(viewport())->resizeGL(event->size().width(),
event->size().height());
QGraphicsView::resizeEvent(event);
-
}
void OgreGraphicsView::drawBackground(QPainter *, const QRectF &)
@@ -48,7 +47,6 @@
static_cast<OgreGLWidget *>(viewport())->swapBuffers();
}
-
/*
* Local Variables:
* mode: C++
Modified: rt^3/trunk/src/g3d/SceneInputFilter.cxx
===================================================================
--- rt^3/trunk/src/g3d/SceneInputFilter.cxx 2010-10-01 15:56:52 UTC (rev
40888)
+++ rt^3/trunk/src/g3d/SceneInputFilter.cxx 2010-10-01 16:42:40 UTC (rev
40889)
@@ -31,8 +31,7 @@
#include <QtGui/QGraphicsSceneWheelEvent>
SceneInputFilter::SceneInputFilter(OgreGLWidget *target) : _oglwidget(target)
-{
-}
+{}
bool SceneInputFilter::maybeUpdate(bool value)
{
Modified: rt^3/trunk/src/g3d/main.cxx
===================================================================
--- rt^3/trunk/src/g3d/main.cxx 2010-10-01 15:56:52 UTC (rev 40888)
+++ rt^3/trunk/src/g3d/main.cxx 2010-10-01 16:42:40 UTC (rev 40889)
@@ -63,7 +63,6 @@
return ret;
}
-
// Local Variables: ***
// mode: C++ ***
// tab-width: 8 ***
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
