From: Dominic L. <ma...@us...> - 2005-01-02 14:44:09
|
Update of /cvsroot/robotflow/RobotFlow/Probes/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19423/Probes/include Modified Files: LaserProbe.h PTZControl.h SymbolKeypad.h VirtualJoystick.h Log Message: removing all "using namespace std;" in headers. Bumped version to 0.2.6. Preparing for the RobotFlow namespace. Index: SymbolKeypad.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/include/SymbolKeypad.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SymbolKeypad.h 26 Jul 2004 15:13:49 -0000 1.1 --- SymbolKeypad.h 2 Jan 2005 14:43:59 -0000 1.2 *************** *** 7,11 **** #include <map> - using namespace std; class SymbolKeypad : public Node { --- 7,10 ---- *************** *** 82,91 **** //a lookup map with widgets/ids ! map <GtkWidget*,int> button_map; ! map <unsigned int,int> key_map; public: ! SymbolKeypad(string nodeName, ParameterSet params); virtual ~SymbolKeypad(); --- 81,90 ---- //a lookup map with widgets/ids ! std::map <GtkWidget*,int> button_map; ! std::map <unsigned int,int> key_map; public: ! SymbolKeypad(std::string nodeName, ParameterSet params); virtual ~SymbolKeypad(); Index: LaserProbe.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/include/LaserProbe.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LaserProbe.h 6 Jun 2002 12:09:23 -0000 1.1 --- LaserProbe.h 2 Jan 2005 14:43:59 -0000 1.2 *************** *** 22,26 **** public: ! LaserProbe(string nodeName, ParameterSet params); virtual ~LaserProbe(); --- 22,26 ---- public: ! LaserProbe(std::string nodeName, ParameterSet params); virtual ~LaserProbe(); Index: VirtualJoystick.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/include/VirtualJoystick.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VirtualJoystick.h 16 Aug 2004 14:50:46 -0000 1.4 --- VirtualJoystick.h 2 Jan 2005 14:43:59 -0000 1.5 *************** *** 50,54 **** \param params The parameters passed at construction */ ! VirtualJoystick(string nodeName, ParameterSet params); ///Destructor --- 50,54 ---- \param params The parameters passed at construction */ ! VirtualJoystick(std::string nodeName, ParameterSet params); ///Destructor Index: PTZControl.h =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/include/PTZControl.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PTZControl.h 27 Jul 2004 18:23:02 -0000 1.5 --- PTZControl.h 2 Jan 2005 14:43:59 -0000 1.6 *************** *** 16,25 **** //commands ! list<int> m_absPanCommands; ! list<int> m_absTiltCommands; ! list<int> m_absZoomCommands; ! list<int> m_relPanCommands; ! list<int> m_relTiltCommands; ! list<int> m_relZoomCommands; //outputs --- 16,25 ---- //commands ! std::list<int> m_absPanCommands; ! std::list<int> m_absTiltCommands; ! std::list<int> m_absZoomCommands; ! std::list<int> m_relPanCommands; ! std::list<int> m_relTiltCommands; ! std::list<int> m_relZoomCommands; //outputs *************** *** 37,41 **** public: ! PTZControl(string nodeName, ParameterSet params); virtual ~PTZControl(); --- 37,41 ---- public: ! PTZControl(std::string nodeName, ParameterSet params); virtual ~PTZControl(); |