Fix documentation examples

Change-Id: Iedf6fe8afdf73a73b922ff5f9c637e0d5b088608
Reviewed-by: Michael Brasser <michael.brasser@live.com>

2 files changed, 5 insertions, 95 deletions

diff --git a/src/remoteobjects/doc/snippets/doc_src_remoteobjects.cpp b/src/remoteobjects/doc/snippets/doc_src_remoteobjects.cpp
deleted file mode 100644
index 3ab3280..0000000
--- a/src/remoteobjects/doc/snippets/doc_src_remoteobjects.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 Ford Motor Company
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtRemoteObjects module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-//! [qremoteobjectnode_include]
-#include <QtRemoteObjects/QRemoteObjectNode>
-//! [qremoteobjectnode_include]
-
-int main(int argc, char *argv[])
-{
-    QCoreApplication app(argc, argv);
-
-//! [create_registry]
-QRemoteObjectNode registryNode = QRemoteObjectNode::createRegistryHostNode();
-//! [create_registry]
-
-//! [create_host_nodes]
-QRemoteObjectNode hostNode = QRemoteObjectNode::createHostNode(QUrl("local://mynode"));
-QRemoteObjectNode registeredHostNode = QRemoteObjectNode::createHostNodeConnectedToRegistry();
-//! [create_host_nodes]
-
-//! [create_connect_client_nodes]
-QRemoteObjectNode clientNode = QRemoteObjectNode();
-QRemoteObjectNode registryClientNode = QRemoteObjectNode::createNodeConnectedToRegistry();
-clientNode.connect(QUrl("local://mynode"));
-//! [create_connect_client_nodes]
-
-//! [share_source]
-MinuteTimer timer;
-hostNode.enableRemoting(&timer);
-//! [share_source]
-
-//! [api_source]
-#include "rep_TimeModel_source.h"
-MinuteTimer timer;
-hostNode.enableRemoting<MinuteTimerSourceAPI>(&timer);
-//! [api_source]
-
-//! [create_replica]
-#include "rep_TimeModel_replica.h"
-QScopedPointer<MinuteTimerReplica> d_impl;
-//! [create_replica]
-
-//! [dynamic_replica]
-QRemoteObjectDynamicReplica *dynamicRep;
-//! [dynamic_replica]
-
-//! [acquire_replica]
-d_impl->reset(clientNode.acquire("MinuteTimer"));
-*dynamicRep = clientNode.acquire("MinuteTimer");
-//! [acquire_replica]
-
-    Q_UNUSED(timer);
-    return app.exec();
-}
diff --git a/src/remoteobjects/doc/snippets/doc_src_simpleswitch.cpp b/src/remoteobjects/doc/snippets/doc_src_simpleswitch.cpp
index 90509d9..fb6e52b 100644
--- a/src/remoteobjects/doc/snippets/doc_src_simpleswitch.cpp
+++ b/src/remoteobjects/doc/snippets/doc_src_simpleswitch.cpp
@@ -111,7 +111,7 @@ void SimpleSwitch::timeout_slot()
 //! [simpleSwitch_serversource_example1]
 
 //! [simpleSwitch_serverhostnode_example1]
-QRemoteObjectNode srcNode = QRemoteObjectNode::createHostNode();
+QRemoteObjectHost srcNode;
 //! [simpleSwitch_serverhostnode_example1]
 
 //! [simpleSwitch_enableremoting_example1]
@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
 
     SimpleSwitch srcSwitch; // create simple switch
 
-    QRemoteObjectNode srcNode = QRemoteObjectNode::createHostNode(); // create host node without Registry
+    QRemoteObjectHost srcNode; // create host node without Registry
     //The static node creation routines take one or two URLs as input parameters, but they have default values to help people getting started.
     //It is recommended use your own URLs in any production environment to avoid name conflicts.
     srcNode.enableRemoting(&srcSwitch); // enable remoting/sharing
@@ -350,8 +350,8 @@ int main(int argc, char *argv[])
 
     SimpleSwitch srcSwitch; // create SimpleSwitch
 
-    QRemoteObjectNode regNode = QRemoteObjectNode::createRegistryHostNode(); // create node that hosts registy
-    QRemoteObjectNode srcNode = QRemoteObjectNode::createHostNodeConnectedToRegistry(); // create node that will host source and connect to registry
+    QRemoteObjectRegistryHost regNode(QUrl(QStringLiteral("local:registry"))); // create node that hosts registry
+      QRemoteObjectHost srcNode(QUrl(QStringLiteral("local:switch")), QUrl(QStringLiteral("local:registry"))); // create node that will host source and connect to registry
     //Note, you can add srcSwitch directly to regNode if desired.
     //We use two Nodes here, as the regNode could easily be in a third process.
 
@@ -362,5 +362,5 @@ int main(int argc, char *argv[])
 //! [simpleSwitch_registrymaincpp_example3]
 
 //! [simpleSwitch_registrydynamicclientmaincpp_example3]
-    QRemoteObjectNode repNode = QRemoteObjectNode::createNodeConnectedToRegistry();
+    QRemoteObjectNode repNode(QUrl(QStringLiteral("local:registry")));
 //! [simpleSwitch_registrydynamicclientmaincpp_example3]