changing demos to use ice_staticId instead of hard-coded type ids

7 files changed, 10 insertions, 18 deletions

diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index ee7672032df..bb96e43edee 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -705,13 +705,6 @@ public:
     destroy()
     {
     }
-    
-    void
-    install(const Ice::CommunicatorPtr& communicator)
-    {
-        communicator->addObjectFactory(this, "::Class1");
-        communicator->addObjectFactory(this, "::Class2");
-    }
 };
 typedef IceUtil::Handle<MyFactory> MyFactoryPtr;
 
@@ -787,8 +780,7 @@ TestApp::run(int argc, char* argv[])
 #endif
 
     MyFactoryPtr factory = new MyFactory();
-    factory->install(communicator());
-    
+
     cout <<"Struct1ObjectMap" << endl;
     Struct1ObjectMapTest();
 
diff --git a/cpp/demo/Freeze/library/Collocated.cpp b/cpp/demo/Freeze/library/Collocated.cpp
index ec8c21f82ac..285560e954d 100644
--- a/cpp/demo/Freeze/library/Collocated.cpp
+++ b/cpp/demo/Freeze/library/Collocated.cpp
@@ -79,7 +79,7 @@ LibraryCollocated::run(int argc, char* argv[])
     // Create and install a factory for books.
     //
     Ice::ObjectFactoryPtr bookFactory = new BookFactory(library);
-    communicator()->addObjectFactory(bookFactory, "::Demo::Book");
+    communicator()->addObjectFactory(bookFactory, Demo::Book::ice_staticId());
 
     //
     // Everything ok, let's go.
diff --git a/cpp/demo/Freeze/library/Server.cpp b/cpp/demo/Freeze/library/Server.cpp
index f0e10309523..28ec3a98ab3 100644
--- a/cpp/demo/Freeze/library/Server.cpp
+++ b/cpp/demo/Freeze/library/Server.cpp
@@ -78,7 +78,7 @@ LibraryServer::run(int argc, char* argv[])
     // Create and install a factory for books.
     //
     Ice::ObjectFactoryPtr bookFactory = new BookFactory(library);
-    communicator()->addObjectFactory(bookFactory, "::Demo::Book");
+    communicator()->addObjectFactory(bookFactory, Demo::Book::ice_staticId());
     
     //
     // Everything ok, let's go.
diff --git a/cpp/demo/Freeze/phonebook/Collocated.cpp b/cpp/demo/Freeze/phonebook/Collocated.cpp
index 71817c2d13e..d3609447ccd 100644
--- a/cpp/demo/Freeze/phonebook/Collocated.cpp
+++ b/cpp/demo/Freeze/phonebook/Collocated.cpp
@@ -52,7 +52,7 @@ PhoneBookCollocated::run(int argc, char* argv[])
     // Create and install a factory for contacts.
     //
     ContactFactoryPtr contactFactory = new ContactFactory();
-    communicator()->addObjectFactory(contactFactory, "::Demo::Contact");
+    communicator()->addObjectFactory(contactFactory, Demo::Contact::ice_staticId());
 
     //
     // Create the name index.
diff --git a/cpp/demo/Freeze/phonebook/Server.cpp b/cpp/demo/Freeze/phonebook/Server.cpp
index d0f68de529c..f459cf36dc0 100644
--- a/cpp/demo/Freeze/phonebook/Server.cpp
+++ b/cpp/demo/Freeze/phonebook/Server.cpp
@@ -52,7 +52,7 @@ PhoneBookServer::run(int argc, char* argv[])
     // Create and install a factory for contacts.
     //
     ContactFactoryPtr contactFactory = new ContactFactory();
-    communicator()->addObjectFactory(contactFactory, "::Demo::Contact");
+    communicator()->addObjectFactory(contactFactory, Demo::Contact::ice_staticId());
     
     //
     // Create the name index.
diff --git a/cpp/demo/Ice/value/Client.cpp b/cpp/demo/Ice/value/Client.cpp
index 39a5683a778..e15a8a30b09 100644
--- a/cpp/demo/Ice/value/Client.cpp
+++ b/cpp/demo/Ice/value/Client.cpp
@@ -94,7 +94,7 @@ ValueClient::run(int argc, char* argv[])
     cin.getline(c, 2);
 
     Ice::ObjectFactoryPtr factory = new ObjectFactory;
-    communicator()->addObjectFactory(factory, "::Demo::Printer");
+    communicator()->addObjectFactory(factory, Demo::Printer::ice_staticId());
 
     initial->getPrinter(printer, printerProxy);
     cout << "==> " << printer->message << endl;
@@ -127,7 +127,7 @@ ValueClient::run(int argc, char* argv[])
     PrinterPtr derivedAsBase;
     derivedAsBase = initial->getDerivedPrinter();
     cout << "==> The type ID of the received object is \"" << derivedAsBase->ice_id() << "\"" << endl;
-    assert(derivedAsBase->ice_id() == "::Demo::Printer");
+    assert(derivedAsBase->ice_id() == Demo::Printer::ice_staticId());
     
     cout << '\n'
          << "Now we install a factory for the derived class, and try again.\n"
@@ -136,7 +136,7 @@ ValueClient::run(int argc, char* argv[])
          << "[press enter]\n";
     cin.getline(c, 2);
     
-    communicator()->addObjectFactory(factory, "::Demo::DerivedPrinter");
+    communicator()->addObjectFactory(factory, Demo::DerivedPrinter::ice_staticId());
     
     derivedAsBase = initial->getDerivedPrinter();
     DerivedPrinterPtr derived = DerivedPrinterPtr::dynamicCast(derivedAsBase);
diff --git a/cpp/demo/Ice/value/ObjectFactory.cpp b/cpp/demo/Ice/value/ObjectFactory.cpp
index 6f694ae6906..bfd16f57e89 100644
--- a/cpp/demo/Ice/value/ObjectFactory.cpp
+++ b/cpp/demo/Ice/value/ObjectFactory.cpp
@@ -16,12 +16,12 @@ using namespace std;
 Ice::ObjectPtr
 ObjectFactory::create(const string& type)
 {
-    if(type == "::Demo::Printer")
+    if(type == Demo::Printer::ice_staticId())
     {
         return new PrinterI;
     }
 
-    if(type == "::Demo::DerivedPrinter")
+    if(type == Demo::DerivedPrinter::ice_staticId())
     {
         return new DerivedPrinterI;
     }