From: <vo...@us...> - 2008-08-31 14:36:40
|
Revision: 814 http://opde.svn.sourceforge.net/opde/?rev=814&view=rev Author: volca Date: 2008-08-31 14:36:48 +0000 (Sun, 31 Aug 2008) Log Message: ----------- * introducing static_pointer_cast (as seen in boost::shared_ptr), getting rid of .as<>() Modified Paths: -------------- trunk/src/bindings/ConfigServiceBinder.cpp trunk/src/bindings/DatabaseServiceBinder.cpp trunk/src/bindings/GUIServiceBinder.cpp trunk/src/bindings/InputServiceBinder.cpp trunk/src/bindings/LinkServiceBinder.cpp trunk/src/bindings/LoopServiceBinder.cpp trunk/src/bindings/ObjectServiceBinder.cpp trunk/src/bindings/PropertyServiceBinder.cpp trunk/src/main/OpdeDocGen.cpp Modified: trunk/src/bindings/ConfigServiceBinder.cpp =================================================================== --- trunk/src/bindings/ConfigServiceBinder.cpp 2008-08-31 14:13:39 UTC (rev 813) +++ trunk/src/bindings/ConfigServiceBinder.cpp 2008-08-31 14:36:48 UTC (rev 814) @@ -86,7 +86,7 @@ Object* object = construct(&msType); if (object != NULL) { - object->mInstance = ServiceManager::getSingleton().getService(msName).as<ConfigService>(); + object->mInstance = static_pointer_cast<ConfigService>(ServiceManager::getSingleton().getService(msName)); } return (PyObject *)object; Modified: trunk/src/bindings/DatabaseServiceBinder.cpp =================================================================== --- trunk/src/bindings/DatabaseServiceBinder.cpp 2008-08-31 14:13:39 UTC (rev 813) +++ trunk/src/bindings/DatabaseServiceBinder.cpp 2008-08-31 14:36:48 UTC (rev 814) @@ -190,7 +190,7 @@ Object* object = construct(&msType); if (object != NULL) { - object->mInstance = ServiceManager::getSingleton().getService(msName).as<DatabaseService>(); + object->mInstance = static_pointer_cast<DatabaseService>(ServiceManager::getSingleton().getService(msName)); } return (PyObject *)object; Modified: trunk/src/bindings/GUIServiceBinder.cpp =================================================================== --- trunk/src/bindings/GUIServiceBinder.cpp 2008-08-31 14:13:39 UTC (rev 813) +++ trunk/src/bindings/GUIServiceBinder.cpp 2008-08-31 14:36:48 UTC (rev 814) @@ -156,7 +156,7 @@ Object* object = construct(&msType); if (object != NULL) { - object->mInstance = ServiceManager::getSingleton().getService(msName).as<GUIService>(); + object->mInstance = static_pointer_cast<GUIService>(ServiceManager::getSingleton().getService(msName)); } return (PyObject *)object; Modified: trunk/src/bindings/InputServiceBinder.cpp =================================================================== --- trunk/src/bindings/InputServiceBinder.cpp 2008-08-31 14:13:39 UTC (rev 813) +++ trunk/src/bindings/InputServiceBinder.cpp 2008-08-31 14:36:48 UTC (rev 814) @@ -247,7 +247,7 @@ if (object != NULL) { - object->mInstance = ServiceManager::getSingleton().getService(msName).as<InputService>(); + object->mInstance = static_pointer_cast<InputService>(ServiceManager::getSingleton().getService(msName)); } return (PyObject *)object; } Modified: trunk/src/bindings/LinkServiceBinder.cpp =================================================================== --- trunk/src/bindings/LinkServiceBinder.cpp 2008-08-31 14:13:39 UTC (rev 813) +++ trunk/src/bindings/LinkServiceBinder.cpp 2008-08-31 14:36:48 UTC (rev 814) @@ -251,7 +251,7 @@ Object* object = construct(&msType); if (object != NULL) { - object->mInstance = ServiceManager::getSingleton().getService(msName).as<LinkService>(); + object->mInstance = static_pointer_cast<LinkService>(ServiceManager::getSingleton().getService(msName)); } return (PyObject *)object; Modified: trunk/src/bindings/LoopServiceBinder.cpp =================================================================== --- trunk/src/bindings/LoopServiceBinder.cpp 2008-08-31 14:13:39 UTC (rev 813) +++ trunk/src/bindings/LoopServiceBinder.cpp 2008-08-31 14:36:48 UTC (rev 814) @@ -151,7 +151,7 @@ if (object != NULL) { - object->mInstance = ServiceManager::getSingleton().getService(msName).as<LoopService>(); + object->mInstance = static_pointer_cast<LoopService>(ServiceManager::getSingleton().getService(msName)); } return (PyObject *)object; } Modified: trunk/src/bindings/ObjectServiceBinder.cpp =================================================================== --- trunk/src/bindings/ObjectServiceBinder.cpp 2008-08-31 14:13:39 UTC (rev 813) +++ trunk/src/bindings/ObjectServiceBinder.cpp 2008-08-31 14:36:48 UTC (rev 814) @@ -294,7 +294,7 @@ if (object != NULL) { - object->mInstance = ServiceManager::getSingleton().getService(msName).as<ObjectService>(); + object->mInstance = static_pointer_cast<ObjectService>(ServiceManager::getSingleton().getService(msName)); } return (PyObject *)object; } Modified: trunk/src/bindings/PropertyServiceBinder.cpp =================================================================== --- trunk/src/bindings/PropertyServiceBinder.cpp 2008-08-31 14:13:39 UTC (rev 813) +++ trunk/src/bindings/PropertyServiceBinder.cpp 2008-08-31 14:36:48 UTC (rev 814) @@ -206,7 +206,7 @@ if (object != NULL) { - object->mInstance = ServiceManager::getSingleton().getService(msName).as<PropertyService>(); + object->mInstance = static_pointer_cast<PropertyService>(ServiceManager::getSingleton().getService(msName)); } return (PyObject *)object; } Modified: trunk/src/main/OpdeDocGen.cpp =================================================================== --- trunk/src/main/OpdeDocGen.cpp 2008-08-31 14:13:39 UTC (rev 813) +++ trunk/src/main/OpdeDocGen.cpp 2008-08-31 14:36:48 UTC (rev 814) @@ -196,7 +196,7 @@ } void genPropDocs(fstream& fo) { - PropertyServicePtr ps = ServiceManager::getSingleton().getService("PropertyService").as<PropertyService>(); + PropertyServicePtr ps = static_pointer_cast<PropertyService>(ServiceManager::getSingleton().getService("PropertyService")); StringIteratorPtr pn = ps->getAllPropertyNames(); @@ -270,7 +270,7 @@ } void genLinkDocs(fstream& fo) { - LinkServicePtr ls = ServiceManager::getSingleton().getService("LinkService").as<LinkService>(); + LinkServicePtr ls = static_pointer_cast<LinkService>(ServiceManager::getSingleton().getService("LinkService")); StringIteratorPtr ln = ls->getAllLinkNames(); @@ -383,7 +383,7 @@ mRoot = new Opde::Root(SERVICE_CORE); // we want script autoload mRoot->registerCustomScriptLoaders(); - mConfigSvc = ServiceManager::getSingleton().getService("ConfigService").as<ConfigService>(); + mConfigSvc = static_pointer_cast<ConfigService>(ServiceManager::getSingleton().getService("ConfigService")); } ~DocGenerator(void) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |