Fixed IceGrid discovery plugin to not depend on IceGrid::Locator directly

2 files changed, 8 insertions, 8 deletions

diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 9d7eb3229c8..5a301c139b4 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -69,10 +69,10 @@ class LookupReplyI : public LookupReply, private IceUtil::Monitor<IceUtil::Mutex
 public:
 
     virtual void
-    foundLocator(const IceGrid::LocatorPrx& locator, const Ice::Current&)
+    foundLocator(const Ice::LocatorPrx& locator, const Ice::Current&)
     {
         Lock sync(*this);
-        for(vector<IceGrid::LocatorPrx>::iterator p = _locators.begin(); p != _locators.end(); ++p)
+        for(vector<Ice::LocatorPrx>::iterator p = _locators.begin(); p != _locators.end(); ++p)
         {
             if((*p)->ice_getIdentity() == locator->ice_getIdentity())
             {
@@ -105,7 +105,7 @@ public:
         notify();
     }
 
-    vector<IceGrid::LocatorPrx>
+    vector<Ice::LocatorPrx>
     getLocators()
     {
         Lock sync(*this);
@@ -128,7 +128,7 @@ public:
 
 private:
 
-    vector<IceGrid::LocatorPrx> _locators;
+    vector<Ice::LocatorPrx> _locators;
 };
 typedef IceUtil::Handle<LookupReplyI> LookupReplyIPtr;
 
@@ -616,12 +616,12 @@ Client::run(StringSeq& originalArgs)
                 }
                 adapter->destroy();
 
-                vector<IceGrid::LocatorPrx> locators = reply->getLocators();
+                vector<Ice::LocatorPrx> locators = reply->getLocators();
                 if(locators.size() > 1)
                 {
-                    cout << "found " << locators.size() << " IceGrid locators:" << endl;
+                    cout << "found " << locators.size() << " Ice locators:" << endl;
                     unsigned int num = 0;
-                    for(vector<IceGrid::LocatorPrx>::const_iterator p = locators.begin(); p != locators.end(); ++p)
+                    for(vector<Ice::LocatorPrx>::const_iterator p = locators.begin(); p != locators.end(); ++p)
                     {
                         cout << ++num << ": proxy = `" << *p << "'" <<endl;
                     }
diff --git a/cpp/src/IceGrid/RegistryI.cpp b/cpp/src/IceGrid/RegistryI.cpp
index 1c05d6ceea1..35d7b33c304 100644
--- a/cpp/src/IceGrid/RegistryI.cpp
+++ b/cpp/src/IceGrid/RegistryI.cpp
@@ -73,7 +73,7 @@ public:
         }
     }
 
-    virtual IceGrid::LocatorPrx
+    virtual Ice::LocatorPrx
     getLocator(const Ice::Current&)
     {
         return _wellKnownObjects->getLocator();