diff -r 90517678cc4f -r 453da2cfceef qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.h
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.h	Fri May 14 16:41:33 2010 +0300
@@ -6,108 +6,60 @@
 **
 ** 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$
 **
 ***************************************************************************/
 
+#ifndef SFWEXAMPLE_H
+#define SFWEXAMPLE_H
+
 #include <QtCore>
 #include <qserviceinterfacedescriptor.h>
 #include <qservicemanager.h>
-#include <qdeclarative.h>
 
 QTM_USE_NAMESPACE
 
-Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
-
-//! [0]
-class ServiceWrapper : public QObject {
+class DialerServices : public QObject {
     Q_OBJECT
-    Q_PROPERTY(bool isValid READ isValid);
-    Q_PROPERTY(QString serviceName READ serviceName CONSTANT);
-    Q_PROPERTY(QString interfaceName READ interfaceName CONSTANT);
-    Q_PROPERTY(QString version READ version NOTIFY versionChanged);
-//! [0]
 
 public:
-    ServiceWrapper();
-    
-    ~ServiceWrapper() ;
-
-    bool isValid() const;
-
-    QString serviceName() const;
-
-    QString interfaceName() const;
-
-    void setNativeDescriptor(const QServiceInterfaceDescriptor& desc);
-
-    void setDescriptor(QVariant& newDescriptor);
-
-    QString version() const;
-
-    Q_INVOKABLE QObject* serviceObject();
+    DialerServices();
+    ~DialerServices();
 
 private:
-    QServiceInterfaceDescriptor m_descriptor;
-    QObject* serviceInstance;
+    void registerExampleServices();
+    void unregisterExampleServices();
+
+    QServiceManager* serviceManager;
 };
 
-QML_DECLARE_TYPE(ServiceWrapper)
-
-//! [1]
-class ServiceRegister : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QList<ServiceWrapper*>* registeredservices READ registeredservices NOTIFY modelChanged CONSTANT);
-//! [1]
-
-public:
-    ServiceRegister();
-    ~ServiceRegister();
-    
-    QList<ServiceWrapper*> *registeredservices() {return &m_services; }
+#endif
 
-    void registerExampleServices();
-
-    void unregisterExampleServices();
-
-    void serviceStateChange(int state);
-
-private:
-    QServiceManager* serviceManager;
-    QList<ServiceWrapper *> m_services;
-
-signals:
-    void modelChanged();
-};
-
-QML_DECLARE_TYPE(ServiceRegister)
-