Revision: 7603
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7603&view=rev
Author:   thjc
Date:     2009-04-21 00:15:40 +0000 (Tue, 21 Apr 2009)

Log Message:
-----------
merge of player property docs from 2-1

Modified Paths:
--------------
    code/player/trunk/doc/player.dox.in
    code/player/trunk/libplayercore/property.h

Property Changed:
----------------
    code/player/trunk/


Property changes on: code/player/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300
/code/player/trunk:6985
   + 
/code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276,7300,7602
/code/player/trunk:6985

Modified: code/player/trunk/doc/player.dox.in
===================================================================
--- code/player/trunk/doc/player.dox.in 2009-04-20 23:55:58 UTC (rev 7602)
+++ code/player/trunk/doc/player.dox.in 2009-04-21 00:15:40 UTC (rev 7603)
@@ -460,7 +460,7 @@
 # with spaces.
 
 #INPUT                  = player.txt install.html migration.html 
tutorials.html utils.html clients.html plugin_driver.html configfile.html 
protocol.html ../libplayerxdr/playerxdr.html ../libplayerxdr 
../libplayercore/playercore.h ../server/libplayerdrivers ../libplayertcp 
../libplayercore ../server/drivers/ ../utils/playerv/playerv.c 
../utils/playernav/playernav.c ../utils/playercam/playercam.c 
../utils/playerjoy/playerjoy.cc ../utils/playerprint/playerprint.cc 
../utils/playervcr/playervcr.c ../utils/dgps_server/dgps_server.dox 
../client_libs/libplayerc/doc/mainpage.html 
../client_libs/libplayerc/doc/libplayerc_py.html 
../client_libs/libplayerc/playerc.h ../client_libs/libplayerc++/playerclient.h 
../client_libs/libplayerc++/utility.h ../client_libs/libplayerc++/clientproxy.h 
../client_libs/libplayerc++/playerc++.h 
../client_libs/libplayerc++/playerc++.cc 
../client_libs/libplayerc++/playererror.h
-INPUT                  = player.txt quick_start.txt architecture.txt 
supported_hardware.txt tutorial_devices.txt tutorial_migration.txt 
tutorial_cameras.txt tutorial_automake.txt tutorial_crosscompiling.txt 
tutorial_args.txt tutorial_datalog.txt tutorial_config.txt 
tutorial_interface.txt tutorial_plugins.txt tutorial_maps.txt install.txt 
../server/server.cc ../libplayercore/player.h 
@PROJECT_BINARY_DIR@/libplayercore/player_interfaces.h ../libplayercore/error.h 
../libplayercore/configfile.h ../libplayercore/driver.h 
../libplayercore/device.h ../libplayercore/message.h ../server/drivers 
../libplayercore/interface_util.h ../libplayersd/playersd.h 
../libplayertcp/playertcp.h ../libplayerxdr/playerxdr.html 
@PROJECT_BINARY_DIR@/libplayerxdr/playerxdr.h 
../server/libplayerdrivers/driverregistry.h ../utils/playerv/playerv.c 
../utils/playernav/playernav.c ../utils/playercam/playercam.c 
../utils/playerjoy/playerjoy.cc ../utils/playerprint/playerprint.cc 
../utils/playervcr/playervcr.c ../utils/dgps_server/dgps_server.dox 
../utils/playerwritemap/playerwritemap.c ../client_libs/libplayerc/playerc.h 
../client_libs/libplayerc/bindings/python/libplayerc_py.html 
../client_libs/libplayerc++/playerclient.h 
../client_libs/libplayerc++/playerc++.h 
../client_libs/libplayerc++/playerc++.cc 
../client_libs/libplayerc++/playererror.h ../client_libs/libplayerc++/utility.h 
../client_libs/libplayerc++/clientproxy.h
+INPUT                  = player.txt quick_start.txt architecture.txt 
supported_hardware.txt tutorial_devices.txt tutorial_migration.txt 
tutorial_cameras.txt tutorial_automake.txt tutorial_crosscompiling.txt 
tutorial_args.txt tutorial_datalog.txt tutorial_config.txt 
tutorial_interface.txt tutorial_plugins.txt tutorial_maps.txt install.txt 
../server/server.cc ../libplayercore/player.h 
@PROJECT_BINARY_DIR@/libplayercore/player_interfaces.h ../libplayercore/error.h 
../libplayercore/configfile.h ../libplayercore/driver.h 
../libplayercore/device.h ../libplayercore/message.h ../server/drivers 
../libplayercore/interface_util.h ../libplayersd/playersd.h 
../libplayertcp/playertcp.h ../libplayerxdr/playerxdr.html 
@PROJECT_BINARY_DIR@/libplayerxdr/playerxdr.h 
../server/libplayerdrivers/driverregistry.h ../utils/playerv/playerv.c 
../utils/playernav/playernav.c ../utils/playercam/playercam.c 
../utils/playerjoy/playerjoy.cc ../utils/playerprint/playerprint.cc 
../utils/playervcr/playervcr.c ../utils/dgps_server/dgps_server.dox 
../utils/playerwritemap/playerwritemap.c ../client_libs/libplayerc/playerc.h 
../client_libs/libplayerc/bindings/python/libplayerc_py.html 
../client_libs/libplayerc++/playerclient.h 
../client_libs/libplayerc++/playerc++.h 
../client_libs/libplayerc++/playerc++.cc 
../client_libs/libplayerc++/playererror.h ../client_libs/libplayerc++/utility.h 
../client_libs/libplayerc++/clientproxy.h ../libplayercore/property.h
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
 # and *.h) to filter out the source-files in the directories. If left

Modified: code/player/trunk/libplayercore/property.h
===================================================================
--- code/player/trunk/libplayercore/property.h  2009-04-20 23:55:58 UTC (rev 
7602)
+++ code/player/trunk/libplayercore/property.h  2009-04-21 00:15:40 UTC (rev 
7603)
@@ -55,7 +55,7 @@
 class ConfigFile;
 class Driver;
 
-// Property base class
+/// Property base class
 class PLAYERCORE_EXPORT Property
 {
        public:
@@ -82,7 +82,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 
////////////////////////////////////////////////////////////////////////////////
 
-// Integer property class
+/// Integer property class
 class PLAYERCORE_EXPORT IntProperty : public Property
 {
        public:
@@ -110,7 +110,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 
////////////////////////////////////////////////////////////////////////////////
 
-// Double property class
+/// Double property class
 class PLAYERCORE_EXPORT DoubleProperty : public Property
 {
        public:
@@ -138,6 +138,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 
////////////////////////////////////////////////////////////////////////////////
 
+/// String Property Class
 class PLAYERCORE_EXPORT StringProperty : public Property
 {
        public:
@@ -166,6 +167,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 
////////////////////////////////////////////////////////////////////////////////
 
+/// Property node structure
 typedef struct PropertyNode
 {
        char *key;
@@ -173,7 +175,7 @@
        struct PropertyNode *next;
 } PropertyNode;
 
-// Property bag class: stores registered properties
+/// Property bag class: stores registered properties
 class PLAYERCORE_EXPORT PropertyBag
 {
        public:


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and 
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today. 
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit

Reply via email to