diff options
Diffstat (limited to 'TAO/tests/QtTests/server.cpp')
| -rwxr-xr-x | TAO/tests/QtTests/server.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp index 1094e5f4c37..09732412920 100755 --- a/TAO/tests/QtTests/server.cpp +++ b/TAO/tests/QtTests/server.cpp @@ -63,15 +63,15 @@ main (int argc, char *argv[]) QApplication app (argc, argv); TAO_QtResource_Factory::set_context (&app); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -80,11 +80,11 @@ main (int argc, char *argv[]) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the Qt stuff.. @@ -92,7 +92,7 @@ main (int argc, char *argv[]) LCD_Display_imp display_impl (orb.in ()); LCD_Display_var server = - display_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + display_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Create the LCD after the QVbox is created. @@ -115,7 +115,7 @@ main (int argc, char *argv[]) // End of QT specific stuff.. CORBA::String_var ior = - orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (server.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ())); @@ -133,7 +133,7 @@ main (int argc, char *argv[]) ACE_OS::fclose (output_file); } - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // We choose to run the main Qt event loop.. |