diff -r 90517678cc4f -r 453da2cfceef qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp	Fri May 14 16:41:33 2010 +0300
@@ -6,157 +6,67 @@
 **
 ** This file is part of the Qt Mobility Components.
 **
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
 **
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
 **
-**
-**
-**
-**
-**
-**
-**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 #include "sfwexample.h"
 
-ServiceWrapper::ServiceWrapper() 
-: serviceInstance(0)
-{
-}
-
-ServiceWrapper::~ServiceWrapper()
-{
-    delete serviceInstance;
-}
-
-bool ServiceWrapper::isValid() const
-{
-    return m_descriptor.isValid();
-}
-
-QString ServiceWrapper::interfaceName() const
+DialerServices::DialerServices()
 {
-    if (isValid())
-        return m_descriptor.interfaceName();
-    else
-        return "No Interface";
-}
+    serviceManager = new QServiceManager();
 
-QString ServiceWrapper::serviceName() const
-{
-    if (isValid()) {
-        return m_descriptor.serviceName();
-    } else
-        return "No Service";
-}
-
-QString ServiceWrapper::version() const
-{
-    if (isValid())
-        return QString(QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion()));
-    else
-        return QString("0.0");
+    registerExampleServices();
 }
 
-void ServiceWrapper::setNativeDescriptor(const QServiceInterfaceDescriptor &d)
-{
-    if (d == m_descriptor)
-        return;
-
-    m_descriptor = d;
-    
-    if (serviceInstance)
-        delete serviceInstance;
-
-    serviceInstance = 0;
-}
-
-void ServiceWrapper::setDescriptor(QVariant &newDescriptor)
-{
-    QServiceInterfaceDescriptor d = newDescriptor.value<QServiceInterfaceDescriptor>();
-    setNativeDescriptor(d);
-}
-
-
-QObject* ServiceWrapper::serviceObject()
-{
-    qDebug() << "called serviceObject";
-    if (serviceInstance) {
-        return serviceInstance;
-    }
-
-    if (isValid()) {
-        QServiceManager manager;
-        serviceInstance = manager.loadInterface(m_descriptor);
-        return serviceInstance;
-    } else {
-        return 0;
-    }
-}
-
-ServiceRegister::ServiceRegister()
-{
-    serviceManager = new QServiceManager();
-    unregisterExampleServices();
-    registerExampleServices();
-
-    //! [1]
-    ServiceWrapper *service;
-    QServiceFilter filter("com.nokia.qt.examples.Dialer");
-    QList<QServiceInterfaceDescriptor> allImpl = serviceManager->findInterfaces(filter);
-    for (int i = 0; i < allImpl.count(); i++) {
-        qDebug() << "Found service:" << allImpl.at(i).serviceName() << "(" << allImpl.at(i).interfaceName() << ")";
-        service = new ServiceWrapper();
-        service->setNativeDescriptor(allImpl.at(i));
-        m_services.append(service);
-    }
-    //! [1]
-}
-
-ServiceRegister::~ServiceRegister() 
+DialerServices::~DialerServices()
 {
     unregisterExampleServices();
 }
 
-void ServiceRegister::registerExampleServices()
+void DialerServices::registerExampleServices()
 {
-    //! [0]
+    // ![0]
     QStringList exampleXmlFiles;
-    exampleXmlFiles << "voipdialerservice.xml" << "landlinedialerservice.xml";
+    exampleXmlFiles << "landlinedialerservice.xml" << "voipdialerservice.xml";
     foreach (const QString &fileName, exampleXmlFiles) {
         QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
         serviceManager->addService(path);
     }
-    //! [0]
+    // ![0]
 }
 
-void ServiceRegister::unregisterExampleServices()
+void DialerServices::unregisterExampleServices()
 {
+    serviceManager->removeService("LandlineDialer");
     serviceManager->removeService("VoipDialer");
-    serviceManager->removeService("LandlineDialer");
 }
 
-
-