1 files changed, 4 insertions, 90 deletions
diff --git a/src/activeqt/control/qaxbindable.cpp b/src/activeqt/control/qaxbindable.cpp
index 23f6244..eaead36 100644
--- a/src/activeqt/control/qaxbindable.cpp
+++ b/src/activeqt/control/qaxbindable.cpp
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the ActiveQt framework of the Qt Toolkit.
 **
@@ -17,8 +17,8 @@
 **     notice, this list of conditions and the following disclaimer in
 **     the documentation and/or other materials provided with the
 **     distribution.
-**   * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
-**     of its contributors may be used to endorse or promote products derived
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
 **     from this software without specific prior written permission.
 **
 **
@@ -233,90 +233,4 @@ bool QAxBindable::writeData(QIODevice *sink)
     return false;
 }
 
-/*!
-    \class QAxAggregated
-    \brief The QAxAggregated class is an abstract base class for implementations of
-    additional COM interfaces.
-
-    \inmodule QAxServer
-
-    Create a subclass of QAxAggregated and reimplement
-    queryInterface() to support additional COM interfaces. Use
-    multiple inheritance from those COM interfaces. Implement the
-    IUnknown interface of those COM interfaces by delegating the
-    calls to \c QueryInterface(), \c AddRef() and \c Release() to the
-    interface provided by controllingUnknown().
-
-    Use the widget() method if you need to make calls to the QWidget
-    implementing the ActiveX control. You must not store that pointer
-    in your subclass (unless you use QPointer), as the QWidget can
-    be destroyed by the ActiveQt framework at any time.
-
-    \sa QAxBindable, QAxFactory, {Active Qt}
-*/
-
-/*!
-    \fn QAxAggregated::~QAxAggregated()
-
-    The destructor is called internally by Qt.
-*/
-
-/*!
-    \fn long QAxAggregated::queryInterface(const QUuid &iid, void **iface)
-
-    Reimplement this pure virtual function to support additional COM
-    interfaces. Set the value of \a iface to point to this object to
-    support the interface \a iid. Note that you must cast the \c
-    this pointer to the appropriate superclass.
-
-    \snippet src_activeqt_control_qaxbindable.cpp 2
-
-    Return the standard COM results \c S_OK (interface is supported)
-    or \c E_NOINTERFACE (requested interface is not supported).
-
-    \warning
-    Even though you must implement the \c IUnknown interface if you
-    implement any COM interface you must not support the \c IUnknown
-    interface in your queryInterface() implementation.
-*/
-
-/*!
-    \fn IUnknown *QAxAggregated::controllingUnknown() const
-
-    Returns the \c IUnknown interface of the ActiveX control. Implement
-    the \c IUnknown interface in your QAxAggregated subclass to
-    delegate calls to \c QueryInterface(), \c AddRef(), and \c
-    Release() to the interface provided by this function.
-
-    \snippet src_activeqt_control_qaxbindable.cpp 3
-
-    Instead of declaring and implementing these three functions
-    manually, you can use the \c QAXAGG_IUNKNOWN macro in the class
-    declaration of your subclass.
-*/
-
-/*!
-    \fn QObject *QAxAggregated::object() const
-
-    Returns a pointer to the QObject subclass implementing the COM object.
-    This function might return 0.
-
-    \warning
-    You must not store the returned pointer, unless you use a
-    QPointer, since the QObject can be destroyed by ActiveQt at any
-    time.
-*/
-
-/*!
-    \fn QWidget *QAxAggregated::widget() const
-
-    Returns a pointer to the QWidget subclass implementing the ActiveX control.
-    This function might return 0.
-
-    \warning
-    You must not store the returned pointer, unless you use a
-    QPointer, since the QWidget can be destroyed by ActiveQt at any
-    time.
-*/
-
 QT_END_NAMESPACE