Merge pull request #28 from rdumusc/master

Add a function to get the host corresponding to a given instance
HBPVIS · Nov 3, 2015 · 85da478 · 85da478
2 parents 17269ba + d062ff3
commit 85da478
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -24,7 +24,7 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake
 include(GitExternal)
 
 set(VERSION_MAJOR "1")
-set(VERSION_MINOR "2")
+set(VERSION_MINOR "3")
 set(VERSION_PATCH "0")
 set(VERSION_ABI 2)
 

diff --git a/doc/Changelog.md b/doc/Changelog.md
@@ -3,6 +3,8 @@
 
 # git master {#master}
 
+* Add a function to get the host corresponding to a given instance.
+
 # Release 1.2 (02-11-2015) {#Release010200}
 
 * Added a new library ServusQt: Provides servus::qt::ItemModel which implements

diff --git a/servus/qt/itemModel.cpp b/servus/qt/itemModel.cpp
@@ -191,8 +191,7 @@ QVariant ItemModel::data( const QModelIndex& index_, const int role ) const
         if( item->children().isEmpty( ))
             return QVariant();
         return QString::fromStdString(
-                    _impl->service.get( item->objectName().toStdString(),
-                                        "servus_host" ));
+                   _impl->service.getHost( item->objectName().toStdString( )));
     default:
         return QVariant();
     }

diff --git a/servus/servus.cpp b/servus/servus.cpp
@@ -318,6 +318,11 @@ Strings Servus::getKeys( const std::string& instance ) const
     return _impl->getKeys( instance );
 }
 
+const std::string& Servus::getHost( const std::string& instance ) const
+{
+    return get( instance, "servus_host" );
+}
+
 bool Servus::containsKey( const std::string& instance,
                           const std::string& key ) const
 {

diff --git a/servus/servus.h b/servus/servus.h
@@ -168,6 +168,9 @@ class Servus
     /** @return all keys discovered on the given instance. @version 1.1 */
     SERVUS_API Strings getKeys( const std::string& instance ) const;
 
+    /** @return the host corresponding to the given instance. @version 1.3 */
+    SERVUS_API const std::string& getHost( const std::string& instance ) const;
+
     /** @return true if the given key was discovered. @version 1.1 */
     SERVUS_API bool containsKey( const std::string& instance,
                                  const std::string& key ) const;