[brlcad-commits] SF.net SVN: brlcad:[43166] geomcore/trunk
Open Source Solid Modeling CAD
Brought to you by:
brlcad
From: <eri...@us...> - 2011-02-09 16:09:06
|
Revision: 43166 http://brlcad.svn.sourceforge.net/brlcad/?rev=43166&view=rev Author: erikgreenwald Date: 2011-02-09 16:08:55 +0000 (Wed, 09 Feb 2011) Log Message: ----------- removal of some unnecessary QT-isms Modified Paths: -------------- geomcore/trunk/include/AbstractClientCmd.h geomcore/trunk/include/Account.h geomcore/trunk/include/AccountManager.h geomcore/trunk/include/AppLauncher.h geomcore/trunk/include/ClientCmdRegistry.h geomcore/trunk/include/Config.h geomcore/trunk/include/ControlledThread.h geomcore/trunk/include/DataManager.h geomcore/trunk/include/DataStreamUtils.h geomcore/trunk/include/DbObject.h geomcore/trunk/include/Event.h geomcore/trunk/include/EventPublisher.h geomcore/trunk/include/EventSubscriber.h geomcore/trunk/include/ExitCmd.h geomcore/trunk/include/FileDataSource.h geomcore/trunk/include/GSClient.h geomcore/trunk/include/GSCmdLineClient.h geomcore/trunk/include/GSException.h geomcore/trunk/include/GenericEightBytesMsg.h geomcore/trunk/include/GenericFourBytesMsg.h geomcore/trunk/include/GenericMultiByteMsg.h geomcore/trunk/include/GenericOneByteMsg.h geomcore/trunk/include/GenericOneStringMsg.h geomcore/trunk/include/GenericTwoBytesMsg.h geomcore/trunk/include/GeometryManifestMsg.h geomcore/trunk/include/GeometryReqMsg.h geomcore/trunk/include/GeometryService.h geomcore/trunk/include/HelpCmd.h geomcore/trunk/include/IDataSource.h geomcore/trunk/include/Logger.h geomcore/trunk/include/LoginCmd.h geomcore/trunk/include/LogoutCmd.h geomcore/trunk/include/NetMsg.h geomcore/trunk/include/NetMsgFactory.h geomcore/trunk/include/NewNodeOnNetMsg.h geomcore/trunk/include/NewSessionReqMsg.h geomcore/trunk/include/PingCmd.h geomcore/trunk/include/PingMsg.h geomcore/trunk/include/PongMsg.h geomcore/trunk/include/Portal.h geomcore/trunk/include/PortalManager.h geomcore/trunk/include/RemoteNodenameSetMsg.h geomcore/trunk/include/SessionInfoMsg.h geomcore/trunk/include/ShutdownCmd.h geomcore/trunk/src/GS/Account.cxx geomcore/trunk/src/GS/AccountManager.cxx geomcore/trunk/src/GS/DataManager.cxx geomcore/trunk/src/GS/DbObject.cxx geomcore/trunk/src/GS/FileDataSource.cxx geomcore/trunk/src/GS/GSClient.cxx geomcore/trunk/src/GS/GSCmdLineClient.cxx geomcore/trunk/src/GS/GeometryService.cxx geomcore/trunk/src/GS/SessionManager.cxx geomcore/trunk/src/GS/cmds/AbstractClientCmd.cxx geomcore/trunk/src/GS/cmds/ClientCmdRegistry.cxx geomcore/trunk/src/GS/cmds/ExitCmd.cxx geomcore/trunk/src/GS/cmds/HelpCmd.cxx geomcore/trunk/src/GS/cmds/LoginCmd.cxx geomcore/trunk/src/GS/cmds/LogoutCmd.cxx geomcore/trunk/src/GS/cmds/PingCmd.cxx geomcore/trunk/src/GS/cmds/ShutdownCmd.cxx geomcore/trunk/src/GS/geoclient.cxx geomcore/trunk/src/GS/geoserv.cxx geomcore/trunk/src/libEvent/Event.cxx geomcore/trunk/src/libEvent/EventPublisher.cxx geomcore/trunk/src/libJob/JobManager.cxx geomcore/trunk/src/libNet/NetMsgFactory.cxx geomcore/trunk/src/libNet/NetMsgRouter.cxx geomcore/trunk/src/libNet/Portal.cxx geomcore/trunk/src/libNet/PortalManager.cxx geomcore/trunk/src/libNet/netMsg/GenericEightBytesMsg.cxx geomcore/trunk/src/libNet/netMsg/GenericFourBytesMsg.cxx geomcore/trunk/src/libNet/netMsg/GenericMultiByteMsg.cxx geomcore/trunk/src/libNet/netMsg/GenericOneByteMsg.cxx geomcore/trunk/src/libNet/netMsg/GenericOneStringMsg.cxx geomcore/trunk/src/libNet/netMsg/GenericTwoBytesMsg.cxx geomcore/trunk/src/libNet/netMsg/GeometryManifestMsg.cxx geomcore/trunk/src/libNet/netMsg/GeometryReqMsg.cxx geomcore/trunk/src/libNet/netMsg/NetMsg.cxx geomcore/trunk/src/libNet/netMsg/NewNodeOnNetMsg.cxx geomcore/trunk/src/libNet/netMsg/NewSessionReqMsg.cxx geomcore/trunk/src/libNet/netMsg/RemoteNodenameSetMsg.cxx geomcore/trunk/src/libNet/netMsg/SessionInfoMsg.cxx geomcore/trunk/src/utility/Config.cxx geomcore/trunk/src/utility/ControlledThread.cxx geomcore/trunk/src/utility/DataStreamUtils.cxx geomcore/trunk/src/utility/GSException.cxx geomcore/trunk/src/utility/Logger.cxx geomcore/trunk/tests/GS/GeometryServiceTest.cxx Modified: geomcore/trunk/include/AbstractClientCmd.h =================================================================== --- geomcore/trunk/include/AbstractClientCmd.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/AbstractClientCmd.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -28,23 +28,23 @@ #include "Logger.h" #include "GSCmdLineClient.h" -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <string> +#include <QStringList> class AbstractClientCmd { public: virtual ~AbstractClientCmd(); bool exec(GSCmdLineClient* client, QStringList args); - QString getCmd(); - virtual QString getUsage() = 0; - virtual QString getHelp() = 0; + std::string getCmd(); + virtual std::string getUsage() = 0; + virtual std::string getHelp() = 0; void printUsage(); void printHelp(); protected: - AbstractClientCmd(QString cmd); + AbstractClientCmd(std::string cmd); AbstractClientCmd(AbstractClientCmd* acCmd); virtual bool _exec(GSCmdLineClient* client, QStringList args) = 0; @@ -52,7 +52,7 @@ Logger* log; private: - QString cmd; + std::string cmd; }; #endif /* __ABSTRACTCLIENTCMD_H__ */ Modified: geomcore/trunk/include/Account.h =================================================================== --- geomcore/trunk/include/Account.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/Account.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -30,14 +30,14 @@ #include <ctime> -#include <QtCore/QString> +#include <string> class Account { public: - Account(QString uname, Portal* portal, quint32 id); + Account(std::string uname, Portal* portal, quint32 id); virtual ~Account(); - QString getUname(); + std::string getUname(); time_t getInactivityTime(); void stampLastAccess(); quint32 getID(); @@ -45,7 +45,7 @@ private: quint32 id; - QString uname; + std::string uname; Portal* portal; time_t lastAccess; Modified: geomcore/trunk/include/AccountManager.h =================================================================== --- geomcore/trunk/include/AccountManager.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/AccountManager.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -31,7 +31,7 @@ #include "Session.h" #include "Portal.h" -#include <QtCore/QString> +#include <string> #include <QtCore/QList> class AccountManager @@ -39,7 +39,7 @@ public: virtual ~AccountManager(); static AccountManager* getInstance(); - Account* login(QString uname, QString passwd, Portal* p); + Account* login(std::string uname, std::string passwd, Portal* p); void logout(Account* a); private: @@ -50,8 +50,8 @@ QMutex accountListLock; QList<Account*>* accounts; - qint32 validateLoginCreds(QString uname, QString passwd); - Account* newAccount(QString uname, Portal* p, quint32 id); + qint32 validateLoginCreds(std::string uname, std::string passwd); + Account* newAccount(std::string uname, Portal* p, quint32 id); void remAccount(Account* a); /* Disable copy cstr and =operator */ Modified: geomcore/trunk/include/AppLauncher.h =================================================================== --- geomcore/trunk/include/AppLauncher.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/AppLauncher.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include "BaseApp.h" #include <QtCore/QCoreApplication> -#include <QtCore/QString> +#include <string> #include <QtCore/QUuid> class AppLauncher : public QCoreApplication Modified: geomcore/trunk/include/ClientCmdRegistry.h =================================================================== --- geomcore/trunk/include/ClientCmdRegistry.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/ClientCmdRegistry.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include "Logger.h" -#include <QtCore/QString> +#include <string> #include <QtCore/QMap> #include <QtCore/QList> #include <QtCore/QMutex> @@ -43,9 +43,9 @@ virtual ~ClientCmdRegistry(); bool registerCmd(AbstractClientCmd* cmd); - AbstractClientCmd* getCmd(QString cmd); + AbstractClientCmd* getCmd(std::string cmd); - QList<QString>* getListOfCmds(); + QList<std::string>* getListOfCmds(); private: static ClientCmdRegistry* pInstance; @@ -53,7 +53,7 @@ Logger* log; QMutex mapLock; - QMap<QString,AbstractClientCmd*>* cmdMap; + QMap<std::string,AbstractClientCmd*>* cmdMap; /* Disable copy cstr and =operator */ ClientCmdRegistry(ClientCmdRegistry const&){}; Modified: geomcore/trunk/include/Config.h =================================================================== --- geomcore/trunk/include/Config.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/Config.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include "Logger.h" #include <QtCore/QMap> -#include <QtCore/QString> +#include <string> #include <QtCore/QMutex> class Config @@ -38,23 +38,23 @@ ~Config(); static Config* getInstance(); - bool loadFile(QString pathAndFileName, bool verbose = false); - QString getConfigValue(QString key); - void updateValue(QString key, QString value); - QList<QString> getAllKeys(); + bool loadFile(std::string pathAndFileName, bool verbose = false); + std::string getConfigValue(std::string key); + void updateValue(std::string key, std::string value); + QList<std::string> getAllKeys(); private: Config(); /* Turn off Default cstr */ Config(const Config& c){}; /* Turn off Copy cstr */ Config& operator=(const Config& c){}; /* Turn off equal oper */ - QString processLine(QString line); - void removeAllOccurances(QString* data, QString search, - QString replace); + std::string processLine(std::string line); + void removeAllOccurances(std::string* data, std::string search, + std::string replace); Logger* log; QMutex mapLock; - QMap<QString, QString>* configMap; + QMap<std::string, std::string>* configMap; static Config* pInstance; }; Modified: geomcore/trunk/include/ControlledThread.h =================================================================== --- geomcore/trunk/include/ControlledThread.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/ControlledThread.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -26,20 +26,19 @@ #include "GSThread.h" -#include <QtCore/QString> #include <QtCore/QMutex> class ControlledThread : public GSThread { public: - ControlledThread(QString threadname = ""); + ControlledThread(std::string threadname = ""); virtual ~ControlledThread(); void start(); void run(); void shutdown(bool block = true); - QString getThreadName(); + std::string getThreadName(); bool getRunStatus(); bool getRunCmd(); @@ -62,7 +61,7 @@ private: /* fields */ - QString threadName; + std::string threadName; QMutex runCmdLock; volatile bool runCmd; Modified: geomcore/trunk/include/DataManager.h =================================================================== --- geomcore/trunk/include/DataManager.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/DataManager.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -33,7 +33,7 @@ #include "GeometryChunkMsg.h" #include "Logger.h" -#include <QtCore/QString> +#include <string> #include <QtCore/QUuid> #include <QtCore/QMutex> @@ -44,8 +44,8 @@ virtual ~DataManager(); bool handleNetMsg(NetMsg* msg); - QString getDbObjectByURL(QString url); - QString getDbObjectByUUID(QUuid& uuid); + std::string getDbObjectByURL(std::string url); + std::string getDbObjectByUUID(QUuid& uuid); void addDataSource(IDataSource* source); Modified: geomcore/trunk/include/DataStreamUtils.h =================================================================== --- geomcore/trunk/include/DataStreamUtils.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/DataStreamUtils.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -26,7 +26,7 @@ #ifndef __DATASTREAMUTILS_H__ #define __DATASTREAMUTILS_H__ -#include <QtCore/QString> +#include <string> #include <QtCore/QDataStream> #include <QtCore/QUuid> #include <iostream> @@ -34,8 +34,8 @@ class DataStreamUtils { public: - static QString* getString(QDataStream* ds); - static void putString(QDataStream* ds, QString str); + static std::string* getString(QDataStream* ds); + static void putString(QDataStream* ds, std::string str); static QUuid* getQUuid(QDataStream* ds); static void putQUuid(QDataStream* ds, QUuid str); static void printQByteArray(QByteArray* ba); Modified: geomcore/trunk/include/DbObject.h =================================================================== --- geomcore/trunk/include/DbObject.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/DbObject.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -27,23 +27,23 @@ #ifndef __DBOBJECT_H__ #define __DBOBJECT_H__ -#include <QtCore/QString> +#include <string> #include <QtCore/QUuid> #include <QtCore/QByteArray> class DbObject { public: - DbObject(QString path, QByteArray* data); + DbObject(std::string path, QByteArray* data); DbObject(QUuid id, QByteArray* data); virtual ~DbObject(); - QString getPath(); + std::string getPath(); QUuid getID(); QByteArray* getData(); private: - QString path; + std::string path; QUuid id; QByteArray* data; Modified: geomcore/trunk/include/Event.h =================================================================== --- geomcore/trunk/include/Event.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/Event.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -26,25 +26,25 @@ #ifndef __EVENT_H__ #define __EVENT_H__ -#include <QtCore/QString> +#include <string> class EventPublisher; class Event { public: - Event(EventPublisher* pub, quint32 eventType); - Event(EventPublisher* pub, quint32 eventType, QString message); + Event(EventPublisher* pub, uint32_t eventType); + Event(EventPublisher* pub, uint32_t eventType, std::string message); virtual ~Event(); EventPublisher* getPublisher() const; - quint32 getEventType() const; - QString getMessage() const; + uint32_t getEventType() const; + std::string getMessage() const; private: EventPublisher* _pub; - quint32 _eventType; - QString _message; + uint32_t _eventType; + std::string _message; /* Disable copy cstr and =operator */ Event(Event const&){}; Modified: geomcore/trunk/include/EventPublisher.h =================================================================== --- geomcore/trunk/include/EventPublisher.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/EventPublisher.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -26,12 +26,12 @@ #ifndef __EVENTPUBLISHER_H__ #define __EVENTPUBLISHER_H__ -#include <QtCore/QString> +#include <string> class EventPublisher { public: - void generateEvent(quint32 type, QString message = ""); + void generateEvent(uint32_t type, std::string message = ""); }; #endif /* __EVENTPUBLISHER_H__ */ Modified: geomcore/trunk/include/EventSubscriber.h =================================================================== --- geomcore/trunk/include/EventSubscriber.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/EventSubscriber.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include "Event.h" #include "EventManager.h" -#include <QtCore/QString> +#include <string> class EventPublisher; Modified: geomcore/trunk/include/ExitCmd.h =================================================================== --- geomcore/trunk/include/ExitCmd.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/ExitCmd.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -27,15 +27,15 @@ #define __EXITCMD_H__ #include "AbstractClientCmd.h" -#include <QtCore/QString> +#include <string> class ExitCmd: public AbstractClientCmd { public: ExitCmd(); virtual ~ExitCmd(); - QString getUsage(); - QString getHelp(); + std::string getUsage(); + std::string getHelp(); protected: bool _exec(GSCmdLineClient* client, QStringList args); Modified: geomcore/trunk/include/FileDataSource.h =================================================================== --- geomcore/trunk/include/FileDataSource.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/FileDataSource.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -33,25 +33,25 @@ class FileDataSource : public IDataSource { public: - FileDataSource(QString repoPath); + FileDataSource(std::string repoPath); virtual ~FileDataSource(); bool lock(DbObject* obj, Account* a); bool hasLock(DbObject* obj, Account* a); bool unlock(DbObject* obj); - DbObject* getByPath(QString path); + DbObject* getByPath(std::string path); DbObject* getByID(QUuid id); bool putObject(DbObject* obj); private: - QString repoPath; + std::string repoPath; QMutex lockLock; - QList<QString> pathLocks; - bool hasPathLock(QString path); - void setPathLock(QString path); - void remPathLock(QString path); + QList<std::string> pathLocks; + bool hasPathLock(std::string path); + void setPathLock(std::string path); + void remPathLock(std::string path); /* Disable copy cstr and =operator */ FileDataSource(FileDataSource const&){}; Modified: geomcore/trunk/include/GSClient.h =================================================================== --- geomcore/trunk/include/GSClient.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GSClient.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include "PortalManager.h" #include "JobManager.h" -#include <QtCore/QString> +#include <string> #include <QtCore/QStringList> #include <string> @@ -38,7 +38,7 @@ class GSClient: public INetMsgHandler { public: - GSClient(QString localNodeName); + GSClient(std::string localNodeName); virtual ~GSClient(); bool handleNetMsg(NetMsg* msg); Modified: geomcore/trunk/include/GSCmdLineClient.h =================================================================== --- geomcore/trunk/include/GSCmdLineClient.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GSCmdLineClient.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include "GSClient.h" #include "ClientCmdRegistry.h" -#include <QtCore/QString> +#include <string> #include <string> #include <iostream> @@ -41,12 +41,12 @@ friend class LoginCmd; friend class LogoutCmd; public: - GSCmdLineClient(QString localNodeName); + GSCmdLineClient(std::string localNodeName); virtual ~GSCmdLineClient(); int run(); void stopRun(); - bool execCmd(QString cmd, QStringList args); + bool execCmd(std::string cmd, QStringList args); Portal* getCurrentPortal(); protected: Modified: geomcore/trunk/include/GSException.h =================================================================== --- geomcore/trunk/include/GSException.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GSException.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -25,21 +25,21 @@ #ifndef __GSEXCEPTION_H__ #define __GSEXCEPTION_H__ -#include <QtCore/QString> +#include <string> #include <exception> class GSException : public std::exception { public: - GSException(QString reason); + GSException(std::string reason); ~GSException() throw (); - QString getReason(); - void log(QString origin); + std::string getReason(); + void log(std::string origin); private: - QString reason; + std::string reason; /* Disable copy cstr and =operator */ GSException(GSException const&){}; Modified: geomcore/trunk/include/GenericEightBytesMsg.h =================================================================== --- geomcore/trunk/include/GenericEightBytesMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GenericEightBytesMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -32,10 +32,10 @@ { public: /* Normal Constructor */ - GenericEightBytesMsg(quint32 type, quint64 b); + GenericEightBytesMsg(uint32_t type, uint64_t b); /* Reply Constructor */ - GenericEightBytesMsg(quint32 type, NetMsg* msg, quint64 b); + GenericEightBytesMsg(uint32_t type, NetMsg* msg, uint64_t b); /* Deserializing Constructor */ GenericEightBytesMsg(QDataStream* ds, Portal* origin); @@ -46,11 +46,11 @@ /* * Utilities */ - virtual QString toString(); + virtual std::string toString(); protected: - quint64 getData(); - quint64 data; + uint64_t getData(); + uint64_t data; virtual bool _serialize(QDataStream* ds); virtual bool _equals(const NetMsg& msg); Modified: geomcore/trunk/include/GenericFourBytesMsg.h =================================================================== --- geomcore/trunk/include/GenericFourBytesMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GenericFourBytesMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -46,7 +46,7 @@ /* * Utilities */ - virtual QString toString(); + virtual std::string toString(); protected: quint32 getData(); Modified: geomcore/trunk/include/GenericMultiByteMsg.h =================================================================== --- geomcore/trunk/include/GenericMultiByteMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GenericMultiByteMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -47,7 +47,7 @@ /* * Utilities */ - virtual QString toString(); + virtual std::string toString(); QByteArray* getQByteArray(); protected: Modified: geomcore/trunk/include/GenericOneByteMsg.h =================================================================== --- geomcore/trunk/include/GenericOneByteMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GenericOneByteMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -32,10 +32,10 @@ { public: /* Normal Constructor */ - GenericOneByteMsg(quint32 type, quint8 b); + GenericOneByteMsg(uint32_t type, uint8_t b); /* Reply Constructor */ - GenericOneByteMsg(quint32 type, NetMsg* msg, quint8 b); + GenericOneByteMsg(uint32_t type, NetMsg* msg, uint8_t b); /* Deserializing Constructor */ GenericOneByteMsg(QDataStream* ds, Portal* origin); @@ -46,11 +46,11 @@ /* * Utilities */ - virtual QString toString(); + virtual std::string toString(); protected: - quint8 getData(); - quint8 data; + uint8_t getData(); + uint8_t data; virtual bool _serialize(QDataStream* ds); virtual bool _equals(const NetMsg& msg); Modified: geomcore/trunk/include/GenericOneStringMsg.h =================================================================== --- geomcore/trunk/include/GenericOneStringMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GenericOneStringMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -32,10 +32,10 @@ { public: /* Normal Constructor */ - GenericOneStringMsg(quint32 type, QString s); + GenericOneStringMsg(quint32 type, std::string s); /* Reply Constructor */ - GenericOneStringMsg(quint32 type, NetMsg* msg, QString s); + GenericOneStringMsg(quint32 type, NetMsg* msg, std::string s); /* Deserializing Constructor */ GenericOneStringMsg(QDataStream* ds, Portal* origin); @@ -46,11 +46,11 @@ /* * Utilities */ - virtual QString toString(); + virtual std::string toString(); protected: - QString getStrData(); - QString strData; + std::string getStrData(); + std::string strData; virtual bool _serialize(QDataStream* ds); virtual bool _equals(const NetMsg& msg); Modified: geomcore/trunk/include/GenericTwoBytesMsg.h =================================================================== --- geomcore/trunk/include/GenericTwoBytesMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GenericTwoBytesMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -32,10 +32,10 @@ { public: /* Normal Constructor */ - GenericTwoBytesMsg(quint32 type, quint16 b); + GenericTwoBytesMsg(uint32_t type, uint16_t b); /* Reply Constructor */ - GenericTwoBytesMsg(quint32 type, NetMsg* msg, quint16 b); + GenericTwoBytesMsg(uint32_t type, NetMsg* msg, uint16_t b); /* Deserializing Constructor */ GenericTwoBytesMsg(QDataStream* ds, Portal* origin); @@ -46,11 +46,11 @@ /* * Utilities */ - virtual QString toString(); + virtual std::string toString(); protected: - quint16 getData(); - quint16 data; + uint16_t getData(); + uint16_t data; virtual bool _serialize(QDataStream* ds); virtual bool _equals(const NetMsg& msg); Modified: geomcore/trunk/include/GeometryManifestMsg.h =================================================================== --- geomcore/trunk/include/GeometryManifestMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GeometryManifestMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -35,10 +35,10 @@ public: /* Normal Constructor */ - GeometryManifestMsg(QList<QString>& items); + GeometryManifestMsg(QList<std::string>& items); /* Reply Constructor */ - GeometryManifestMsg(NetMsg* msg, QList<QString>& items); + GeometryManifestMsg(NetMsg* msg, QList<std::string>& items); /* Deserializing Constructor */ GeometryManifestMsg(QDataStream* ds, Portal* origin); @@ -46,16 +46,16 @@ /* Destructor */ virtual ~GeometryManifestMsg(); - virtual QString toString(); + virtual std::string toString(); /* *Getters n Setters */ quint32 getNumOfItems(); - QList<QString>* getItemData(); + QList<std::string>* getItemData(); private: - QList<QString>* itemData; + QList<std::string>* itemData; bool _serialize(QDataStream* ds); bool _equals(const NetMsg& msg); Modified: geomcore/trunk/include/GeometryReqMsg.h =================================================================== --- geomcore/trunk/include/GeometryReqMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GeometryReqMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -33,10 +33,10 @@ public: /* Only Constructor */ - GeometryReqMsg(quint8 requestType, QString data); + GeometryReqMsg(quint8 requestType, std::string data); /* Reply Constructor */ - GeometryReqMsg(NetMsg* msg, quint8 requestType, QString data); + GeometryReqMsg(NetMsg* msg, quint8 requestType, std::string data); /* Deserializing Constructor */ GeometryReqMsg(QDataStream* ds, Portal* origin); @@ -44,14 +44,14 @@ /* Destructor */ virtual ~GeometryReqMsg(); - virtual QString toString(); + virtual std::string toString(); /* *Getters n Setters */ quint8 getRequestType(); - QString getData(); + std::string getData(); private: quint8 reqType; Modified: geomcore/trunk/include/GeometryService.h =================================================================== --- geomcore/trunk/include/GeometryService.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/GeometryService.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -32,16 +32,17 @@ #include "NetMsgRouter.h" #include "FailureMsg.h" -#include <QtCore/QString> -#include <QtNetwork/QHostAddress> +#include <string> -static const quint16 DEFAULT_LISTEN_PORT = 5309; -static const QHostAddress DEFAULT_LISTEN_ADDY = QHostAddress::LocalHost; +#include <string> +static const uint16_t DEFAULT_LISTEN_PORT = 5309; +static const std::string DEFAULT_LISTEN_ADDY = "0.0.0.0"; + class GeometryService : public ControlledThread, public INetMsgHandler { public: - GeometryService(const QString localNodeName, const quint16 listenPort = DEFAULT_LISTEN_PORT, const QHostAddress listenAddy = DEFAULT_LISTEN_ADDY); + GeometryService(const std::string localNodeName, const uint16_t listenPort = DEFAULT_LISTEN_PORT, const std::string listenAddy = DEFAULT_LISTEN_ADDY); virtual ~GeometryService(); bool handleNetMsg(NetMsg* msg); DataManager* getDataManager(); @@ -53,9 +54,9 @@ private: Logger* log; - QString localNodeName; - quint16 listenPort; - QHostAddress listenAddy; + std::string localNodeName; + uint16_t listenPort; + std::string listenAddy; PortalManager* portalMan; DataManager* dataMan; Modified: geomcore/trunk/include/HelpCmd.h =================================================================== --- geomcore/trunk/include/HelpCmd.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/HelpCmd.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -27,15 +27,15 @@ #define __HELPCMD_H__ #include "AbstractClientCmd.h" -#include <QtCore/QString> +#include <string> class HelpCmd: public AbstractClientCmd { public: HelpCmd(); virtual ~HelpCmd(); - QString getUsage(); - QString getHelp(); + std::string getUsage(); + std::string getHelp(); protected: bool _exec(GSCmdLineClient* client, QStringList args); Modified: geomcore/trunk/include/IDataSource.h =================================================================== --- geomcore/trunk/include/IDataSource.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/IDataSource.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -36,7 +36,7 @@ virtual bool hasLock(DbObject* obj, Account* a) = 0; virtual bool unlock(DbObject* obj) = 0; - virtual DbObject* getByPath(QString path) = 0; + virtual DbObject* getByPath(std::string path) = 0; virtual DbObject* getByID(QUuid id) = 0; virtual bool putObject(DbObject* obj) = 0; }; Modified: geomcore/trunk/include/Logger.h =================================================================== --- geomcore/trunk/include/Logger.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/Logger.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include <iostream> #include <QtCore/QThread> -#include <QtCore/QString> +#include <string> #include <QtCore/QMutex> #include <QtCore/QMutexLocker> @@ -66,12 +66,12 @@ this->printToFile = false; } - void logBANNER(QString origin, QString string); - void logDEBUG(QString origin, QString string); - void logINFO(QString origin, QString string); - void logWARNING(QString origin, QString string); - void logERROR(QString origin, QString string); - void logFATAL(QString origin, QString string); + void logBANNER(std::string origin, std::string string); + void logDEBUG(std::string origin, std::string string); + void logINFO(std::string origin, std::string string); + void logWARNING(std::string origin, std::string string); + void logERROR(std::string origin, std::string string); + void logFATAL(std::string origin, std::string string); enum { @@ -91,7 +91,7 @@ Logger(const Logger& logger){}; /* Disable Copy cstr */ Logger& operator=(const Logger& log){}; /* Disable equals operator */ - void log(quint32 logLevel, QString origin, QString string); + void log(quint32 logLevel, std::string origin, std::string string); }; #endif /* __LOGGER_H__ */ Modified: geomcore/trunk/include/LoginCmd.h =================================================================== --- geomcore/trunk/include/LoginCmd.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/LoginCmd.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -28,15 +28,15 @@ #define __LOGINCMD_H__ #include "AbstractClientCmd.h" -#include <QtCore/QString> +#include <string> class LoginCmd : public AbstractClientCmd { public: LoginCmd(); virtual ~LoginCmd(); - QString getUsage(); - QString getHelp(); + std::string getUsage(); + std::string getHelp(); protected: bool _exec(GSCmdLineClient* client, QStringList args); Modified: geomcore/trunk/include/LogoutCmd.h =================================================================== --- geomcore/trunk/include/LogoutCmd.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/LogoutCmd.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -28,15 +28,15 @@ #define __LOGOUTCMD_H__ #include "AbstractClientCmd.h" -#include <QtCore/QString> +#include <string> class LogoutCmd : public AbstractClientCmd { public: LogoutCmd(); virtual ~LogoutCmd(); - QString getUsage(); - QString getHelp(); + std::string getUsage(); + std::string getHelp(); protected: bool _exec(GSCmdLineClient* client, QStringList args); Modified: geomcore/trunk/include/NetMsg.h =================================================================== --- geomcore/trunk/include/NetMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/NetMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -27,6 +27,7 @@ #define __NETMSG_H__ #include <sstream> +#include <string> #include <QtCore/QDataStream> #include <QtCore/QByteArray> @@ -38,10 +39,10 @@ { public: /* Normal Constructor */ - NetMsg(quint16 mType); + NetMsg(uint16_t mType); /* Reply Constructor */ - NetMsg(quint16 mType, NetMsg* msg); + NetMsg(uint16_t mType, NetMsg* msg); /* Deserializing Constructor */ NetMsg(QDataStream* ds, Portal* origin); @@ -56,7 +57,7 @@ /* *Getters n Setters */ - quint16 getMsgType() const; + uint16_t getMsgType() const; QUuid getMsgUUID() const; bool msgHasReUUID() const; QUuid getReUUID() const; @@ -65,7 +66,7 @@ /* * Utilities */ - virtual QString toString(); + virtual std::string toString(); virtual std::string toStdString(); virtual bool equals(const NetMsg& other); void printMe(); @@ -73,7 +74,7 @@ bool operator== (const NetMsg& other); protected: - quint16 msgType; + uint16_t msgType; QUuid msgUUID; bool hasReUUID; QUuid reUUID; Modified: geomcore/trunk/include/NetMsgFactory.h =================================================================== --- geomcore/trunk/include/NetMsgFactory.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/NetMsgFactory.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -31,7 +31,7 @@ #include "brlcad/pkg.h" #include <QtCore/QByteArray> -#include <QtCore/QString> +#include <string> #include <QtCore/QDataStream> class NetMsgFactory Modified: geomcore/trunk/include/NewNodeOnNetMsg.h =================================================================== --- geomcore/trunk/include/NewNodeOnNetMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/NewNodeOnNetMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -32,10 +32,10 @@ { public: /* Normal Constructor */ - NewNodeOnNetMsg(QString s); + NewNodeOnNetMsg(std::string s); /* Reply Constructor */ - NewNodeOnNetMsg(NetMsg* msg, QString gsNodename); + NewNodeOnNetMsg(NetMsg* msg, std::string gsNodename); /* Deserializing Constructor */ NewNodeOnNetMsg(QDataStream* ds, Portal* origin); @@ -43,7 +43,7 @@ /* Destructor */ virtual ~NewNodeOnNetMsg(); - QString getNewNodename(); + std::string getNewNodename(); private: /* Disable copy cstr and =operator */ Modified: geomcore/trunk/include/NewSessionReqMsg.h =================================================================== --- geomcore/trunk/include/NewSessionReqMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/NewSessionReqMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -32,10 +32,10 @@ { public: /* Normal Constructor */ - NewSessionReqMsg(QString uname, QString passwd); + NewSessionReqMsg(std::string uname, std::string passwd); /* Reply Constructor */ - NewSessionReqMsg(NetMsg* msg, QString uname, QString passwd); + NewSessionReqMsg(NetMsg* msg, std::string uname, std::string passwd); /* Deserializing Constructor */ NewSessionReqMsg(QDataStream* ds, Portal* origin); @@ -46,13 +46,13 @@ /* * Utilities */ - virtual QString toString(); - QString getUName(); - QString getPasswd(); + virtual std::string toString(); + std::string getUName(); + std::string getPasswd(); protected: - QString uname; - QString passwd; + std::string uname; + std::string passwd; virtual bool _serialize(QDataStream* ds); virtual bool _equals(const NetMsg& msg); Modified: geomcore/trunk/include/PingCmd.h =================================================================== --- geomcore/trunk/include/PingCmd.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/PingCmd.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -27,14 +27,14 @@ #define __PINGCMD_H__ #include "AbstractClientCmd.h" -#include <QtCore/QString> +#include <string> class PingCmd: public AbstractClientCmd { public: PingCmd(); virtual ~PingCmd(); - QString getUsage(); - QString getHelp(); + std::string getUsage(); + std::string getHelp(); protected: bool _exec(GSCmdLineClient* client, QStringList args); Modified: geomcore/trunk/include/PingMsg.h =================================================================== --- geomcore/trunk/include/PingMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/PingMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -27,7 +27,7 @@ #define __PINGMSG_H__ #include "GenericEightBytesMsg.h" -#include <QtCore/QString> +#include <string> class PingMsg: public GenericEightBytesMsg { public: Modified: geomcore/trunk/include/PongMsg.h =================================================================== --- geomcore/trunk/include/PongMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/PongMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include "GenericEightBytesMsg.h" #include "PingMsg.h" -#include <QtCore/QString> +#include <string> class PongMsg: public GenericEightBytesMsg { public: Modified: geomcore/trunk/include/Portal.h =================================================================== --- geomcore/trunk/include/Portal.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/Portal.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -35,7 +35,7 @@ #include "brlcad/pkg.h" -#include <QtCore/QString> +#include <string> class PortalManager; @@ -50,7 +50,7 @@ void disconnect(); int flush(); - QString getRemoteNodeName(); + std::string getRemoteNodeName(); bool handleNetMsg(NetMsg* msg); @@ -70,7 +70,7 @@ PortalManager* pm; struct pkg_switch* callbackTable; PkgTcpClient* pkgClient; - QString remoteNodeName; + std::string remoteNodeName; Logger* log; bool handshakeComplete; Modified: geomcore/trunk/include/PortalManager.h =================================================================== --- geomcore/trunk/include/PortalManager.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/PortalManager.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -34,33 +34,34 @@ #include <sys/select.h> +#include <string> + #include <QtCore/QList> #include <QtCore/QMutex> -#include <QtCore/QString> -#include <QtNetwork/QHostAddress> +#include <string> class Portal; class PortalManager : public ControlledThread, public INetMsgHandler { public: - PortalManager(QString localNodeName, quint16 port = 0, QHostAddress address = QHostAddress::LocalHost); + PortalManager(std::string localNodeName, uint16_t port = 0, std::string address = std::string("0.0.0.0")); ~PortalManager(); - Portal* connectToHost(QString host, quint16 port); + Portal* connectToHost(std::string host, uint16_t port); void disconnect(Portal* p); bool handleNetMsg(NetMsg* msg); - QString getLocalNodeName(); + std::string getLocalNodeName(); protected: void _run(); private: - QString localNodeName; + std::string localNodeName; Logger* log; - quint16 listenPort; - QHostAddress listenAddress; + uint16_t listenPort; + std::string listenAddress; PkgTcpServer* tcpServer; QMutex masterFDSLock; @@ -72,7 +73,7 @@ Portal* makeNewPortal(PkgTcpClient* client, struct pkg_switch* table); struct pkg_switch* makeNewSwitchTable(); - void closeFD(int fd, QString logComment); + void closeFD(int fd, std::string logComment); void handleDisconnectReqMsg(TypeOnlyMsg* msg); /* Disable copy cstr and =operator */ Modified: geomcore/trunk/include/RemoteNodenameSetMsg.h =================================================================== --- geomcore/trunk/include/RemoteNodenameSetMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/RemoteNodenameSetMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -32,10 +32,10 @@ { public: /* Normal Constructor */ - RemoteNodenameSetMsg(QString s); + RemoteNodenameSetMsg(std::string s); /* Reply Constructor */ - RemoteNodenameSetMsg(NetMsg* msg, QString gsNodename); + RemoteNodenameSetMsg(NetMsg* msg, std::string gsNodename); /* Deserializing Constructor */ RemoteNodenameSetMsg(QDataStream* ds, Portal* origin); @@ -43,7 +43,7 @@ /* Destructor */ virtual ~RemoteNodenameSetMsg(); - QString getRemoteNodename(); + std::string getRemoteNodename(); private: /* Disable copy cstr and =operator */ Modified: geomcore/trunk/include/SessionInfoMsg.h =================================================================== --- geomcore/trunk/include/SessionInfoMsg.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/SessionInfoMsg.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -46,7 +46,7 @@ /* * Utilities */ - virtual QString toString(); + virtual std::string toString(); QUuid getSessionID(); protected: Modified: geomcore/trunk/include/ShutdownCmd.h =================================================================== --- geomcore/trunk/include/ShutdownCmd.h 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/include/ShutdownCmd.h 2011-02-09 16:08:55 UTC (rev 43166) @@ -27,16 +27,16 @@ #include "AbstractClientCmd.h" -#include <QtCore/QString> -#include <QtCore/QStringList> +#include <string> +#include <QStringList> class ShutdownCmd : public AbstractClientCmd { public: ShutdownCmd(); virtual ~ShutdownCmd(); - QString getUsage(); - QString getHelp(); + std::string getUsage(); + std::string getHelp(); protected: bool _exec(GSCmdLineClient* client, QStringList args); Modified: geomcore/trunk/src/GS/Account.cxx =================================================================== --- geomcore/trunk/src/GS/Account.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/Account.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -25,7 +25,7 @@ #include "Account.h" -Account::Account(QString uname, Portal* portal, quint32 id) : +Account::Account(std::string uname, Portal* portal, uint32_t id) : uname(uname), portal(portal), id(id) { this->stampLastAccess(); } @@ -33,7 +33,7 @@ Account::~Account() {} -QString +std::string Account::getUname() { return this->uname; @@ -45,7 +45,7 @@ return this->portal; } -quint32 +uint32_t Account::getID() { return this->id; Modified: geomcore/trunk/src/GS/AccountManager.cxx =================================================================== --- geomcore/trunk/src/GS/AccountManager.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/AccountManager.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -53,8 +53,8 @@ /** * returns 0 for bad login. Positive number is the accountID */ -qint32 -AccountManager::validateLoginCreds(QString uname, QString passwd) +int32_t +AccountManager::validateLoginCreds(std::string uname, std::string passwd) { /* TODO put in REAL account validation here. */ if (uname == "Guest" && passwd == "Guest") { @@ -83,18 +83,21 @@ } Account* -AccountManager::login(QString uname, QString passwd, Portal* p) +AccountManager::login(std::string uname, std::string passwd, Portal* p) { - qint32 id = 0; + int32_t id = 0; + char buf[BUFSIZ]; id = this->validateLoginCreds(uname, passwd); if (id < 0) { - log->logINFO("AccountManager", "Authentication FAILED. User: '" + uname + "', accountID: " + QString::number(id)); + snprintf(buf, BUFSIZ, "Authentication FAILED. User: '%s', accountID: %d", uname.c_str(), id); + log->logINFO("AccountManager", buf); return NULL; } - log->logINFO("AccountManager", "Authenticated user: '" + uname + "', accountID: " + QString::number(id)); + snprintf(buf, BUFSIZ, "Authenticated user: '%s', accountID: %d", uname.c_str(), id); + log->logINFO("AccountManager", buf); Account* acc = this->newAccount(uname, p, id); return acc; @@ -106,7 +109,7 @@ } Account* -AccountManager::newAccount(QString uname, Portal* p, quint32 id) +AccountManager::newAccount(std::string uname, Portal* p, uint32_t id) { Account* a = NULL; Modified: geomcore/trunk/src/GS/DataManager.cxx =================================================================== --- geomcore/trunk/src/GS/DataManager.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/DataManager.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -41,10 +41,10 @@ DataManager::~DataManager() {} -QString DataManager::getDbObjectByURL(QString url) +std::string DataManager::getDbObjectByURL(std::string url) {} -QString DataManager::getDbObjectByUUID(QUuid& uuid) +std::string DataManager::getDbObjectByUUID(QUuid& uuid) {} void @@ -57,7 +57,7 @@ bool DataManager::handleNetMsg(NetMsg* msg) { - quint16 type = msg->getMsgType(); + uint16_t type = msg->getMsgType(); switch(type) { case GEOMETRYREQ: this->handleGeometryReqMsg((GeometryReqMsg*)msg); @@ -87,8 +87,8 @@ void DataManager::handleGeometryReqMsg(GeometryReqMsg* msg) { - quint8 reqType = msg->getRequestType(); - QString data = msg->getData(); + uint8_t reqType = msg->getRequestType(); + std::string data = msg->getData(); Portal* origin = msg->getOrigin(); //validate incoming data @@ -116,7 +116,7 @@ return; } - QList<QString> items; + QList<std::string> items; QByteArray* data = obj->getData(); GeometryChunkMsg* chunk = new GeometryChunkMsg(data->data(), data->length()); Modified: geomcore/trunk/src/GS/DbObject.cxx =================================================================== --- geomcore/trunk/src/GS/DbObject.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/DbObject.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -26,7 +26,7 @@ #include "DbObject.h" -DbObject::DbObject(QString path, QByteArray* data) : +DbObject::DbObject(std::string path, QByteArray* data) : path(path), id(NULL), data(data) {} @@ -37,7 +37,7 @@ DbObject::~DbObject() {} -QString +std::string DbObject::getPath() { return this->path; Modified: geomcore/trunk/src/GS/FileDataSource.cxx =================================================================== --- geomcore/trunk/src/GS/FileDataSource.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/FileDataSource.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include <QtCore/QMutexLocker> #include <QtCore/QFile> -FileDataSource::FileDataSource(QString repoPath) : +FileDataSource::FileDataSource(std::string repoPath) : repoPath(repoPath) {} @@ -49,7 +49,7 @@ {} DbObject* -FileDataSource::getByPath(QString path) +FileDataSource::getByPath(std::string path) { //See if there is a file lock on this path bool hasLock = this->hasPathLock(path); @@ -63,7 +63,10 @@ //lock it this->setPathLock(path); - QFile f(this->repoPath + "/" + path); + QString qs(this->repoPath.c_str()); + qs += "/"; + qs += path.c_str(); + QFile f(qs); if (f.exists()) { QByteArray* data = new QByteArray(f.readAll()); @@ -94,7 +97,7 @@ bool FileDataSource::putObject(DbObject* obj) { - QString path = obj->getPath(); + std::string path = obj->getPath(); //See if there is a file lock on this path bool hasLock = this->hasPathLock(path); @@ -108,7 +111,10 @@ //lock it this->setPathLock(path); - QFile f(this->repoPath + "/" + path); + QString qs(this->repoPath.c_str()); + qs += "/"; + qs += path.c_str(); + QFile f(qs); f.write(*obj->getData()); f.close(); @@ -120,14 +126,14 @@ } bool -FileDataSource::hasPathLock(QString path) +FileDataSource::hasPathLock(std::string path) { QMutexLocker(&this->lockLock); return this->pathLocks.contains(path); } void -FileDataSource::setPathLock(QString path) +FileDataSource::setPathLock(std::string path) { QMutexLocker(&this->lockLock); if (!this->pathLocks.contains(path)) { @@ -136,7 +142,7 @@ } void -FileDataSource::remPathLock(QString path) { +FileDataSource::remPathLock(std::string path) { QMutexLocker(&this->lockLock); this->pathLocks.append(path); } Modified: geomcore/trunk/src/GS/GSClient.cxx =================================================================== --- geomcore/trunk/src/GS/GSClient.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/GSClient.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,7 +29,7 @@ #include "FailureMsg.h" #include "PongMsg.h" -GSClient::GSClient(QString localNodeName) { +GSClient::GSClient(std::string localNodeName) { this->log = Logger::getInstance(); this->jobMan = JobManager::getInstance(); this->jobMan->startup(); @@ -60,22 +60,25 @@ bool GSClient::handleNetMsg(NetMsg* msg) { - quint16 type = msg->getMsgType(); + uint16_t type = msg->getMsgType(); + char buf[BUFSIZ]; + switch(type) { case SESSIONINFO: { - QString data =((SessionInfoMsg*)msg)->toString(); + std::string data =((SessionInfoMsg*)msg)->toString(); log->logINFO("GSClient", "Recv'ed SessionInfo: " + data); return true; } case FAILURE: { FailureMsg* fMsg = (FailureMsg*)msg; - quint8 fc = fMsg->getFailureCode(); + uint8_t fc = fMsg->getFailureCode(); QUuid re = fMsg->getReUUID(); - log->logINFO("GSClient", "Recv'ed A FailureMsg with code: " +QString::number( fc) + " (" + QString::number(fc, 16)+ ")"); + snprintf(buf, BUFSIZ, "Recv'ed A FailureMsg with code: %d (%x)", fc, fc); + log->logINFO("GSClient", buf); return true; } case PING: @@ -83,7 +86,7 @@ Portal* p = msg->getOrigin(); if (p != NULL) { - QString remNodeName = p->getRemoteNodeName(); + std::string remNodeName = p->getRemoteNodeName(); log->logINFO("GSClient", "PING from: '" + remNodeName + "'"); PongMsg pongMsg((PingMsg*)msg); p->send(&pongMsg); @@ -98,18 +101,17 @@ PongMsg* pongMsg = (PongMsg*)msg; /* calc current and differential times */ - quint64 start = pongMsg->getStartTime(); - quint64 now = Logger::getCurrentTime(); - quint64 diff = now -start; + uint64_t start = pongMsg->getStartTime(); + uint64_t now = Logger::getCurrentTime(); + uint64_t diff = now -start; - QString time = "roundtrip time: " + QString::number(diff) + "ms."; - QString remNodeName = "unknown"; + std::string remNodeName = "unknown"; - if (p != NULL) { + if (p != NULL) remNodeName = p->getRemoteNodeName(); - } - log->logINFO("GSClient", "Pong from: '" + remNodeName + "', " + time); + snprintf(buf, BUFSIZ, "Pong from: '%s', roundtrip time: %d ms.", remNodeName.c_str(), diff); + log->logINFO("GSClient", buf); return true; } } Modified: geomcore/trunk/src/GS/GSCmdLineClient.cxx =================================================================== --- geomcore/trunk/src/GS/GSCmdLineClient.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/GSCmdLineClient.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -36,7 +36,7 @@ const std::string GSCmdLineClient::defaultPrompt ="geoclient> "; -GSCmdLineClient::GSCmdLineClient(QString localNodeName):GSClient(localNodeName) +GSCmdLineClient::GSCmdLineClient(std::string localNodeName):GSClient(localNodeName) { this->ccReg = ClientCmdRegistry::getInstance(); this->registerClientCmds(); @@ -63,14 +63,15 @@ getline (std::cin, in); /* make a qstring */ - QString qin(in.c_str()); + std::string qin(in.c_str()); /* cathc zero length strings here */ if (qin.length() == 0) continue; /* split string */ - QStringList list = qin.split(" "); + QString qsin(qin.c_str()); + QStringList list = qsin.split(" "); /* check to see if there is at least one element */ if (list.length() <= 0) { @@ -78,7 +79,7 @@ } /* convert to lowercase */ - QString cmd = list.takeFirst().toLower(); + std::string cmd(list.takeFirst().toLower().toStdString()); this->execCmd(cmd, list); } @@ -102,12 +103,15 @@ bool -GSCmdLineClient::execCmd(QString cmd, QStringList args) +GSCmdLineClient::execCmd(std::string cmd, QStringList args) { + char buf[BUFSIZ]; + AbstractClientCmd* acc = this->ccReg->getCmd(cmd); if (acc == NULL) { - this->log->logINFO("GSClient", "Unknown Command: '" + cmd + "'."); + snprintf(buf, BUFSIZ, "Unknown Command: '%s'", cmd.c_str()); + this->log->logINFO("GSClient", buf); return false; } Modified: geomcore/trunk/src/GS/GeometryService.cxx =================================================================== --- geomcore/trunk/src/GS/GeometryService.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/GeometryService.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -30,9 +30,10 @@ #include "PongMsg.h" -GeometryService::GeometryService(const QString localNodeName, const quint16 listenPort, const QHostAddress listenAddy) : -ControlledThread(localNodeName), localNodeName(localNodeName), listenPort(listenPort), listenAddy(listenAddy) +GeometryService::GeometryService(const std::string localNodeName, const uint16_t listenPort, const std::string listenAddy) : ControlledThread(localNodeName), listenPort(listenPort) { + this->localNodeName.assign(localNodeName); + this->listenAddy.assign(listenAddy); this->log = Logger::getInstance(); this->log->logINFO("GeometryService", localNodeName + " is starting up..."); @@ -104,7 +105,9 @@ bool GeometryService::handleNetMsg(NetMsg* msg) { - quint16 type = msg->getMsgType(); + uint16_t type = msg->getMsgType(); + char buf[BUFSIZ]; + switch(type) { case CMD_SHUTDOWN: log->logINFO("GeometryService", "Remote Shutdown Initiated."); @@ -118,7 +121,8 @@ QUuid re = fMsg->getReUUID(); - log->logINFO("GeometryService", "Recv'ed A FailureMsg with code: " +QString::number( fc) + " (" + QString::number(fc, 16)+ ")"); + snprintf(buf, BUFSIZ, "Recv'ed A FailureMsg with code: %d (%x)", fc, fc); + log->logINFO("GeometryService", buf); return true; } case PING: @@ -126,7 +130,7 @@ Portal* p = msg->getOrigin(); if (p != NULL) { - QString remNodeName = p->getRemoteNodeName(); + std::string remNodeName = p->getRemoteNodeName(); log->logINFO("GeometryService", "PING from: '" + remNodeName + "'"); PongMsg pongMsg((PingMsg*)msg); p->send(&pongMsg); @@ -147,13 +151,13 @@ quint64 diff = now -start; QString time = "roundtrip time: " + QString::number(diff) + "ms."; - QString remNodeName = "unknown"; + std::string remNodeName("unknown"); - if (p != NULL) { + if (p != NULL) remNodeName = p->getRemoteNodeName(); - } - log->logINFO("GSClient", "Pong from: '" + remNodeName + "', " + time); + snprintf(buf, BUFSIZ, "Pong from '%s' + %d ms", remNodeName.c_str()); + log->logINFO("GSClient", buf); return true; } } Modified: geomcore/trunk/src/GS/SessionManager.cxx =================================================================== --- geomcore/trunk/src/GS/SessionManager.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/SessionManager.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -121,7 +121,7 @@ bool SessionManager::handleNetMsg(NetMsg* msg) { - quint16 type = msg->getMsgType(); + uint16_t type = msg->getMsgType(); switch(type) { case NEWSESSIONREQ: this->handleNewSessionReqMsg((NewSessionReqMsg*)msg); @@ -151,8 +151,8 @@ /* Get values from msg */ Portal* origin = msg->getOrigin(); - QString uname = msg->getUName(); - QString passwd = msg->getPasswd(); + std::string uname = msg->getUName(); + std::string passwd = msg->getPasswd(); /* Validate data */ if (origin == 0) { Modified: geomcore/trunk/src/GS/cmds/AbstractClientCmd.cxx =================================================================== --- geomcore/trunk/src/GS/cmds/AbstractClientCmd.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/cmds/AbstractClientCmd.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -25,7 +25,7 @@ #include "AbstractClientCmd.h" #include "GSClient.h" -AbstractClientCmd::AbstractClientCmd(QString cmd) : cmd(cmd) +AbstractClientCmd::AbstractClientCmd(std::string cmd) : cmd(cmd) { this->log = Logger::getInstance(); } @@ -36,7 +36,7 @@ AbstractClientCmd::~AbstractClientCmd() { } -QString +std::string AbstractClientCmd::getCmd() { return this->cmd; @@ -49,12 +49,12 @@ void AbstractClientCmd::printUsage() { - this->log->logINFO(this->cmd.toUpper(), this->getUsage()); + this->log->logINFO(this->cmd, this->getUsage()); } void AbstractClientCmd::printHelp() { - this->log->logINFO(this->cmd.toUpper(), this->getHelp()); + this->log->logINFO(this->cmd, this->getHelp()); } /* Modified: geomcore/trunk/src/GS/cmds/ClientCmdRegistry.cxx =================================================================== --- geomcore/trunk/src/GS/cmds/ClientCmdRegistry.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/cmds/ClientCmdRegistry.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -40,7 +40,7 @@ } ClientCmdRegistry::ClientCmdRegistry() { - this->cmdMap = new QMap<QString,AbstractClientCmd*> (); + this->cmdMap = new QMap<std::string,AbstractClientCmd*> (); this->log = Logger::getInstance(); } @@ -50,7 +50,7 @@ } bool ClientCmdRegistry::registerCmd(AbstractClientCmd* cmd) { - QString cmdString = cmd->getCmd(); + std::string cmdString = cmd->getCmd(); QMutexLocker(&this->mapLock); if (this->cmdMap->contains(cmdString) == false) { @@ -63,7 +63,7 @@ } AbstractClientCmd* -ClientCmdRegistry::getCmd(QString cmd) +ClientCmdRegistry::getCmd(std::string cmd) { QMutexLocker(&this->mapLock); @@ -73,11 +73,11 @@ return this->cmdMap->value(cmd); } -QList<QString>* +QList<std::string>* ClientCmdRegistry::getListOfCmds() { QMutexLocker(&this->mapLock); - QList<QString>* keys = new QList<QString>(this->cmdMap->keys()); + QList<std::string>* keys = new QList<std::string>(this->cmdMap->keys()); return keys; } Modified: geomcore/trunk/src/GS/cmds/ExitCmd.cxx =================================================================== --- geomcore/trunk/src/GS/cmds/ExitCmd.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/cmds/ExitCmd.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -29,12 +29,12 @@ ExitCmd::ExitCmd() : AbstractClientCmd("exit"){} ExitCmd::~ExitCmd() {} -QString +std::string ExitCmd::getUsage(){ return "Usage: exit"; } -QString +std::string ExitCmd::getHelp(){ return "Causes the application to exit."; } Modified: geomcore/trunk/src/GS/cmds/HelpCmd.cxx =================================================================== --- geomcore/trunk/src/GS/cmds/HelpCmd.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/cmds/HelpCmd.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -30,12 +30,12 @@ HelpCmd::~HelpCmd() {} -QString +std::string HelpCmd::getUsage() { return "Usage: help [cmdname]"; } -QString +std::string HelpCmd::getHelp() { return "If evoked without any arguments, help diplays a list of available commands. If a command name is provided as an argument, the help for that command is displayed."; } @@ -54,11 +54,11 @@ if (argn == 0) { /* display list of cmds */ - QList<QString>* cmds = ccReg->getListOfCmds(); + QList<std::string>* cmds = ccReg->getListOfCmds(); this->log->logINFO("HelpCmd", "Available commands:"); - QString out("\t"); + std::string out("\t"); for (int i = 0; i < cmds->length(); ++i) { /* Append the new cmd name */ out.append(cmds->at(i)); @@ -83,7 +83,7 @@ return true; } else { /* display specifics of a single cmd */ - QString cmd = args.at(0); + std::string cmd(args.at(0).toStdString()); if(cmd.length() == 0) { this->log->logERROR("HelpCmd", "Zero Length Cmd provided to help."); Modified: geomcore/trunk/src/GS/cmds/LoginCmd.cxx =================================================================== --- geomcore/trunk/src/GS/cmds/LoginCmd.cxx 2011-02-09 15:47:38 UTC (rev 43165) +++ geomcore/trunk/src/GS/cmds/LoginCmd.cxx 2011-02-09 16:08:55 UTC (rev 43166) @@ -32,12 +32,12 @@ LoginCmd::LoginCmd() : AbstractClientCmd("login"){} LoginCmd::~LoginCmd() {} -QString +std::string LoginCmd::getUsage() { return "Usage: login ip port uname passwd"; } -QString +std::string LoginCmd::getHelp() { return "Attempts to make a connection and login to a GeometryService."; } @@ -52,10 +52,10 @@ } /* Convert args to proper types */ - QString host = args.at(0); - quint16 port = atoi(args.at(1).toStdString().c_str()); - QString uname = args.at(2); - QString passwd = args.at(3); + std::string host(args.at(0).toStdString()); + uint16_t port = atoi(args.at(1).toStdString().c_str()); + std::string uname(args.at(2).toStdString()); + std::string passwd(args.at(3).toStdString()); if (port <=0 || host.length() == 0 || uname.length() == 0 || passwd.length() == 0){ @@ -88,7 +88,7 @@ GSThread::msleep(100); - QString remNodename = p->getRemoteNodeName(); + std::string remNodename = p->getRemoteNodeName(); this->log->logINFO("LoginCmd", "Con... [truncated message content] |