diff --git a/include/gepetto/gui/omniorb/url.hh b/include/gepetto/gui/omniorb/url.hh
index fed02d2d193f2eb3e0d758badf5dca7a1db76283..c67b53958dfd9960f1488a2f603eeca3482ad9e4 100644
--- a/include/gepetto/gui/omniorb/url.hh
+++ b/include/gepetto/gui/omniorb/url.hh
@@ -18,20 +18,19 @@
 #define GEPETTO_GUI_OMNIORB_URL_HH
 
 #include <QString>
+#include <gepetto/viewer/corba/deprecated.hh>
+#warning "This file will be deleted in the future."
 
 namespace gepetto {
   namespace gui {
     namespace omniOrb {
-      static inline QString IIOPurl (const QString& host, const QString& port)
+      static inline QString IIOPurl (const QString& host = "localhost",
+          const QString& port = "2809") GEPETTO_VIEWER_CORBA_DEPRECATED;
+
+      static inline QString IIOPurl (const QString& host,
+          const QString& port)
       {
-        QString hp;
-        if (host.isEmpty ()) {
-          if (!port.isEmpty ()) hp = QString ("localhost:%1").arg (port);
-        } else {
-          if (port.isEmpty ()) hp = QString ("%1:2809").arg (host);
-          else hp = QString ("%1:%2").arg(host).arg(port);
-        }
-        return QString ("corbaloc:iiop:%1/NameService").arg (hp);
+        return QString ("corbaloc:iiop:%1:%2").arg(host).arg(port);
       }
     } // namespace omniOrb
   } // namespace gui