summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-03-13 16:22:07 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-05-11 07:41:50 +0000
commit1314745b746252217c7992826b97f0db5ad7ea58 (patch)
tree15258af03384d4811246c8672b24aaf44636c8ad
parent7906a74155c3aefb331af998a1f71afbfda846bc (diff)
downloadqttools-1314745b746252217c7992826b97f0db5ad7ea58.tar.gz
remove extension.h duplicate
it was there only because uilib used to temporarily live in qtbase. however, the header's inclusion into customwidget.h was pointless in the first place, so just nuke it. Change-Id: I85b89e397e4393987192de05ec74e8c2328d2b32 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
-rw-r--r--src/designer/src/designer/doc/qtdesigner.qdocconf2
-rw-r--r--src/designer/src/lib/uilib/customwidget.h1
-rw-r--r--src/designer/src/lib/uilib/extension.h97
3 files changed, 0 insertions, 100 deletions
diff --git a/src/designer/src/designer/doc/qtdesigner.qdocconf b/src/designer/src/designer/doc/qtdesigner.qdocconf
index 9fdab8ccc..cad640eaa 100644
--- a/src/designer/src/designer/doc/qtdesigner.qdocconf
+++ b/src/designer/src/designer/doc/qtdesigner.qdocconf
@@ -38,8 +38,6 @@ sourcedirs = .. \
exampledirs = ../../../../../examples/designer \
snippets
-excludefiles += ../../lib/uilib/extension.h
-
imagedirs = images
outputdir = $QT_INSTALL_DOCS/qtdesigner
diff --git a/src/designer/src/lib/uilib/customwidget.h b/src/designer/src/lib/uilib/customwidget.h
index c2ea420d0..3c9083fdc 100644
--- a/src/designer/src/lib/uilib/customwidget.h
+++ b/src/designer/src/lib/uilib/customwidget.h
@@ -34,7 +34,6 @@
#ifndef CUSTOMWIDGET_H
#define CUSTOMWIDGET_H
-#include "extension.h"
#include <QtCore/QObject>
#include <QtCore/QString>
#include <QtGui/QIcon>
diff --git a/src/designer/src/lib/uilib/extension.h b/src/designer/src/lib/uilib/extension.h
deleted file mode 100644
index f15b4415b..000000000
--- a/src/designer/src/lib/uilib/extension.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
-**
-** This file is part of the Qt Designer of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL21$
-** 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 http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://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 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef EXTENSION_H
-#define EXTENSION_H
-
-#include <QtCore/QString>
-#include <QtCore/QObject>
-
-QT_BEGIN_NAMESPACE
-
-#define Q_TYPEID(IFace) QLatin1String(IFace##_iid)
-
-class QAbstractExtensionFactory
-{
-public:
- virtual ~QAbstractExtensionFactory() {}
-
- virtual QObject *extension(QObject *object, const QString &iid) const = 0;
-};
-Q_DECLARE_INTERFACE(QAbstractExtensionFactory, "org.qt-project.Qt.QAbstractExtensionFactory")
-
-class QAbstractExtensionManager
-{
-public:
- virtual ~QAbstractExtensionManager() {}
-
- virtual void registerExtensions(QAbstractExtensionFactory *factory, const QString &iid) = 0;
- virtual void unregisterExtensions(QAbstractExtensionFactory *factory, const QString &iid) = 0;
-
- virtual QObject *extension(QObject *object, const QString &iid) const = 0;
-};
-Q_DECLARE_INTERFACE(QAbstractExtensionManager, "org.qt-project.Qt.QAbstractExtensionManager")
-
-#if defined(Q_CC_MSVC) && (_MSC_VER < 1300)
-
-template <class T>
-inline T qt_extension_helper(QAbstractExtensionManager *, QObject *, T)
-{ return 0; }
-
-template <class T>
-inline T qt_extension(QAbstractExtensionManager* manager, QObject *object)
-{ return qt_extension_helper(manager, object, T(0)); }
-
-#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \
-const char * const IFace##_iid = IId; \
-Q_DECLARE_INTERFACE(IFace, IId) \
-template <> inline IFace *qt_extension_helper<IFace *>(QAbstractExtensionManager *manager, QObject *object, IFace *) \
-{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return (IFace *)(extension ? extension->qt_metacast(IFace##_iid) : 0); }
-
-#else
-
-template <class T>
-inline T qt_extension(QAbstractExtensionManager *, QObject *)
-{ return 0; }
-
-#define Q_DECLARE_EXTENSION_INTERFACE(IFace, IId) \
-const char * const IFace##_iid = IId; \
-Q_DECLARE_INTERFACE(IFace, IId) \
-template <> inline IFace *qt_extension<IFace *>(QAbstractExtensionManager *manager, QObject *object) \
-{ QObject *extension = manager->extension(object, Q_TYPEID(IFace)); return extension ? static_cast<IFace *>(extension->qt_metacast(IFace##_iid)) : static_cast<IFace *>(0); }
-
-#endif
-
-QT_END_NAMESPACE
-
-#endif // EXTENSION_H