diff -r 90517678cc4f -r 453da2cfceef qtecomplugins/xqplugins/include/xqplugin.h
--- a/qtecomplugins/xqplugins/include/xqplugin.h	Mon May 03 13:18:40 2010 +0300
+++ b/qtecomplugins/xqplugins/include/xqplugin.h	Fri May 14 16:41:33 2010 +0300
@@ -1,49 +1,29 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtCore module of the Qt Toolkit.
-**
-** $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 either Technology Preview License Agreement or the
-** Beta Release License Agreement.
-**
-** 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.
-**
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not, 
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*
+* Description:  
+*
+*/
 
 #ifndef XQPLUGIN_H
 #define XQPLUGIN_H
 
 #include <xqpluginfactory.h>
-#include <ecom/ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 
 #  define XQ_PLUGIN_ECOM_HEADER(PLUGIN) \
         class C##PLUGIN##Factory : public CPluginFactory { \
@@ -57,7 +37,7 @@
     C##PLUGIN##Factory * C##PLUGIN##Factory::NewL() {return new(ELeave) C##PLUGIN##Factory;} \
     QObject* C##PLUGIN##Factory::constructPlugin(){ return new PLUGINCLASS;}
 
-// left for convenience
+// convenience macro
 #  define XQ_EXPORT_PLUGIN(PLUGIN, PLUGINCLASS) \
         XQ_EXPORT_PLUGIN2(PLUGIN, PLUGINCLASS)