Revision: 41582
http://brlcad.svn.sourceforge.net/brlcad/?rev=41582&view=rev
Author: davidloman
Date: 2010-12-13 19:53:33 +0000 (Mon, 13 Dec 2010)
Log Message:
-----------
Added in the first of many Default cstr, copy cstr and operator= disabling.
Modified Paths:
--------------
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/ControlledThread.h
rt^3/trunk/include/DataManager.h
rt^3/trunk/include/DataStreamUtils.h
rt^3/trunk/include/DbObject.h
rt^3/trunk/include/Event.h
rt^3/trunk/include/EventManager.h
rt^3/trunk/include/EventSubscriber.h
rt^3/trunk/include/FailureMsg.h
rt^3/trunk/include/FileDataSource.h
rt^3/trunk/include/GenericMultiByteMsg.h
rt^3/trunk/include/GenericOneByteMsg.h
rt^3/trunk/include/GenericOneStringMsg.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/NetMsg.h
Modified: rt^3/trunk/include/Account.h
===================================================================
--- rt^3/trunk/include/Account.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/Account.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -49,6 +49,13 @@
Portal* portal;
time_t lastAccess;
+
+
+private:
+ //Disable copy cstr and =operator
+ Account(Account const&){};
+ Account& operator=(Account const&){};
+
};
#endif /* __ACCOUNT_H__ */
Modified: rt^3/trunk/include/AccountManager.h
===================================================================
--- rt^3/trunk/include/AccountManager.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/AccountManager.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -51,6 +51,11 @@
quint32 validateLoginCreds(QString uname, QString passwd);
Account* newAccount(QString uname, Portal* p, quint32 id);
+
+ //Disable copy cstr and =operator
+ AccountManager(AccountManager const&){};
+ AccountManager& operator=(AccountManager const&){};
+
};
#endif /* __ACCOUNTMANAGER_H__ */
Modified: rt^3/trunk/include/AppLauncher.h
===================================================================
--- rt^3/trunk/include/AppLauncher.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/AppLauncher.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -42,6 +42,10 @@
private:
BaseApp* _app;
+
+ //Disable copy cstr and =operator
+ AppLauncher(AppLauncher const&){};
+ AppLauncher& operator=(AppLauncher const&){};
};
#endif /* __APPLAUNCHER_H__ */
Modified: rt^3/trunk/include/BaseApp.h
===================================================================
--- rt^3/trunk/include/BaseApp.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/BaseApp.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -44,6 +44,13 @@
/* Force subclasses to implement _run() */
virtual int _run() = 0;
+
+
+private:
+ //Disable copy cstr and =operator
+ BaseApp(BaseApp const&){};
+ BaseApp& operator=(BaseApp const&){};
+
};
#endif /* __BASEAPP_H__ */
Modified: rt^3/trunk/include/ControlledThread.h
===================================================================
--- rt^3/trunk/include/ControlledThread.h 2010-12-13 19:47:01 UTC (rev
41581)
+++ rt^3/trunk/include/ControlledThread.h 2010-12-13 19:53:33 UTC (rev
41582)
@@ -58,6 +58,12 @@
QString threadName;
bool runCmd;
bool runStatus;
+
+private:
+ //Disable copy cstr and =operator
+ ControlledThread(ControlledThread const&){};
+ ControlledThread& operator=(ControlledThread const&){};
+
};
#endif /* __CONTROLLEDTHREAD_H__ */
Modified: rt^3/trunk/include/DataManager.h
===================================================================
--- rt^3/trunk/include/DataManager.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/DataManager.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -59,6 +59,10 @@
void handleGeometryReqMsg(GeometryReqMsg* msg);
void handleGeometryChunkMsg(GeometryChunkMsg* msg);
+
+ //Disable copy cstr and =operator
+ DataManager(DataManager const&){};
+ DataManager& operator=(DataManager const&){};
};
#endif /* __DATAMANAGER_H__ */
Modified: rt^3/trunk/include/DataStreamUtils.h
===================================================================
--- rt^3/trunk/include/DataStreamUtils.h 2010-12-13 19:47:01 UTC (rev
41581)
+++ rt^3/trunk/include/DataStreamUtils.h 2010-12-13 19:53:33 UTC (rev
41582)
@@ -41,7 +41,11 @@
static void printQByteArray(QByteArray* ba);
private:
- Utils(){}
+ Utils(){};
+
+ //Disable copy cstr and =operator
+ Utils(Utils const&){};
+ Utils& operator=(Utils const&){};
};
#endif /* __DATASTREAMUTILS_H__ */
Modified: rt^3/trunk/include/DbObject.h
===================================================================
--- rt^3/trunk/include/DbObject.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/DbObject.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -46,6 +46,11 @@
QString path;
QUuid id;
QByteArray* data;
+
+ //Disable copy cstr and =operator
+ DbObject(DbObject const&){};
+ DbObject& operator=(DbObject const&){};
+
};
#endif /* __DBOBJECT_H__ */
Modified: rt^3/trunk/include/Event.h
===================================================================
--- rt^3/trunk/include/Event.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/Event.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -45,6 +45,10 @@
EventPublisher* _pub;
quint32 _eventType;
QString _message;
+
+ /* Disable copy cstr and =operator */
+ Event(Event const&){};
+ Event& operator=(Event const&){};
};
#endif /* __EVENT_H__ */
Modified: rt^3/trunk/include/EventManager.h
===================================================================
--- rt^3/trunk/include/EventManager.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/EventManager.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -62,6 +62,10 @@
QMutex* subscriptionsLock;
QList<EventSubscription*>* subscriptions;
+
+ /* Disable copy cstr and =operator */
+ EventManager(EventManager const&){};
+ EventManager& operator=(EventManager const&){};
};
#endif /* __EVENTMANAGER_H__ */
Modified: rt^3/trunk/include/EventSubscriber.h
===================================================================
--- rt^3/trunk/include/EventSubscriber.h 2010-12-13 19:47:01 UTC (rev
41581)
+++ rt^3/trunk/include/EventSubscriber.h 2010-12-13 19:53:33 UTC (rev
41582)
@@ -43,7 +43,7 @@
* eventType can be a value > 0, or ALL_EVENT_TYPES
* pub should be a pointer to an EventPublisher object, or can be
ALL_EVENT_PUBLISHERS
*/
- void subscribeMe(quint32 eventType, EventPublisher* pub);
+ void subscribeMe(quint32 eventType, EventPublisher* pub); //TODO SHould
this be here??!
};
#endif /* __EVENTSUBSCRIBER_H__ */
Modified: rt^3/trunk/include/FailureMsg.h
===================================================================
--- rt^3/trunk/include/FailureMsg.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/FailureMsg.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -47,6 +47,12 @@
*Getters n Setters
*/
quint8 getFailureCode();
+
+private:
+ /* Disable copy cstr and =operator */
+ FailureMsg(FailureMsg const&):GenericOneByteMsg(0,(quint8)0){};
+ FailureMsg& operator=(FailureMsg const&){};
+
};
#endif /* __FAILUREMSG_H__ */
Modified: rt^3/trunk/include/FileDataSource.h
===================================================================
--- rt^3/trunk/include/FileDataSource.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/FileDataSource.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -52,6 +52,10 @@
bool hasPathLock(QString path);
void setPathLock(QString path);
void remPathLock(QString path);
+
+ /* Disable copy cstr and =operator */
+ FileDataSource(FileDataSource const&){};
+ FileDataSource& operator=(FileDataSource const&){};
};
#endif /* __FILEDATASOURCE_H__ */
Modified: rt^3/trunk/include/GenericMultiByteMsg.h
===================================================================
--- rt^3/trunk/include/GenericMultiByteMsg.h 2010-12-13 19:47:01 UTC (rev
41581)
+++ rt^3/trunk/include/GenericMultiByteMsg.h 2010-12-13 19:53:33 UTC (rev
41582)
@@ -59,6 +59,12 @@
virtual bool _serialize(QDataStream* ds);
virtual bool _equals(const NetMsg& msg);
+
+private:
+ /* Disable copy cstr and =operator */
+ GenericMultiByteMsg(GenericMultiByteMsg const&):NetMsg(0){};
+ GenericMultiByteMsg& operator=(GenericMultiByteMsg const&){};
+
};
#endif /* __GENERICMULTIBYTEMSG_H__ */
Modified: rt^3/trunk/include/GenericOneByteMsg.h
===================================================================
--- rt^3/trunk/include/GenericOneByteMsg.h 2010-12-13 19:47:01 UTC (rev
41581)
+++ rt^3/trunk/include/GenericOneByteMsg.h 2010-12-13 19:53:33 UTC (rev
41582)
@@ -54,6 +54,12 @@
virtual bool _serialize(QDataStream* ds);
virtual bool _equals(const NetMsg& msg);
+
+private:
+ /* Disable copy cstr and =operator */
+ GenericOneByteMsg(GenericOneByteMsg const&): NetMsg(0){};
+ GenericOneByteMsg& operator=(GenericOneByteMsg const&){};
+
};
#endif /* __GENERICONEBYTEMSG_H__ */
Modified: rt^3/trunk/include/GenericOneStringMsg.h
===================================================================
--- rt^3/trunk/include/GenericOneStringMsg.h 2010-12-13 19:47:01 UTC (rev
41581)
+++ rt^3/trunk/include/GenericOneStringMsg.h 2010-12-13 19:53:33 UTC (rev
41582)
@@ -54,6 +54,10 @@
virtual bool _serialize(QDataStream* ds);
virtual bool _equals(const NetMsg& msg);
+
+ /* Disable copy cstr and =operator */
+ GenericOneStringMsg(GenericOneStringMsg const&):NetMsg(0){};
+ GenericOneStringMsg& operator=(GenericOneStringMsg const&){};
};
#endif /* __GENERICONESTRINGMSG_H__ */
Modified: rt^3/trunk/include/GeometryChunkMsg.h
===================================================================
--- rt^3/trunk/include/GeometryChunkMsg.h 2010-12-13 19:47:01 UTC (rev
41581)
+++ rt^3/trunk/include/GeometryChunkMsg.h 2010-12-13 19:53:33 UTC (rev
41582)
@@ -42,6 +42,11 @@
/* Destructor */
virtual ~GeometryChunkMsg();
+
+private:
+ /* Disable copy cstr and =operator */
+ GeometryChunkMsg(GeometryChunkMsg const&):GenericMultiByteMsg(0,NULL){};
+ GeometryChunkMsg& operator=(GeometryChunkMsg const&){};
};
#endif /* __GEOMETRYCHUNKMSG_H__ */
Modified: rt^3/trunk/include/GeometryManifestMsg.h
===================================================================
--- rt^3/trunk/include/GeometryManifestMsg.h 2010-12-13 19:47:01 UTC (rev
41581)
+++ rt^3/trunk/include/GeometryManifestMsg.h 2010-12-13 19:53:33 UTC (rev
41582)
@@ -59,6 +59,11 @@
bool _serialize(QDataStream* ds);
bool _equals(const NetMsg& msg);
+
+ /* Disable copy cstr and =operator */
+ GeometryManifestMsg(GeometryManifestMsg const&):NetMsg(0){};
+ GeometryManifestMsg& operator=(GeometryManifestMsg const&){};
+
};
#endif /* __GEOMETRYMANIFESTMSG_H__ */
Modified: rt^3/trunk/include/GeometryReqMsg.h
===================================================================
--- rt^3/trunk/include/GeometryReqMsg.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/GeometryReqMsg.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -58,6 +58,10 @@
bool _serialize(QDataStream* ds);
bool _equals(const NetMsg& msg);
+
+ /* Disable copy cstr and =operator */
+ GeometryReqMsg(GeometryReqMsg const&):GenericOneStringMsg(0,""){};
+ GeometryReqMsg& operator=(GeometryReqMsg const&){};
};
#endif /* __GEOMETRYREQMSG_H__ */
Modified: rt^3/trunk/include/GeometryService.h
===================================================================
--- rt^3/trunk/include/GeometryService.h 2010-12-13 19:47:01 UTC (rev
41581)
+++ rt^3/trunk/include/GeometryService.h 2010-12-13 19:53:33 UTC (rev
41582)
@@ -54,6 +54,11 @@
DataManager* dm;
void registerMsgRoutes();
+
+ /* Disable copy cstr and =operator */
+ GeometryService(GeometryService const&){};
+ GeometryService& operator=(GeometryService const&){};
+
};
#endif /* __GEOMETRYSERVICE_H__ */
Modified: rt^3/trunk/include/JobManager.h
===================================================================
--- rt^3/trunk/include/JobManager.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/JobManager.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -84,8 +84,6 @@
JobManager();
static QMutex* singletonLock;
- JobManager(JobManager const&){};
- JobManager& operator=(JobManager const&){};
QList<JobWorker*>* jobWorkers;
QList<AbstractJob*>* jobQueue;
@@ -93,6 +91,11 @@
Logger* log;
bool acceptJobs;
+
+ //Disable copy cstr and =operator
+ JobManager(JobManager const&){};
+ JobManager& operator=(JobManager const&){};
+
};
#endif /* __JOBMANAGER_H__ */
Modified: rt^3/trunk/include/NetMsg.h
===================================================================
--- rt^3/trunk/include/NetMsg.h 2010-12-13 19:47:01 UTC (rev 41581)
+++ rt^3/trunk/include/NetMsg.h 2010-12-13 19:53:33 UTC (rev 41582)
@@ -87,14 +87,21 @@
private:
/* Disable Default Constructor */
NetMsg(){};
+
+ /* Disable copy cstr and =operator */
+ NetMsg(NetMsg const&){};
+ NetMsg& operator=(NetMsg const&){};
+
};
#endif /* __NETMSG_H__ */
-// Local Variables: ***
-// mode: C++ ***
-// tab-width: 8 ***
-// c-basic-offset: 2 ***
-// indent-tabs-mode: t ***
-// End: ***
-// ex: shiftwidth=2 tabstop=8
+/*
+ * Local Variables: ***
+ * mode: C++ ***
+ * tab-width: 8 ***
+ * c-basic-offset: 2 ***
+ * indent-tabs-mode: t ***
+ * End: ***
+ * ex: shiftwidth=2 tabstop=8
+*/
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Lotusphere 2011
Register now for Lotusphere 2011 and learn how
to connect the dots, take your collaborative environment
to the next level, and enter the era of Social Business.
http://p.sf.net/sfu/lotusphere-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
