Update of /cvsroot/robotflow/RobotFlow/Probes/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10496/Probes/src Modified Files: CheckBoxPanel.cc ColorTrain.cc ImageProbe.cc ImageProbeSDL.cc LaserProbe.cc PTZControl.cc SymbolKeypad.cc VirtualJoystick.cc Log Message: Now using the RobotFlow namespace and the FD namespace Index: ImageProbeSDL.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/ImageProbeSDL.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ImageProbeSDL.cc 2 Jan 2005 14:44:00 -0000 1.3 --- ImageProbeSDL.cc 29 Mar 2005 15:20:46 -0000 1.4 *************** *** 29,33 **** --- 29,35 ---- using namespace std; + using namespace FD; + namespace RobotFlow { //forward declaration *************** *** 203,207 **** }; ! #endif --- 205,209 ---- }; ! }//namespace RobotFlow #endif Index: VirtualJoystick.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/VirtualJoystick.cc,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** VirtualJoystick.cc 2 Jan 2005 14:44:00 -0000 1.8 --- VirtualJoystick.cc 29 Mar 2005 15:20:46 -0000 1.9 *************** *** 12,15 **** --- 12,18 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(VirtualJoystick) *************** *** 419,420 **** --- 422,425 ---- return false; } + + }//namespace RobotFlow Index: PTZControl.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/PTZControl.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PTZControl.cc 2 Jan 2005 14:44:00 -0000 1.9 --- PTZControl.cc 29 Mar 2005 15:20:46 -0000 1.10 *************** *** 12,15 **** --- 12,18 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(PTZControl) *************** *** 482,484 **** } ! --- 485,487 ---- } ! }//namespace RobotFlow Index: LaserProbe.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/LaserProbe.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LaserProbe.cc 2 Jan 2005 14:44:00 -0000 1.4 --- LaserProbe.cc 29 Mar 2005 15:20:46 -0000 1.5 *************** *** 12,16 **** --- 12,18 ---- using namespace std; + using namespace FD; + namespace RobotFlow { DECLARE_NODE(LaserProbe) *************** *** 276,277 **** --- 278,280 ---- } + }//namespace RobotFlow Index: CheckBoxPanel.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/CheckBoxPanel.cc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CheckBoxPanel.cc 2 Jan 2005 14:43:59 -0000 1.3 --- CheckBoxPanel.cc 29 Mar 2005 15:20:46 -0000 1.4 *************** *** 28,37 **** using namespace std; //forward declaration class CheckBoxPanel; - using namespace std; - DECLARE_NODE(CheckBoxPanel) /*Node --- 28,38 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { //forward declaration class CheckBoxPanel; DECLARE_NODE(CheckBoxPanel) /*Node *************** *** 192,195 **** };//end class CheckBoxPanel ! #endif --- 193,196 ---- };//end class CheckBoxPanel ! }//namespace RobotFlow #endif Index: SymbolKeypad.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/SymbolKeypad.cc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** SymbolKeypad.cc 2 Jan 2005 14:44:00 -0000 1.4 --- SymbolKeypad.cc 29 Mar 2005 15:20:46 -0000 1.5 *************** *** 9,12 **** --- 9,15 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { DECLARE_NODE(SymbolKeypad) *************** *** 1181,1182 **** --- 1184,1187 ---- return TRUE; } + + }//namespace RobotFlow Index: ImageProbe.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/ImageProbe.cc,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ImageProbe.cc 2 Jan 2005 14:44:00 -0000 1.9 --- ImageProbe.cc 29 Mar 2005 15:20:46 -0000 1.10 *************** *** 29,32 **** --- 29,35 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { //forward declaration *************** *** 333,337 **** }; ! #endif --- 336,340 ---- }; ! }//namespace RobotFlow #endif Index: ColorTrain.cc =================================================================== RCS file: /cvsroot/robotflow/RobotFlow/Probes/src/ColorTrain.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ColorTrain.cc 2 Jan 2005 14:44:00 -0000 1.2 --- ColorTrain.cc 29 Mar 2005 15:20:46 -0000 1.3 *************** *** 30,33 **** --- 30,36 ---- using namespace std; + using namespace FD; + + namespace RobotFlow { //forward declaration *************** *** 836,839 **** } ! #endif --- 839,842 ---- } ! }//namespace RobotFlow #endif |